Ticket #17517: 17517.patch

src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

@@ -45 +45 @@
             ChangesetCacheManager.getInstance().addWindowListener(changesetCacheManagerClosedHandler);
             ChangesetCacheManager.getInstance().setVisible(true);
         } else {
-            ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);
             ChangesetCacheManager.destroyInstance();
         }
     }
@@ -55 +54 @@
         public void windowClosed(WindowEvent e) {
             setSelected(false);
             notifySelectedState();
-            ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);
         }
     }
 }

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

@@ -484 +484 @@
             ChangesetCacheManager cm = ChangesetCacheManager.getInstance();
             if (cm.isVisible()) {
                 cm.setExtendedState(Frame.NORMAL);
-                cm.toFront();
-                cm.requestFocus();
             } else {
                 cm.setVisible(true);
-                cm.toFront();
-                cm.requestFocus();
             }
+            cm.toFront();
             cm.setSelectedChangesetsById(toSelect);
         }
 

src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -64 +64 @@
 import org.openstreetmap.josm.io.ChangesetQuery;
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Logging;
@@ -103 +102 @@
     public static void destroyInstance() {
         if (instance != null) {
             instance.setVisible(false);
+            GuiHelper.destroyComponents(instance, false);
             instance.dispose();
-            for (Component c : instance.pnlChangesetDetailTabs.getComponents()) {
-                if (c instanceof Destroyable) {
-                    ((Destroyable) c).destroy();
-                }
-            }
             instance = null;
         }
     }
@@ -351 +346 @@
     class WindowEventHandler extends WindowAdapter {
         @Override
         public void windowClosing(WindowEvent e) {
-            new CancelAction().cancelAndClose();
+            destroyInstance();
         }
 
         @Override