Changeset 5998 in josm

Timestamp:

2013-06-10T00:55:26+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8775 - IllegalComponentStateException when remembering position of dialogs not displayed on screen

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• actionsupport/DeleteFromRelationConfirmationDialog.java (modified) (1 diff)
• conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)
• conflict/tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)
• dialogs/ConflictResolutionDialog.java (modified) (1 diff)
• dialogs/changeset/ChangesetCacheManager.java (modified) (1 diff)
• dialogs/changeset/query/ChangesetQueryDialog.java (modified) (1 diff)
• download/DownloadDialog.java (modified) (1 diff)
• help/HelpBrowser.java (modified) (1 diff)
• io/CloseChangesetDialog.java (modified) (1 diff)
• io/UploadDialog.java (modified) (1 diff)
• io/UploadSelectionDialog.java (modified) (1 diff)
• oauth/OAuthAuthorizationWizard.java (modified) (1 diff)
• preferences/PreferenceDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java

@@ -169 +169 @@
             ).applySafe(this);
             setCanceled(false);
-        } else if(!visible && isShowing()) {
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -374 +374 @@
             setCanceled(false);
             btnApply.requestFocusInWindow();
-        } else {
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -319 +319 @@
                     WindowGeometry.centerOnScreen(new Dimension(400,300))
             ).applySafe(this);
-        } else {
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -56 +56 @@
                 new Dimension(600, 400))).applySafe(this);
         } else {
-            new WindowGeometry(this).remember(geom);
+            if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
+                new WindowGeometry(this).remember(geom);
+            }
             unregisterListeners();
         }

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

@@ -301 +301 @@
             model.init();
 
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             model.tearDown();
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

@@ -152 +152 @@
             setCanceled(false);
             startUserInput();
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
             pnlAdvancedQueries.rememberSettings();

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -366 +366 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -209 +209 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

@@ -103 +103 @@
                     WindowGeometry.centerInWindow(Main.parent, new Dimension(300,300))
             ).applySafe(this);
-        } else {
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -365 +365 @@
             ).applySafe(this);
             startUserInput();
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -170 +170 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -295 +295 @@
             ).applySafe(this);
             initFromPreferences();
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -121 +121 @@
                     )
             ).applySafe(this);
-        } else if (!visible && isShowing()){
+        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }