Bug fix in save-and-restore delete node handling

georgweiss · georgweiss · commit 3f2680e0b3df · 2022-06-13T14:37:55.000+02:00
diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java
@@ -443,7 +443,6 @@ protected Void call() throws Exception {
 
             @Override
             public void succeeded() {
-                parent.getChildren().removeAll(items);
                 List<Tab> tabsToRemove = new ArrayList<>();
                 List<Tab> visibleTabs = tabPane.getTabs();
                 for (Tab tab : visibleTabs) {
@@ -454,8 +453,9 @@ public void succeeded() {
                         }
                     }
                 }
-                changesInProgress.set(false);
                 tabPane.getTabs().removeAll(tabsToRemove);
+                parent.getChildren().removeAll(items);
+                changesInProgress.set(false);
             }
 
             @Override

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,6 @@ protected Void call() throws Exception {`
`443`	`443`
`444`	`444`	`@Override`
`445`	`445`	`public void succeeded() {`
`446`		`- parent.getChildren().removeAll(items);`
`447`	`446`	`List<Tab> tabsToRemove = new ArrayList<>();`
`448`	`447`	`List<Tab> visibleTabs = tabPane.getTabs();`
`449`	`448`	`for (Tab tab : visibleTabs) {`
`@@ -454,8 +453,9 @@ public void succeeded() {`
`454`	`453`	`}`
`455`	`454`	`}`
`456`	`455`	`}`
`457`		`- changesInProgress.set(false);`
`458`	`456`	`tabPane.getTabs().removeAll(tabsToRemove);`
	`457`	`+ parent.getChildren().removeAll(items);`
	`458`	`+ changesInProgress.set(false);`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`@Override`