Sar bug fix

app/save-and-restore/app/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;

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/CompositeSnapshotTab.java

@@ -40,6 +40,11 @@
 /**
  * Tab for creating or editing composite snapshots,
  * i.e. for node type {@link org.phoebus.applications.saveandrestore.model.NodeType#COMPOSITE_SNAPSHOT}.
+ *
+ * <p>
+ *     Note that this class is only for editing of {@link Node}s of type {@link org.phoebus.applications.saveandrestore.model.NodeType#COMPOSITE_SNAPSHOT}.
+ *     {@link SnapshotTab} is used to show actual snapshot data.
+ * </p>
  */
 public class CompositeSnapshotTab extends SaveAndRestoreTab {
 

app/save-and-restore/app/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) {

app/save-and-restore/app/src/main/java/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);
     }

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotTab.java

@@ -42,6 +42,10 @@
  * {@link Tab} subclass showing a view for the purpose of creating or restoring a snapshot.
  * These two use cases/views are split in terms of fxml files and controller classes in order to facilitate development
  * and maintenance.
+ *
+ * <p>
+ *     Note that this class is used also to show the snapshot view for {@link Node}s of type {@link NodeType#COMPOSITE_SNAPSHOT}.
+ * </p>
  */
 public class SnapshotTab extends SaveAndRestoreTab {