Fixes #165 - Infinite loop in performance grouping header

fipro78 · fipro78 · commit 9ac087c5aea5 · 2025-08-08T14:06:24.000+02:00
Signed-off-by: Dirk Fauth &lt;dirk.fauth@googlemail.com&gt;
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/ColumnGroupHeaderLayer.java
@@ -2362,6 +2362,9 @@ public void handleLayerEvent(ILayerEvent event) {
                     ((IStructuralChangeEvent) event).isHorizontalStructureChanged()) {
                 IStructuralChangeEvent changeEvent = (IStructuralChangeEvent) event;
                 Collection<StructuralDiff> columnDiffs = changeEvent.getColumnDiffs();
+
+                boolean performUpdate = false;
+
                 if (columnDiffs != null && !columnDiffs.isEmpty()) {
 
                     int[] deletedPositions = getDeletedPositions(columnDiffs);
@@ -2379,6 +2382,8 @@ public void handleLayerEvent(ILayerEvent event) {
                         } else {
                             handleDeleteDiffs(deletedPositions);
                         }
+
+                        performUpdate = true;
                     }
 
                     for (StructuralDiff diff : columnDiffs) {
@@ -2469,11 +2474,15 @@ public void handleLayerEvent(ILayerEvent event) {
                                     doCommand(cmd);
                                 }
                             }
+
+                            performUpdate = true;
                         }
                     }
 
-                    // update visible start positions of all groups
-                    updateVisibleStartPositions();
+                    if (performUpdate) {
+                        // update visible start positions of all groups
+                        updateVisibleStartPositions();
+                    }
                 } else {
                     // trigger a consistency check as the details of the event
                     // probably where removed on converting the layer stack
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/group/performance/RowGroupHeaderLayer.java
@@ -2351,6 +2351,9 @@ public void handleLayerEvent(ILayerEvent event) {
                     ((IStructuralChangeEvent) event).isVerticalStructureChanged()) {
                 IStructuralChangeEvent changeEvent = (IStructuralChangeEvent) event;
                 Collection<StructuralDiff> rowDiffs = changeEvent.getRowDiffs();
+
+                boolean performUpdate = false;
+
                 if (rowDiffs != null && !rowDiffs.isEmpty()) {
 
                     int[] deletedPositions = getDeletedPositions(rowDiffs);
@@ -2368,6 +2371,8 @@ public void handleLayerEvent(ILayerEvent event) {
                         } else {
                             handleDeleteDiffs(deletedPositions);
                         }
+
+                        performUpdate = true;
                     }
 
                     for (StructuralDiff diff : rowDiffs) {
@@ -2457,12 +2462,16 @@ public void handleLayerEvent(ILayerEvent event) {
                                 for (UpdateRowGroupCollapseCommand cmd : collapseUpdates.values()) {
                                     doCommand(cmd);
                                 }
+
+                                performUpdate = true;
                             }
                         }
                     }
 
-                    // update visible start positions of all groups
-                    updateVisibleStartPositions();
+                    if (performUpdate) {
+                        // update visible start positions of all groups
+                        updateVisibleStartPositions();
+                    }
                 } else {
                     // trigger a consistency check as the details of the event
                     // probably where removed on converting the layer stack

Original file line number	Diff line number	Diff line change
`@@ -2362,6 +2362,9 @@ public void handleLayerEvent(ILayerEvent event) {`
`2362`	`2362`	`((IStructuralChangeEvent) event).isHorizontalStructureChanged()) {`
`2363`	`2363`	`IStructuralChangeEvent changeEvent = (IStructuralChangeEvent) event;`
`2364`	`2364`	`Collection<StructuralDiff> columnDiffs = changeEvent.getColumnDiffs();`
	`2365`	`+`
	`2366`	`+ boolean performUpdate = false;`
	`2367`	`+`
`2365`	`2368`	`if (columnDiffs != null && !columnDiffs.isEmpty()) {`
`2366`	`2369`
`2367`	`2370`	`int[] deletedPositions = getDeletedPositions(columnDiffs);`
`@@ -2379,6 +2382,8 @@ public void handleLayerEvent(ILayerEvent event) {`
`2379`	`2382`	`} else {`
`2380`	`2383`	`handleDeleteDiffs(deletedPositions);`
`2381`	`2384`	`}`
	`2385`	`+`
	`2386`	`+ performUpdate = true;`
`2382`	`2387`	`}`
`2383`	`2388`
`2384`	`2389`	`for (StructuralDiff diff : columnDiffs) {`
`@@ -2469,11 +2474,15 @@ public void handleLayerEvent(ILayerEvent event) {`
`2469`	`2474`	`doCommand(cmd);`
`2470`	`2475`	`}`
`2471`	`2476`	`}`
	`2477`	`+`
	`2478`	`+ performUpdate = true;`
`2472`	`2479`	`}`
`2473`	`2480`	`}`
`2474`	`2481`
`2475`		`- // update visible start positions of all groups`
`2476`		`- updateVisibleStartPositions();`
	`2482`	`+ if (performUpdate) {`
	`2483`	`+ // update visible start positions of all groups`
	`2484`	`+ updateVisibleStartPositions();`
	`2485`	`+ }`
`2477`	`2486`	`} else {`
`2478`	`2487`	`// trigger a consistency check as the details of the event`
`2479`	`2488`	`// probably where removed on converting the layer stack`
Original file line number	Diff line number	Diff line change
`@@ -2351,6 +2351,9 @@ public void handleLayerEvent(ILayerEvent event) {`
`2351`	`2351`	`((IStructuralChangeEvent) event).isVerticalStructureChanged()) {`
`2352`	`2352`	`IStructuralChangeEvent changeEvent = (IStructuralChangeEvent) event;`
`2353`	`2353`	`Collection<StructuralDiff> rowDiffs = changeEvent.getRowDiffs();`
	`2354`	`+`
	`2355`	`+ boolean performUpdate = false;`
	`2356`	`+`
`2354`	`2357`	`if (rowDiffs != null && !rowDiffs.isEmpty()) {`
`2355`	`2358`
`2356`	`2359`	`int[] deletedPositions = getDeletedPositions(rowDiffs);`
`@@ -2368,6 +2371,8 @@ public void handleLayerEvent(ILayerEvent event) {`
`2368`	`2371`	`} else {`
`2369`	`2372`	`handleDeleteDiffs(deletedPositions);`
`2370`	`2373`	`}`
	`2374`	`+`
	`2375`	`+ performUpdate = true;`
`2371`	`2376`	`}`
`2372`	`2377`
`2373`	`2378`	`for (StructuralDiff diff : rowDiffs) {`
`@@ -2457,12 +2462,16 @@ public void handleLayerEvent(ILayerEvent event) {`
`2457`	`2462`	`for (UpdateRowGroupCollapseCommand cmd : collapseUpdates.values()) {`
`2458`	`2463`	`doCommand(cmd);`
`2459`	`2464`	`}`
	`2465`	`+`
	`2466`	`+ performUpdate = true;`
`2460`	`2467`	`}`
`2461`	`2468`	`}`
`2462`	`2469`	`}`
`2463`	`2470`
`2464`		`- // update visible start positions of all groups`
`2465`		`- updateVisibleStartPositions();`
	`2471`	`+ if (performUpdate) {`
	`2472`	`+ // update visible start positions of all groups`
	`2473`	`+ updateVisibleStartPositions();`
	`2474`	`+ }`
`2466`	`2475`	`} else {`
`2467`	`2476`	`// trigger a consistency check as the details of the event`
`2468`	`2477`	`// probably where removed on converting the layer stack`