Changeset 1397 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2009-02-14T12:25:54+01:00 (15 years ago)

Author:

stoecker

Message:

apply patches from xeen for #1977.

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (4 diffs)

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.TigerUtils;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Pair;
@@ -108 +109 @@
         for (HashSet<Way> waylinks : backlinks.values()) {
             if (!waylinks.containsAll(selectedWays)) {
-                int option = JOptionPane.showConfirmDialog(Main.parent,
-                    tr("The selected ways have differing relation memberships.  "
-                        + "Do you still want to combine them?"),
-                    tr("Combine ways with different memberships?"),
-                    JOptionPane.YES_NO_OPTION);
-                if (option == JOptionPane.YES_OPTION)
-                    break;
+                int option = 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) break;
+                
                 return;
             }
@@ -136 +138 @@
             Object secondTry = actuallyCombineWays(selectedWays, true);
             if (secondTry instanceof List) {
-                int option = JOptionPane.showConfirmDialog(Main.parent,
+                int option = 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?"), tr("Change directions?"),
-                    JOptionPane.YES_NO_OPTION);
-                if (option != JOptionPane.YES_OPTION) {
-                    return;
-                }
+                        + "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;
                 nodeList = (List<Node>) secondTry;
             } else {
@@ -191 +193 @@
 
         if (!components.isEmpty()) {
-            int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION);
-            if (answer != JOptionPane.OK_OPTION)
-                return;
+            int answer = 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;
+            
             for (Entry<String, JComboBox> e : components.entrySet())
                 newWay.put(e.getKey(), e.getValue().getEditor().getItem().toString());