Decided to support only single node selection of for save&restore create log

Author: georgweiss

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

@@ -1463,18 +1463,15 @@ public void configureContextMenu(ContextMenuEvent e) {
         ObservableList<? extends TreeItem<Node>> selectedItems = browserSelectionModel.getSelectedItems();
         selectedItemsProperty.setAll(selectedItems.stream().map(TreeItem::getValue).toList());
 
-        // Need to construct the selection carefully in order to be able to match an AdapterFactory to it.
-        List<List<Node>> selection = new ArrayList<>();
-        List<Node> nodes = new ArrayList<>();
-        nodes.addAll(selectedItemsProperty);
-        selection.add(nodes);
-        SelectionService.getInstance().setSelection(SaveAndRestoreApplication.NAME, selection);
-
         contextMenu.getItems().clear();
         contextMenu.getItems().addAll(menuItems);
+
+        // Add log entry menu item...
+        SelectionService.getInstance().setSelection(SaveAndRestoreApplication.NAME,
+                selectedItemsProperty.size() == 1 ? List.of(selectedItemsProperty.get(0)) : Collections.emptyList());
         List<ContextMenuEntry> supported = ContextMenuService.getInstance().listSupportedContextMenuEntries();
 
-        supported.stream().forEach(action -> {
+        supported.forEach(action -> {
             MenuItem menuItem = new MenuItem(action.getName(), new ImageView(action.getIcon()));
             menuItem.setOnAction((ee) -> {
                 try {
@@ -1483,7 +1480,8 @@ public void configureContextMenu(ContextMenuEvent e) {
                     logger.log(Level.WARNING, "Failed to execute " + action.getName() + " from display builder.", ex);
                 }
             });
-            menuItem.disableProperty().set(selectedItemsProperty.isEmpty());
+            //... but disable if selection count != 1
+            menuItem.disableProperty().set(selectedItemsProperty.size() != 1);
             contextMenu.getItems().add(menuItem);
         });
 

app/save-and-restore/logging/src/main/java/org/phoebus/applications/saveandrestore/logging/NodeSelectionAdapterFactory.java

@@ -10,7 +10,6 @@
 import org.phoebus.logbook.LogEntryImpl;
 import org.phoebus.logbook.PropertyImpl;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -20,14 +19,14 @@
 import static org.phoebus.logbook.LogEntryImpl.LogEntryBuilder.log;
 
 /**
- * Adapts a selection of save&restore {@link Node}s to a log entry. Each selected {@link Node}
- * is added as a separate property with a name constructed from the {@link Node}'s name.
+ * Adapts a selection of save&restore {@link Node} to a log entry. The {@link Node} is
+ * added as a resource property.
  */
 public class NodeSelectionAdapterFactory implements AdapterFactory {
 
     @Override
     public Class getAdaptableObject() {
-        return ArrayList.class;
+        return Node.class;
     }
 
     @Override
@@ -37,17 +36,13 @@ public List<? extends Class> getAdapterList() {
 
     @Override
     public <T> Optional<T> adapt(Object adaptableObject, Class<T> adapterType) {
-        List<Node> selectedNodes = (List<Node>) adaptableObject;
-        List<Map> properties = new ArrayList<>();
-        selectedNodes.forEach(n -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("file", "file:/" + n.getUniqueId() + "?app=saveandrestore");
-            map.put("name", n.getName());
-            properties.add(map);
-        });
-
-        LogEntryImpl.LogEntryBuilder log = log().description("");
-        properties.forEach(m -> log.appendProperty(PropertyImpl.of("Save&restore resource " + m.get("name"), m)));
+        Node selectedNode = (Node) adaptableObject;
+        Map<String, String> map = new HashMap<>();
+        map.put("file", "file:/" + selectedNode.getUniqueId() + "?app=saveandrestore");
+        map.put("name", selectedNode.getName());
+
+        LogEntryImpl.LogEntryBuilder log = log().description("")
+                .appendProperty(PropertyImpl.of("resource", map));
         return Optional.of(adapterType.cast(log.build()));
     }
 }