Changeset 2005 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.java

Timestamp:

2009-08-29T15:51:00+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #2367: panel will be empty when undocked from minimized state
cleanup in Toggle Dialog
new: toggle dialog remember position when detached
new: title in toggle dialog
NOTE: this changeset probably breaks plugins, in particular the validator plugin

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -113 +112 @@
             return;
         if (Main.map == null) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("Nothing to upload. Get some data first."),
@@ -124 +123 @@
         ConflictCollection conflicts = Main.map.mapView.getEditLayer().getConflicts();
         if (conflicts !=null && !conflicts.isEmpty()) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("There are unresolved conflicts. You have to resolve these first."),
@@ -130 +129 @@
                     JOptionPane.WARNING_MESSAGE
             );
-            Main.map.conflictDialog.action.button.setSelected(true);
-            Main.map.conflictDialog.action.actionPerformed(null);
+            Main.map.conflictDialog.showDialog();
             return;
         }
@@ -152 +150 @@
 
         if (add.isEmpty() && update.isEmpty() && delete.isEmpty()) {
-            OptionPaneUtil.showMessageDialog(
+            JOptionPane.showMessageDialog(
                     Main.parent,
                     tr("No changes to upload."),
@@ -226 +224 @@
         );
         int optionsType = JOptionPane.YES_NO_CANCEL_OPTION;
-        int ret = OptionPaneUtil.showOptionDialog(
+        int ret = JOptionPane.showOptionDialog(
                 null,
                 msg,
@@ -232 +230 @@
                 optionsType,
                 JOptionPane.ERROR_MESSAGE,
+                null,
                 options,
                 defaultOption
@@ -265 +264 @@
         );
         int optionsType = JOptionPane.YES_NO_OPTION;
-        int ret = OptionPaneUtil.showOptionDialog(
+        int ret = JOptionPane.showOptionDialog(
                 null,
                 msg,
@@ -271 +270 @@
                 optionsType,
                 JOptionPane.ERROR_MESSAGE,
+                null,
                 options,
                 defaultOption
@@ -385 +385 @@
                         ex.getDisplayMessage()
                 );
-                OptionPaneUtil.showMessageDialog(
+                JOptionPane.showMessageDialog(
                         Main.map,
                         msg,