Changeset 10384 in josm

Timestamp:

2016-06-15T14:58:34+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12954 - IllegalComponentStateException with detached dialogs

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/IconToggleButton.java (modified) (2 diffs)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• tools/WindowGeometry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -41 +42 @@
     public IconToggleButton(Action action, boolean isExpert) {
         super(action);
+        CheckParameterUtil.ensureParameterNotNull(action, "action");
         this.isExpert = isExpert;
         setText(null);

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

@@ -716 +716 @@
 
         protected void rememberGeometry() {
-            if (detachedDialog != null) {
+            if (detachedDialog != null && detachedDialog.isShowing()) {
                 new WindowGeometry(detachedDialog).remember(preferencePrefix+".geometry");
             }

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -9 +9 @@
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.awt.IllegalComponentStateException;
 import java.awt.Insets;
 import java.awt.Point;
@@ -57 +58 @@
      *
      * @param window the window
+     * @throws IllegalComponentStateException if the window is not showing on the screen
      */
     public WindowGeometry(Window window) {