Merge pull request #3513 from ControlSystemStudio/CSSTUDIO-3394

Fix sorting in composite snapshot editor

Author: shroffk

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

@@ -103,6 +103,10 @@ public class CompositeSnapshotController extends SaveAndRestoreBaseController im
     @FXML
     private TableColumn<Node, Node> snapshotPathColumn;
 
+    @SuppressWarnings("unused")
+    @FXML
+    private TableColumn<Node, String> snapshotDescriptionColumn;
+
     @SuppressWarnings("unused")
     @FXML
     private TableView<Node> snapshotTable;
@@ -175,8 +179,6 @@ public void initialize() {
         snapshotTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         snapshotTable.getSelectionModel().selectedItemProperty().addListener((obs, ov, nv) -> selectionEmpty.set(nv == null));
 
-        snapshotNameColumn.setComparator(Comparator.comparing(Node::getName));
-
         MenuItem deleteMenuItem = new MenuItem(Messages.menuItemDeleteSelectedPVs,
                 new ImageView(ImageCache.getImage(SaveAndRestoreController.class, "/icons/delete.png")));
         deleteMenuItem.setOnAction(ae -> {
@@ -223,6 +225,7 @@ public void updateItem(Node item, boolean empty) {
                 };
             }
         });
+        snapshotPathColumn.setComparator(Comparator.comparing(n -> DirectoryUtilities.CreateLocationString(n, true).toLowerCase()));
 
         ContextMenu contextMenu = new ContextMenu();
         MenuItem removeMenuItem = new MenuItem("Remove Selected");
@@ -290,6 +293,9 @@ public void updateItem(Node item, boolean empty) {
                 };
             }
         });
+        snapshotNameColumn.setComparator(Comparator.comparing(n -> n.getName().toLowerCase()));
+
+        snapshotDescriptionColumn.setComparator(Comparator.comparing(String::toLowerCase));
 
         compositeSnapshotNameField.textProperty().bindBidirectional(compositeSnapshotNameProperty);
         compositeSnapshotNameField.disableProperty().bind(userIdentity.isNull());

app/save-and-restore/app/src/main/resources/org/phoebus/applications/saveandrestore/ui/snapshot/CompositeSnapshotEditor.fxml

@@ -104,7 +104,7 @@
                                         <PropertyValueFactory property="path"/>
                                     </cellValueFactory>
                                 </TableColumn>
-                                <TableColumn prefWidth="${parent.width * 0.3}" text="%snapshotDescription"
+                                <TableColumn fx:id="snapshotDescriptionColumn" prefWidth="${parent.width * 0.3}" text="%snapshotDescription"
                                              editable="false">
                                     <cellValueFactory>
                                         <PropertyValueFactory property="description"/>