Updates due to review feed-back

Author: georgweiss

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

@@ -1272,7 +1272,7 @@ private void pasteFromClipboard() {
         }
         List<String> selectedNodeIds =
                 ((List<Node>) selectedNodes).stream().map(Node::getUniqueId).collect(Collectors.toList());
-        JobManager.schedule("Copy odes", monitor -> {
+        JobManager.schedule("Copy nodes", monitor -> {
             try {
                 saveAndRestoreService.copyNodes(selectedNodeIds, browserSelectionModel.getSelectedItem().getValue().getUniqueId());
                 disabledUi.set(false);

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigurationController.java

@@ -477,7 +477,7 @@ public void newConfiguration(Node parentNode) {
      *
      * @param node An existing {@link Node} of type {@link NodeType#CONFIGURATION}.
      */
-    public synchronized void loadConfiguration(final Node node) {
+    public void loadConfiguration(final Node node) {
         removeListeners();
         JobManager.schedule("Load save&restore configuration", monitor -> {
             final ConfigurationData configurationData;

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

@@ -381,7 +381,7 @@ private void loadSnapshotInternal(Node snapshotNode) {
      *
      * @param snapshotNode An existing {@link Node} of type {@link NodeType#SNAPSHOT}
      */
-    public synchronized void loadSnapshot(Node snapshotNode) {
+    public void loadSnapshot(Node snapshotNode) {
         snapshotControlsViewController.setSnapshotNode(snapshotNode);
         snapshotControlsViewController.setSnapshotRestorableProperty(true);
         snapshotTableViewController.setSelectionColumnVisible(true);

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

@@ -107,8 +107,6 @@ public SnapshotTab(org.phoebus.applications.saveandrestore.model.Node node, Save
             compareSnapshotToArchiverDataMenuItem.disableProperty().set(snapshot.getSnapshotNode().getUniqueId() == null);
         });
         getContextMenu().getItems().add(compareSnapshotToArchiverDataMenuItem);
-
-        //WebSocketClientService.getInstance().addWebSocketMessageHandler(this);
     }
 
     /**

app/save-and-restore/model/src/main/java/org/phoebus/applications/saveandrestore/model/websocket/WebMessageDeserializer.java

@@ -10,6 +10,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import org.phoebus.applications.saveandrestore.model.Node;
+import org.phoebus.applications.saveandrestore.model.search.Filter;
 
 /**
  * Custom JSON deserializer of {@link SaveAndRestoreWebSocketMessage}s.
@@ -37,16 +39,20 @@ public SaveAndRestoreWebSocketMessage<? extends Object> deserialize(JsonParser j
             JsonNode rootNode = jsonParser.getCodec().readTree(jsonParser);
             String messageType = rootNode.get("messageType").asText();
             switch (MessageType.valueOf(messageType)) {
-                case NODE_ADDED, NODE_REMOVED, FILTER_REMOVED -> {
-                    return objectMapper.readValue(rootNode.toString(), SaveAndRestoreWebSocketMessage.class);
+                case NODE_ADDED, NODE_REMOVED, FILTER_REMOVED-> {
+                    SaveAndRestoreWebSocketMessage<String> saveAndRestoreWebSocketMessage =
+                            objectMapper.readValue(rootNode.toString(), SaveAndRestoreWebSocketMessage.class);
+                    return saveAndRestoreWebSocketMessage;
                 }
                 case NODE_UPDATED -> {
-                    return objectMapper.readValue(rootNode.toString(), new TypeReference<>() {
+                    SaveAndRestoreWebSocketMessage<Node> saveAndRestoreWebSocketMessage = objectMapper.readValue(rootNode.toString(), new TypeReference<>() {
                     });
+                    return saveAndRestoreWebSocketMessage;
                 }
                 case FILTER_ADDED_OR_UPDATED -> {
-                    return objectMapper.readValue(rootNode.toString(), new TypeReference<>() {
+                    SaveAndRestoreWebSocketMessage<Filter> saveAndRestoreWebSocketMessage = objectMapper.readValue(rootNode.toString(), new TypeReference<>() {
                     });
+                    return saveAndRestoreWebSocketMessage;
                 }
             }
         } catch (Exception e) {