Ticket #17040: 17040-toggle-dlg.patch

src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -17 +17 @@
 import javax.swing.JCheckBox;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
@@ -247 +246 @@
     public void destroy() {
         MultikeyActionsHandler.getInstance().removeAction(enableFilterAction);
         MultikeyActionsHandler.getInstance().removeAction(hidingFilterAction);
+        userTable = null;
         super.destroy();
     }
 
@@ -301 +301 @@
      * Updates the headline of this dialog to display the number of active filters.
      */
     public void updateDialogHeader() {
-        SwingUtilities.invokeLater(() -> setTitle(
-                tr("Filter Hidden:{0} Disabled:{1}",
-                        filterModel.model.getDisabledAndHiddenCount(), filterModel.model.getDisabledCount())));
+        setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.model.getDisabledAndHiddenCount(),
+                filterModel.model.getDisabledCount()));
     }
 
     /**

src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -469 +469 @@
         }
         Config.getPref().removePreferenceChangeListener(this);
         GuiHelper.destroyComponents(this, false);
+        titleBar.destroy();
+        titleBar = null;
+        this.buttonActions.clear();
     }
 
     /**
@@ -500 +503 @@
     /**
      * The title bar displayed in docked mode
      */
-    protected class TitleBar extends JPanel {
+    protected class TitleBar extends JPanel implements Destroyable {
         /** the label which shows whether the toggle dialog is expanded or collapsed */
         private final JLabel lblMinimized;
         /** the label which displays the dialog's title **/
@@ -511 +514 @@
         /** the contextual menu **/
         private DialogPopupMenu popupMenu;
 
+        private MouseEventHandler mouseEventHandler;
+
         @SuppressWarnings("unchecked")
         public TitleBar(String toggleDialogName, String iconName) {
             setLayout(new GridBagLayout());
@@ -632 +637 @@
          */
         public final void registerMouseListener() {
             popupMenu = new DialogPopupMenu();
-            addMouseListener(new MouseEventHandler());
+            mouseEventHandler = new MouseEventHandler();
+            addMouseListener(mouseEventHandler);
         }
 
         class MouseEventHandler extends PopupMenuLauncher {
@@ -656 +662 @@
                 }
             }
         }
+
+        @Override
+        public void destroy() {
+            removeMouseListener(mouseEventHandler);
+            this.mouseEventHandler = null;
+            this.popupMenu = null;
+        }
     }
 
     /**
@@ -753 +766 @@
      * @param title The dialog's title
      */
     public void setTitle(String title) {
-        titleBar.setTitle(title);
+        if (titleBar != null) {
+            titleBar.setTitle(title);
+        }
         if (detachedDialog != null) {
             detachedDialog.setTitle(title);
         }