Changeset 28335 in osm for applications/editors

Timestamp:

2012-04-22T13:41:29+02:00 (12 years ago)

Author:

joshdoe

Message:

[josm_utilsplugin2] return command with ReplaceGeometryUtils instead of executing them directly

Also add icon

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry

Files:

• ReplaceGeometryAction.java (modified) (1 diff)
• ReplaceGeometryCommand.java (added)
• ReplaceGeometryException.java (added)
• ReplaceGeometryUtils.java (modified) (12 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java

@@ -46 +46 @@
         
         try {
-            ReplaceGeometryUtils.replaceWithNew(firstObject, secondObject);
+            ReplaceGeometryCommand replaceCommand =
+                    ReplaceGeometryUtils.buildReplaceWithNewCommand(firstObject, secondObject);
+            
+            // action was canceled
+            if (replaceCommand == null)
+                return;
+            
+            Main.main.undoRedo.add(replaceCommand);
         } catch (IllegalArgumentException ex) {
             JOptionPane.showMessageDialog(Main.parent,
                     ex.getMessage(), TITLE, JOptionPane.INFORMATION_MESSAGE);
+        } catch (ReplaceGeometryException ex) {
+            JOptionPane.showMessageDialog(Main.parent,
+                    ex.getMessage(), TITLE, JOptionPane.INFORMATION_MESSAGE);
         }
-         
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -21 +21 @@
 public final class ReplaceGeometryUtils {
     private static final String TITLE = tr("Replace Geometry");
-    
     /**
      * Replace new or uploaded object with new object
@@ -29 +28 @@
      * @return 
      */
-    public static boolean replaceWithNew(OsmPrimitive firstObject, OsmPrimitive secondObject) {
+    public static ReplaceGeometryCommand buildReplaceWithNewCommand(OsmPrimitive firstObject, OsmPrimitive secondObject) {
         if (firstObject instanceof Node && secondObject instanceof Node) {
-            return replaceNodeWithNew((Node) firstObject, (Node) secondObject);
+            return buildReplaceNodeWithNewCommand((Node) firstObject, (Node) secondObject);
         } else if (firstObject instanceof Way && secondObject instanceof Way) {
-            return replaceWayWithNew(Arrays.asList((Way) firstObject, (Way) secondObject));
+            return buildReplaceWayWithNewCommand(Arrays.asList((Way) firstObject, (Way) secondObject));
         } else if (firstObject instanceof Node) {
-            return upgradeNode((Node) firstObject, secondObject);
+            return createUpgradeNodeCommand((Node) firstObject, secondObject);
         } else if (secondObject instanceof Node) {
-            return upgradeNode((Node) secondObject, firstObject);
+            return createUpgradeNodeCommand((Node) secondObject, firstObject);
         } else {
             throw new IllegalArgumentException(tr("This tool can only replace a node, upgrade a node to a way or a multipolygon, or replace a way with a way."));
@@ -51 +50 @@
      * @return 
      */
-    public static boolean replace(OsmPrimitive subjectObject, OsmPrimitive referenceSubject) {
+    public static ReplaceGeometryCommand buildReplaceCommand(OsmPrimitive subjectObject, OsmPrimitive referenceSubject) {
         if (subjectObject instanceof Node && referenceSubject instanceof Node) {
-            return replaceNode((Node) subjectObject, (Node) referenceSubject);
+            return buildReplaceNodeCommand((Node) subjectObject, (Node) referenceSubject);
         } else if (subjectObject instanceof Way && referenceSubject instanceof Way) {
-            return replaceWay((Way) subjectObject, (Way) referenceSubject);
+            return buildReplaceWayCommand((Way) subjectObject, (Way) referenceSubject);
         } else if (subjectObject instanceof Node) {
-            return upgradeNode((Node) subjectObject, referenceSubject);
+            return createUpgradeNodeCommand((Node) subjectObject, referenceSubject);
         } else if (referenceSubject instanceof Node) {
             // TODO: fix this illogical reversal?
-            return upgradeNode((Node) referenceSubject, subjectObject);
+            return createUpgradeNodeCommand((Node) referenceSubject, subjectObject);
         } else {
             throw new IllegalArgumentException(tr("This tool can only replace a node, upgrade a node to a way or a multipolygon, or replace a way with a way."));
@@ -72 +71 @@
      * @return 
      */
-    public static boolean replaceNodeWithNew(Node firstNode, Node secondNode) {
+    public static ReplaceGeometryCommand buildReplaceNodeWithNewCommand(Node firstNode, Node secondNode) {
         if (firstNode.isNew() && !secondNode.isNew())
-            return replaceNode(secondNode, firstNode);
+            return buildReplaceNodeCommand(secondNode, firstNode);
         else if (!firstNode.isNew() && secondNode.isNew())
-            return replaceNode(firstNode, secondNode);
+            return buildReplaceNodeCommand(firstNode, secondNode);
         else
             // both nodes are new OR uploaded, act like MergeNodes, moving first
             // node to second
-            return replaceNode(firstNode, secondNode);
+            return buildReplaceNodeCommand(firstNode, secondNode);
     }
     
@@ -90 +89 @@
      * @return
      */
-    public static boolean replaceNode(Node subjectNode, Node referenceNode) {
+    public static ReplaceGeometryCommand buildReplaceNodeCommand(Node subjectNode, Node referenceNode) {
         if (!OsmPrimitive.getFilteredList(subjectNode.getReferrers(), Way.class).isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Node belongs to way(s), cannot replace."),
-                    TITLE, JOptionPane.INFORMATION_MESSAGE);
-            return false;
+            throw new ReplaceGeometryException(tr("Node belongs to way(s), cannot replace."));
         }
         // FIXME: handle different layers
@@ -100 +97 @@
         commands.add(MergeNodesAction.mergeNodes(Main.main.getEditLayer(), Arrays.asList(subjectNode, referenceNode), referenceNode));
 
-        Main.main.undoRedo.add(new SequenceCommand(
+        return new ReplaceGeometryCommand(
                 tr("Replace geometry for node {0}", subjectNode.getDisplayName(DefaultNameFormatter.getInstance())),
-                commands));
-        return true;
+                commands);
     }
     
@@ -112 +108 @@
      * @param referenceObject object with greater spatial quality
      */
-    public static boolean upgradeNode(Node subjectNode, OsmPrimitive referenceObject) {
+    public static ReplaceGeometryCommand createUpgradeNodeCommand(Node subjectNode, OsmPrimitive referenceObject) {
         if (!OsmPrimitive.getFilteredList(subjectNode.getReferrers(), Way.class).isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Node belongs to way(s), cannot replace."),
-                    TITLE, JOptionPane.INFORMATION_MESSAGE);
-            return false;
+            throw new ReplaceGeometryException(tr("Node belongs to way(s), cannot replace."));
         }
 
         if (referenceObject instanceof Relation && !((Relation) referenceObject).isMultipolygon()) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Relation is not a multipolygon, cannot be used as a replacement."),
-                    TITLE, JOptionPane.INFORMATION_MESSAGE);
-            return false;
+            throw new ReplaceGeometryException(tr("Relation is not a multipolygon, cannot be used as a replacement."));
         }
 
@@ -154 +146 @@
         if (tagResolutionCommands == null) {
             // user canceled tag merge dialog
-            return false;
+            return null;
         }
         commands.addAll(tagResolutionCommands);
@@ -187 +179 @@
         Main.main.getCurrentDataSet().setSelected(referenceObject);
 
-        Main.main.undoRedo.add(new SequenceCommand(
+        return new ReplaceGeometryCommand(
                 tr("Replace geometry for node {0}", subjectNode.getDisplayName(DefaultNameFormatter.getInstance())),
-                commands));
-        return true;
-    }
-    
-    public static boolean replaceWayWithNew(List<Way> selection) {
+                commands);
+    }
+    
+    public static ReplaceGeometryCommand buildReplaceWayWithNewCommand(List<Way> selection) {
         // determine which way will be replaced and which will provide the geometry
         boolean overrideNewCheck = false;
@@ -217 +208 @@
         
         if( !overrideNewCheck && (subjectWay.isNew() || !referenceWay.isNew()) ) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Please select one way that exists in the database and one new way with correct geometry."),
-                    TITLE, JOptionPane.WARNING_MESSAGE);
-            return false;
-        }
-        return replaceWay(subjectWay, referenceWay);
-    }
-    
-    public static boolean replaceWay(Way subjectWay, Way referenceWay) {
+            throw new ReplaceGeometryException(
+                    tr("Please select one way that exists in the database and one new way with correct geometry."));
+        }
+        return buildReplaceWayCommand(subjectWay, referenceWay);
+    }
+    
+    public static ReplaceGeometryCommand buildReplaceWayCommand(Way subjectWay, Way referenceWay) {
 
         Area a = Main.main.getCurrentDataSet().getDataSourceArea();
         if (!isInArea(subjectWay, a) || !isInArea(referenceWay, a)) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("The ways must be entirely within the downloaded area."),
-                    TITLE, JOptionPane.WARNING_MESSAGE);
-            return false;
+            throw new ReplaceGeometryException(tr("The ways must be entirely within the downloaded area."));
         }
         
         if (hasImportantNode(referenceWay, subjectWay)) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("The way to be replaced cannot have any nodes with properties or relation memberships unless they belong to both ways."),
-                    TITLE, JOptionPane.WARNING_MESSAGE);
-            return false;
+            throw new ReplaceGeometryException(
+                    tr("The way to be replaced cannot have any nodes with properties or relation memberships unless they belong to both ways."));
         }
 
@@ -248 +232 @@
         if (tagResolutionCommands == null) {
             // user canceled tag merge dialog
-            return false;
+            return null;
         }
         commands.addAll(tagResolutionCommands);
@@ -357 +341 @@
 
         // Two items in undo stack: change original way and delete geometry way
-        Main.main.undoRedo.add(new SequenceCommand(
+        return new ReplaceGeometryCommand(
                 tr("Replace geometry for way {0}", subjectWay.getDisplayName(DefaultNameFormatter.getInstance())),
-                commands));
-        return true;
+                commands);
     }