Changeset 2032 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-09-03T09:29:22+02:00 (15 years ago)

Author:

stoecker

Message:

fix #3377 - patch by xeen - removed deprecated calls

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractMergeAction.java (modified) (1 diff)
• actions/CombineWayAction.java (modified) (3 diffs)
• gui/ConditionalOptionPaneUtil.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)
• io/GpxExporter.java (modified) (1 diff)
• plugins/PluginSelection.java (modified) (3 diffs)

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

@@ -66 +66 @@
         layerList.setModel(new DefaultComboBoxModel(targetLayers.toArray()));
         layerList.setSelectedIndex(0);
-    
+
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
         pnl.add(new JLabel(tr("Please select the target layer.")), GBC.eol());
         pnl.add(layerList, GBC.eol());
-    
-        int decision = new ExtendedDialog(Main.parent, tr("Select target layer"), pnl, new String[] { tr("Merge"),
-            tr("Cancel") }, new String[] { "dialogs/mergedown", "cancel" }).getValue();
-        if (decision != 1)
+
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                tr("Select target layer"),
+                new String[] { tr("Merge"), tr("Cancel") });
+        ed.setButtonIcons(new String[] { "dialogs/mergedown", "cancel" });
+        ed.setContent(pnl);
+        ed.showDialog();
+        if (ed.getValue() != 1)
             return null;
+
         Layer targetLayer = (Layer) layerList.getSelectedItem();
         return targetLayer;

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

@@ -118 +118 @@
         for (HashSet<Way> waylinks : backlinks.values()) {
             if (!waylinks.containsAll(selectedWays)) {
-                int option = new ExtendedDialog(Main.parent,
+
+                ExtendedDialog ed = new ExtendedDialog(Main.parent,
                         tr("Combine ways with different memberships?"),
-                        tr("The selected ways have differing relation memberships.  "
-                                + "Do you still want to combine them?"),
-                                new String[] {tr("Combine Anyway"), tr("Cancel")},
-                                new String[] {"combineway.png", "cancel.png"}).getValue();
-                if (option == 1) {
+                        new String[] {tr("Combine Anyway"), tr("Cancel")});
+                ed.setButtonIcons(new String[] {"combineway.png", "cancel.png"});
+                ed.setContent(tr("The selected ways have differing relation memberships.  "
+                        + "Do you still want to combine them?"));
+                ed.showDialog();
+
+                if (ed.getValue() == 1) {
                     break;
                 }
@@ -150 +153 @@
             Object secondTry = actuallyCombineWays(selectedWays, true);
             if (secondTry instanceof List<?>) {
-                int option = new ExtendedDialog(Main.parent,
+                ExtendedDialog ed = new ExtendedDialog(Main.parent,
                         tr("Change directions?"),
-                        tr("The ways can not be combined in their current directions.  "
-                                + "Do you want to reverse some of them?"),
-                                new String[] {tr("Reverse and Combine"), tr("Cancel")},
-                                new String[] {"wayflip.png", "cancel.png"}).getValue();
-                if (option != 1) return;
+                        new String[] {tr("Reverse and Combine"), tr("Cancel")});
+                ed.setButtonIcons(new String[] {"wayflip.png", "cancel.png"});
+                ed.setContent(tr("The ways can not be combined in their current directions.  "
+                        + "Do you want to reverse some of them?"));
+                ed.showDialog();
+                if (ed.getValue() != 1) return;
+
                 nodeList = (List<Node>) secondTry;
             } else {
@@ -205 +210 @@
 
         if (!components.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent,
+
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Enter values for all conflicts."),
-                    p,
-                    new String[] {tr("Solve Conflicts"), tr("Cancel")},
-                    new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
-            if (answer != 1) return;
+                    new String[] {tr("Solve Conflicts"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"dialogs/conflict.png", "cancel.png"});
+            ed.setContent(p);
+            ed.showDialog();
+
+            if (ed.getValue() != 1) return;
 
             for (Entry<String, JComboBox> e : components.entrySet()) {

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

@@ -27 +27 @@
  * 
  */
-public class ConditionalOptionPaneUtil {
+@Deprecated public class ConditionalOptionPaneUtil {
     static public final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE;
 

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

@@ -636 +636 @@
         }
 
-        LinkedList<TaggingPreset> p = new LinkedList<TaggingPreset>();
         presets.removeAll();
         int total = nodes+ways+relations+closedways;
@@ -831 +830 @@
         protected void deleteFromRelation(int row) {
             Relation cur = (Relation)membershipData.getValueAt(row, 0);
-            int result = new ExtendedDialog(Main.parent,
+
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Change relation"),
-                    tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())),
-                    new String[] {tr("Delete from relation"), tr("Cancel")},
-                    new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
-
-            if(result != 1)
+                    new String[] {tr("Delete from relation"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
+            ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
+            ed.showDialog();
+
+            if(ed.getValue() != 1)
                 return;
 

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -112 +112 @@
         p.add(keywords, GBC.eop().fill(GBC.HORIZONTAL));
 
-        int answer = new ExtendedDialog(Main.parent, tr("Export options"), p, new String[] { tr("Export and Save"),
-            tr("Cancel") }, new String[] { "exportgpx.png", "cancel.png" }).getValue();
-        if (answer != 1)
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                tr("Export options"),
+                new String[] { tr("Export and Save"), tr("Cancel") });
+        ed.setButtonIcons(new String[] { "exportgpx.png", "cancel.png" });
+        ed.setContent(p);
+        ed.showDialog();
+
+        if (ed.getValue() != 1)
             return;
 

trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java

@@ -97 +97 @@
             done = true;
         } else {
-            int answer = new ExtendedDialog(Main.parent,
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Update"),
-                    tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()),
-                    new String[] {tr("Update Plugins"), tr("Cancel")},
-                    new String[] {"dialogs/refresh.png", "cancel.png"}).getValue();
-            if (answer == 1) {
+                    new String[] {tr("Update Plugins"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"dialogs/refresh.png", "cancel.png"});
+            ed.setContent(tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()));
+            ed.showDialog();
+
+            if (ed.getValue() == 1) {
                 PluginDownloader.update(toUpdate);
                 done = true;
@@ -133 +135 @@
         }
         if (!toDownload.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent,
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Download missing plugins"),
-                    tr("Download the following plugins?\n\n{0}", msg),
-                    new String[] {tr("Download Plugins"), tr("Cancel")},
-                    new String[] {"download.png", "cancel.png"}).getValue();
+                    new String[] {tr("Download Plugins"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"download.png", "cancel.png"});
+            ed.setContent(tr("Download the following plugins?\n\n{0}", msg));
+            ed.showDialog();
+
             Collection<PluginInformation> error =
-                (answer != 1 ? toDownload : new PluginDownloader().download(toDownload));
+                (ed.getValue() != 1 ? toDownload : new PluginDownloader().download(toDownload));
             for (PluginInformation pd : error) {
                 pluginMap.put(pd.name, false);
@@ -330 +334 @@
                                     name = x[0];
                                     url = x[1];
-                                    manifest = null;
+                                    // Is null anyway
+                                    //manifest = null;
                                 }
                             }