Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java	(revision 2824)
@@ -264,5 +264,5 @@
             if (visible) {
                 setCanceled(false);
-                WindowGeometry.centerInWindow(Main.parent, getSize()).apply(this);
+                WindowGeometry.centerInWindow(Main.parent, getSize()).applySafe(this);
             }
             super.setVisible(visible);
Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2824)
@@ -340,5 +340,5 @@
             if(visible) {
                 new WindowGeometry(rememberSizePref,
-                        defaultWindowGeometry).apply(this);
+                        defaultWindowGeometry).applySafe(this);
             } else {
                 new WindowGeometry(this).remember(rememberSizePref);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java	(revision 2824)
@@ -300,5 +300,5 @@
                             new Dimension(1000,600)
                     )
-            ).apply(this);
+            ).applySafe(this);
             needsSplitPaneAdjustment = true;
             model.init();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java	(revision 2824)
@@ -149,5 +149,5 @@
                             new Dimension(400,400)
                     )
-            ).apply(this);
+            ).applySafe(this);
             setCanceled(false);
             startUserInput();
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2824)
@@ -348,5 +348,5 @@
                             new Dimension(1000,600)
                     )
-            ).apply(this);
+            ).applySafe(this);
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 2824)
@@ -8,7 +8,5 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -197,5 +195,5 @@
                             new Dimension(600,400)
                     )
-            ).apply(this);
+            ).applySafe(this);
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java	(revision 2824)
@@ -103,5 +103,5 @@
                     getClass().getName() + ".geometry",
                     WindowGeometry.centerInWindow(Main.parent, new Dimension(300,300))
-            ).apply(this);
+            ).applySafe(this);
         } else {
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2824)
@@ -342,5 +342,5 @@
                             new Dimension(400,600)
                     )
-            ).apply(this);
+            ).applySafe(this);
             startUserInput();
         } else if (!visible && isShowing()){
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 2824)
@@ -172,5 +172,5 @@
                             new Dimension(200,400)
                     )
-            ).apply(this);
+            ).applySafe(this);
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java	(revision 2824)
@@ -316,5 +316,5 @@
                             new Dimension(400,400)
                     )
-            ).apply(this);
+            ).applySafe(this);
             initFromPreferences();
         } else if (!visible && isShowing()){
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 2823)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 2824)
@@ -79,5 +79,5 @@
                             new Dimension(600,800)
                     )
-            ).apply(this);
+            ).applySafe(this);
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");