Bug fix for composite snapshot

ControlSystemStudio · Jan 17, 2024 · cd51e68 · cd51e68
1 parent e1bf80c
commit cd51e68
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/...pp/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java b/...pp/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java
@@ -565,7 +565,7 @@ public void nodeDoubleClicked(Node node) {
                 TreeItem<Node> treeItem = browserSelectionModel.getSelectedItems().get(0);
                 tab = new SnapshotTab(treeItem.getValue(), saveAndRestoreService);
                 ((SnapshotTab) tab).loadSnapshot(treeItem.getValue());
-                return;
+                break;
             case FOLDER:
             default:
                 return;

diff --git a/...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java b/...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
@@ -346,12 +346,7 @@ public void loadSnapshot(Node snapshotNode) {
         snapshotControlsViewController.setSnapshotRestorableProperty(true);
         snapshotTableViewController.setSelectionColumnVisible(true);
 
-        if (snapshotNode.getNodeType().equals(NodeType.SNAPSHOT)) {
-            loadSnapshotInternal(snapshotNode);
-        } else {
-            snapshotControlsViewController.setNameAndCommentDisabled(true);
-            loadSnapshotInternal(snapshotNode);
-        }
+        loadSnapshotInternal(snapshotNode);
     }
 
     public void restore(ActionEvent actionEvent) {

diff --git a/...a/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotControlsViewController.java b/...a/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotControlsViewController.java
@@ -306,11 +306,6 @@ public SimpleBooleanProperty getSnapshotRestorableProperty() {
         return snapshotRestorableProperty;
     }
 
-    public void setNameAndCommentDisabled(boolean disabled) {
-        snapshotName.disableProperty().set(disabled);
-        snapshotComment.disableProperty().set(disabled);
-    }
-
     public void setSnapshotNode(Node node) {
         snapshotNodeProperty.set(node);
     }