Changeset 17436 in osm for applications/editors

Timestamp:

2009-09-03T15:17:15+02:00 (15 years ago)

Author:

guggis

Message:

applied #3377: patch by xeen

Location:

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin

Files:

• JoinAreasAction.java (modified) (3 diffs)
• JumpToAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

@@ -107 +107 @@
      */
     public void actionPerformed(ActionEvent e) {
-        int result = new ExtendedDialog(Main.parent,
-            tr("Enter values for all conflicts."),
-            new JLabel(tr("THIS IS EXPERIMENTAL. Save your work and verify before uploading.")),
-            new String[] {tr("Continue anyway"), tr("Cancel")},
-            new String[] {"joinareas.png", "cancel.png"}).getValue();
-        if(result != 1) return;
-
         Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelectedWays();
 
@@ -299 +292 @@
             return false; // No conflicts found
 
-        int result = 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 (result != 1) return true; // user cancel, unresolvable conflicts
+        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+                        tr("Enter values for all conflicts."),
+                        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 true; // user cancel, unresolvable conflicts
 
         for (Entry<String, JComboBox> e : components.entrySet()) {
@@ -449 +443 @@
         ArrayList<RelationRole> result = new ArrayList<RelationRole>();
         for (Relation r : Main.main.getCurrentDataSet().relations) {
-            if (r.deleted || r.incomplete) continue;
+            if (r.isDeleted() || r.incomplete) continue;
             for (RelationMember rm : r.members) {
                 if (rm.member != osm) continue;

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;