CSSTUDIO-2371 Introduce a setter method for LogEntryTableViewControll…

…er.goBackAndGoForwardActions and make setting this field optional.
ControlSystemStudio · Aug 28, 2024 · 453a960 · 453a960
1 parent be5a85d
commit 453a960
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryDisplayController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryDisplayController.java
@@ -148,12 +148,16 @@ public void newLogEntry(){
 
     @FXML
     public void goBack() {
-        logEntryTableViewController.goBackAndGoForwardActions.goBack();
+        if (logEntryTableViewController.goBackAndGoForwardActions.isPresent()) {
+            logEntryTableViewController.goBackAndGoForwardActions.get().goBack();
+        }
     }
 
     @FXML
     public void goForward() {
-        logEntryTableViewController.goBackAndGoForwardActions.goForward();
+        if (logEntryTableViewController.goBackAndGoForwardActions.isPresent()) {
+            logEntryTableViewController.goBackAndGoForwardActions.get().goForward();
+        }
     }
 
     public void setLogEntry(LogEntry logEntry) {
@@ -187,7 +191,9 @@ public void updateLogEntry(LogEntry logEntry){
 
     public void setLogEntryTableViewController(LogEntryTableViewController logEntryTableViewController){
         this.logEntryTableViewController = logEntryTableViewController;
-        goBackButton.disableProperty().bind(Bindings.isEmpty(logEntryTableViewController.goBackAndGoForwardActions.goBackActions));
-        goForwardButton.disableProperty().bind(Bindings.isEmpty(logEntryTableViewController.goBackAndGoForwardActions.goForwardActions));
+        if (logEntryTableViewController.goBackAndGoForwardActions.isPresent()) {
+            goBackButton.disableProperty().bind(Bindings.isEmpty(logEntryTableViewController.goBackAndGoForwardActions.get().goBackActions));
+            goForwardButton.disableProperty().bind(Bindings.isEmpty(logEntryTableViewController.goBackAndGoForwardActions.get().goForwardActions));
+        }
     }
 }
diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTable.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTable.java
@@ -49,8 +49,9 @@ public LogEntryTable(final LogEntryTableApp app) {
                 try {
                     if (app.getClient() != null) {
                         if (clazz.isAssignableFrom(LogEntryTableViewController.class)) {
-                            return clazz.getConstructor(LogClient.class, OlogQueryManager.class, SearchParameters.class, GoBackAndGoForwardActions.class)
-                                    .newInstance(app.getClient(), ologQueryManager, searchParameters, goBackAndGoForwardActions);
+                            LogEntryTableViewController logEntryTableViewController = (LogEntryTableViewController) clazz.getConstructor(LogClient.class, OlogQueryManager.class, SearchParameters.class).newInstance(app.getClient(), ologQueryManager, searchParameters);
+                            logEntryTableViewController.setGoBackAndGoForwardActions(goBackAndGoForwardActions);
+                            return logEntryTableViewController;
                         } else if (clazz.isAssignableFrom(AdvancedSearchViewController.class)) {
                             return clazz.getConstructor(LogClient.class, SearchParameters.class)
                                     .newInstance(app.getClient(), searchParameters);

diff --git a/...ogbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java b/...ogbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java
@@ -107,12 +107,14 @@ public class LogEntryTableViewController extends LogbookSearchController {
      */
     public LogEntryTableViewController(LogClient logClient,
                                        OlogQueryManager ologQueryManager,
-                                       SearchParameters searchParameters,
-                                       LogEntryTable.GoBackAndGoForwardActions goBackAndGoForwardActions) {
+                                       SearchParameters searchParameters) {
         setClient(logClient);
         this.ologQueryManager = ologQueryManager;
         this.searchParameters = searchParameters;
-        this.goBackAndGoForwardActions = goBackAndGoForwardActions;
+    }
+
+    protected void setGoBackAndGoForwardActions(LogEntryTable.GoBackAndGoForwardActions goBackAndGoForwardActions) {
+        this.goBackAndGoForwardActions = Optional.of(goBackAndGoForwardActions);
     }
 
     private final SimpleIntegerProperty hitCountProperty = new SimpleIntegerProperty(0);
@@ -125,8 +127,7 @@ public LogEntryTableViewController(LogClient logClient,
 
     private final SearchParameters searchParameters;
 
-    protected final LogEntryTable.GoBackAndGoForwardActions goBackAndGoForwardActions;
-
+    protected Optional<LogEntryTable.GoBackAndGoForwardActions> goBackAndGoForwardActions = Optional.empty();
 
     @FXML
     public void initialize() {
@@ -188,9 +189,9 @@ public void initialize() {
         tableView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             // Update detailed view, but only if selection contains a single item.
             if (newValue != null && tableView.getSelectionModel().getSelectedItems().size() == 1) {
-                if (!goBackAndGoForwardActions.getIsRecordingHistoryDisabled()) {
-                    goBackAndGoForwardActions.addGoBackAction();
-                    goBackAndGoForwardActions.goForwardActions.clear();
+                if (goBackAndGoForwardActions.isPresent() && !goBackAndGoForwardActions.get().getIsRecordingHistoryDisabled()) {
+                    goBackAndGoForwardActions.get().addGoBackAction();
+                    goBackAndGoForwardActions.get().goForwardActions.clear();
                 }
                 logEntryDisplayController.setLogEntry(newValue.getLogEntry());
             }
@@ -403,9 +404,14 @@ private void refresh() {
                 for (TableViewListItem item : tableView.getItems()) {
                     if (item.getLogEntry().getId().equals(selectedItem.getLogEntry().getId())) {
                         Platform.runLater(() -> {
-                            goBackAndGoForwardActions.setIsRecordingHistoryDisabled(true); // Do not create a "Back" action for the automatic reload.
-                            tableView.getSelectionModel().select(item);
-                            goBackAndGoForwardActions.setIsRecordingHistoryDisabled(false);
+                            if (goBackAndGoForwardActions.isPresent()) {
+                                goBackAndGoForwardActions.get().setIsRecordingHistoryDisabled(true); // Do not create a "Back" action for the automatic reload.
+                                tableView.getSelectionModel().select(item);
+                                goBackAndGoForwardActions.get().setIsRecordingHistoryDisabled(false);
+                            }
+                            else {
+                                tableView.getSelectionModel().select(item);
+                            }
                         });
                     }
                 }