Changeset 1397 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/command/DeleteCommand.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -154 +155 @@
         }
         if (role.length() > 0) {
-            return JOptionPane.showConfirmDialog(Main.parent, tr(
-                    "Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?", s.name,
-                    n.name, role), tr("Conflicting relation"), JOptionPane.YES_NO_OPTION);
+            return new ExtendedDialog(Main.parent, 
+                        tr("Conflicting relation"), 
+                        tr("Selection \"{0}\" is used by relation \"{1}\" with role {2}.\nDelete from relation?",
+                            s.name, n.name, role),
+                        new String[] {tr("Delete from relation"), tr("Cancel")}, 
+                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();  
         } else {
-            return JOptionPane.showConfirmDialog(Main.parent, tr(
-                    "Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?", s.name, n.name),
-                    tr("Conflicting relation"), JOptionPane.YES_NO_OPTION);
+            return new ExtendedDialog(Main.parent, 
+                        tr("Conflicting relation"), 
+                        tr("Selection \"{0}\" is used by relation \"{1}\".\nDelete from relation?",
+                            s.name, n.name),
+                        new String[] {tr("Delete from relation"), tr("Cancel")}, 
+                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();  
         }
     }
@@ -208 +215 @@
                     waysToBeChanged.add((Way) ref);
                 } else if (ref instanceof Relation) {
-                    if (testRelation((Relation) ref, osm) == JOptionPane.YES_OPTION) {
+                    if (testRelation((Relation) ref, osm) == 1) {
                         Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref);
                         if (relset == null)
@@ -248 +255 @@
                         }
                         if (!found) {
-                            if (testRelation((Relation) ref, w) == JOptionPane.YES_OPTION) {
+                            if (testRelation((Relation) ref, w) == 1) {
                                 relset.add(w);
                                 relationsToBeChanged.put(ref, relset);