Changeset 6321 in josm for trunk/src

Timestamp:

2013-10-23T20:08:09+02:00 (11 years ago)

Author:

akks

Message:

fix #9200: repair tags copy-pasting

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CopyAction.java (modified) (2 diffs)
• actions/PasteTagsAction.java (modified) (1 diff)
• gui/tagging/TagTable.java (modified) (2 diffs)

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

@@ -24 +24 @@
  */
 public final class CopyAction extends JosmAction {
+    
+    // regular expression that matches text clipboard contents after copying
+    public static final String CLIPBOARD_REGEXP = "((node|way|relation)\\s\\d+,)*(node|way|relation)\\s\\d+";
 
     /**
@@ -53 +56 @@
         StringBuilder idsBuilder = new StringBuilder();
         for (OsmPrimitive p : primitives) {
-            idsBuilder.append(OsmPrimitiveType.from(p)).append(" ");
+            idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(" ");
             idsBuilder.append(p.getId()).append(",");
         }

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

@@ -254 +254 @@
 
         String buf = Utils.getClipboardContent();
-        if (buf == null || buf.isEmpty() || buf.matches("(\\d+,)*\\d+")) {
+        if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
             pasteTagsFromJOSMBuffer(selection);
         } else {

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -38 +38 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.CopyAction;
 import org.openstreetmap.josm.actions.PasteTagsAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -334 +335 @@
             
             String buf = Utils.getClipboardContent();
-            if (buf == null || buf.isEmpty() || buf.matches("(\\d+,)*\\d+")) {
+            if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
                 List<PrimitiveData> directlyAdded = Main.pasteBuffer.getDirectlyAdded();
                 if (directlyAdded==null || directlyAdded.isEmpty()) return;