Changeset 8194 in josm

Timestamp:

2015-04-14T23:10:19+02:00 (10 years ago)

Author:

simon04

Message:

Download objects: prefill ids from copied objects

The syntax from CopyAction is e.g. node 123 and has not been parsed yet.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CopyAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/CopyActionTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy (modified) (1 diff)

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

@@ -57 +57 @@
     public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
         /* copy ids to the clipboard */
+        String ids = getCopyString(primitives);
+        Utils.copyToClipboard(ids);
+
+        Main.pasteBuffer.makeCopy(primitives);
+        Main.pasteSource = source;
+    }
+
+    public static String getCopyString(Collection<? extends OsmPrimitive> primitives) {
         StringBuilder idsBuilder = new StringBuilder();
         for (OsmPrimitive p : primitives) {
@@ -62 +70 @@
             idsBuilder.append(p.getId()).append(",");
         }
-        String ids = idsBuilder.substring(0, idsBuilder.length() - 1);
-        Utils.copyToClipboard(ids);
-
-        Main.pasteBuffer.makeCopy(primitives);
-        Main.pasteSource = source;
+        return idsBuilder.substring(0, idsBuilder.length() - 1);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java

@@ -12 +12 @@
     private final OsmPrimitiveType type;
 
-    public static final Pattern ID_PATTERN = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)/?)(\\d+)");
+    public static final Pattern ID_PATTERN = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)[ /]?)(\\d+)");
 
     public SimplePrimitiveId(long id, OsmPrimitiveType type) {

trunk/test/unit/org/openstreetmap/josm/data/osm/SimplePrimitiveIdTest.groovy

@@ -28 +28 @@
         assert SimplePrimitiveId.fuzzyParse("foo relation/123 and way/345 but also node/789").toString() == "[relation 123, way 345, node 789]"
     }
+
+    void testFromCopyAction() {
+        assert SimplePrimitiveId.fromString("node 123") == new SimplePrimitiveId(123, OsmPrimitiveType.NODE)
+        assert SimplePrimitiveId.fromString("way 123") == new SimplePrimitiveId(123, OsmPrimitiveType.WAY)
+        assert SimplePrimitiveId.fromString("relation 123") == new SimplePrimitiveId(123, OsmPrimitiveType.RELATION)
+    }
 }