moved uniqueIdSearch() from SearchAndFilterViewController.java to SearchResultTableViewController.java

Author: jasonbrudvikess

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

@@ -228,12 +228,13 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         uniqueIdTextField.textProperty().bindBidirectional(uniqueIdProperty);
         uniqueIdTextField.setOnKeyPressed(e -> {
             if (e.getCode() == KeyCode.ENTER) {
-                // updateParametersAndSearch();
-                LOGGER.log(Level.INFO, "Hello uniqueIdTextField");
-                LOGGER.log(Level.INFO, "uniqueIdTextField: " + uniqueIdTextField.textProperty().getValue());
+                LOGGER.log(Level.INFO, "ENTER has been pressed in uniqueIdTextField");
                 LOGGER.log(Level.INFO, "uniqueIdProperty: " + uniqueIdProperty.getValueSafe());
-
-                uniqueIdSearch();
+                if (uniqueIdProperty.isEmpty().get()) {
+                    LOGGER.log(Level.INFO, "uniqueIdString: is empty");
+                } else {
+                    searchResultTableViewController.uniqueIdSearch(uniqueIdProperty.getValueSafe());
+                }
             }
         });
         nodeNameTextField.textProperty().bindBidirectional(nodeNameProperty);
@@ -366,8 +367,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         filterNameTextField.textProperty().bindBidirectional(filterNameProperty);
         filterNameTextField.disableProperty().bind(saveAndRestoreController.getUserIdentity().isNull());
         saveFilterButton.disableProperty().bind(Bindings.createBooleanBinding(() ->
-            filterNameProperty.get() == null ||
-                filterNameProperty.get().isEmpty() ||
+            filterNameProperty.isEmpty().get() ||
                 saveAndRestoreController.getUserIdentity().isNull().get() ||
                 uniqueIdProperty.isNotEmpty().get(),
             filterNameProperty, saveAndRestoreController.getUserIdentity(), uniqueIdProperty));
@@ -479,59 +479,6 @@ public void showTagsSelectionPopover() {
         }
     }
 
-    /**
-     * Search with a unique ID
-     * Results will be 0 or 1 entries
-     * Fill results table
-     */
-    private void uniqueIdSearch() {
-        LOGGER.log(Level.INFO, "Hello uniqueIdSearch");
-        LOGGER.log(Level.INFO, "uniqueIdProperty: " + uniqueIdProperty);
-        LOGGER.log(Level.INFO, "uniqueIdProperty.getValueSafe(): " + uniqueIdProperty.getValueSafe());
-
-        if (uniqueIdProperty.get() == null) {
-            LOGGER.log(Level.INFO, "uniqueIdProperty: is null");
-        } else {
-            LOGGER.log(Level.INFO, "uniqueIdProperty: is not null");
-        }
-        if (uniqueIdProperty.isEmpty().get()) {
-            LOGGER.log(Level.INFO, "uniqueIdProperty: is empty");
-        } else {
-            LOGGER.log(Level.INFO, "uniqueIdProperty: is not empty");
-        }
-
-        try {
-            /* Search with the uniqueID */
-            Node uniqueIdNode = SaveAndRestoreService.getInstance().getNode(uniqueIdProperty.getValueSafe());
-            LOGGER.log(Level.INFO, "uniqueIDNode: " + uniqueIdNode);
-
-            /* Check that there are results, fill table - should be at most one result */
-            if (uniqueIdNode != null) {
-                LOGGER.log(Level.INFO, "uniqueID: " + uniqueIdNode.getUniqueId());
-                LOGGER.log(Level.INFO, "name: " + uniqueIdNode.getName());
-
-                Platform.runLater(() -> {
-                    tableEntries.setAll(List.of(uniqueIdNode));
-                    hitCountProperty.set(1);
-                });
-            /* Clear the results table if no record returned */
-            } else {
-                Platform.runLater(tableEntries::clear);
-                hitCountProperty.set(0);
-            }
-        } catch (Exception e) {
-            ExceptionDetailsErrorDialog.openError(
-                    resultTableView,
-                    Messages.errorGeneric,
-                    Messages.searchErrorBody,
-                    e
-            );
-            /* Clear the results table if there's an error*/
-            tableEntries.clear();
-            hitCountProperty.set(0);
-        }
-    }
-
     private void updateParametersAndSearch() {
         if (searchDisabled) {
             return;

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

@@ -69,6 +69,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -133,6 +135,7 @@ public class SearchResultTableViewController extends SaveAndRestoreBaseControlle
     private final SimpleIntegerProperty pageSizeProperty =
             new SimpleIntegerProperty(Preferences.search_result_page_size);
     private String queryString;
+    private static final Logger LOGGER = Logger.getLogger(SearchResultTableViewController.class.getName());
 
     private SaveAndRestoreService saveAndRestoreService;
 
@@ -355,6 +358,43 @@ public void search(final String query) {
         });
     }
 
+    /**
+     * Search with a unique ID
+     * Results will be 0 or 1 entry
+     * Fill results table
+     */
+    void uniqueIdSearch(final String uniqueIdString) {
+        LOGGER.log(Level.INFO, "uniqueIdSearch() called with: uniqueIdString = " + uniqueIdString);
+        try {
+            /* Search with the uniqueID */
+            Node uniqueIdNode = SaveAndRestoreService.getInstance().getNode(uniqueIdString);
+            LOGGER.log(Level.INFO, "uniqueIDNode: " + uniqueIdNode);
+
+            /* Check that there are results, then fill table - should be at most one result */
+            if (uniqueIdNode != null) {
+                LOGGER.log(Level.INFO, "uniqueIdNode.getName(): " + uniqueIdNode.getName());
+                Platform.runLater(() -> {
+                    tableEntries.setAll(List.of(uniqueIdNode));
+                    hitCountProperty.set(1);
+                });
+            /* Clear the results table if no record returned */
+            } else {
+                Platform.runLater(tableEntries::clear);
+                hitCountProperty.set(0);
+            }
+        } catch (Exception e) {
+            ExceptionDetailsErrorDialog.openError(
+                    resultTableView,
+                    Messages.errorGeneric,
+                    Messages.searchErrorBody,
+                    e
+            );
+            /* Clear the results table if there's an error */
+            tableEntries.clear();
+            hitCountProperty.set(0);
+        }
+    }
+
     /**
      * Retrieves a filter from the service and loads then performs a search for matching {@link Node}s. If
      * the filter does not exist, or if retrieval fails, an error dialog is shown.