Merge pull request #3112 from ControlSystemStudio/tab_close

Use the dockpane close listener instead of tab.onclose #3111
ControlSystemStudio · Aug 16, 2024 · 36d1e2a · 36d1e2a
2 parents ab65c5c + 75f4084
commit 36d1e2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalender.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalender.java
@@ -77,9 +77,7 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){
                 log.log(Level.SEVERE, "Failed to acquire a valid logbook client");
             }
             tab = new DockItem(this, loader.getRoot());
-            tab.setOnClosed(event -> {
-                controller.shutdown();
-            });
+            tab.addClosedNotification(()-> controller.shutdown());
             DockPane.getActiveDockPane().addTab(tab);
         } catch (IOException e)
         {

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
@@ -80,7 +80,7 @@ public LogEntryTable(final LogEntryTableApp app) {
             loader.load();
             controller = loader.getController();
             DockItem tab = new DockItem(this, loader.getRoot());
-            tab.setOnClosed(event -> controller.shutdown());
+            tab.addClosedNotification(()-> controller.shutdown());
             DockPane.getActiveDockPane().addTab(tab);
         } catch (IOException e) {
             log.log(Level.WARNING, "Cannot load UI", e);

diff --git a/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalender.java b/app/logbook/ui/src/main/java/org/phoebus/logbook/ui/LogEntryCalender.java
@@ -60,7 +60,7 @@ else if(clazz.isAssignableFrom(AdvancedSearchViewController.class)){
         {
             Logger.getLogger(getClass().getName()).log(Level.WARNING, "Cannot load UI", e);
         }
-        tab.setOnClosed(event -> {
+        tab.addClosedNotification(()->{
             // dispose();
         });
     }