From cd51e68516b9ce75c2812fb61cfbe4ade368dc21 Mon Sep 17 00:00:00 2001 From: georgweiss Date: Wed, 17 Jan 2024 13:44:26 +0100 Subject: [PATCH] Bug fix for composite snapshot --- .../saveandrestore/ui/SaveAndRestoreController.java | 2 +- .../saveandrestore/ui/snapshot/SnapshotController.java | 7 +------ .../ui/snapshot/SnapshotControlsViewController.java | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) 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 index dfae860eb7..0a6cc0dd3e 100644 --- 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 @@ -565,7 +565,7 @@ public void nodeDoubleClicked(Node node) { TreeItem 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/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java index 20d024e70b..5d32f295a3 100644 --- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java +++ b/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) { diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotControlsViewController.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotControlsViewController.java index b0da33a7d9..705d60aa32 100644 --- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotControlsViewController.java +++ b/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); }