Changeset 5354 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-07-20T18:14:54+02:00 (12 years ago)

Author:

akks

Message:

See #5984: Automatic pasting of IDs or URL into Download Object fields

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (2 diffs)
• gui/widgets/OsmIdTextField.java (modified) (2 diffs)

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

@@ -181 +181 @@
         dialog.configureContextsensitiveHelp("/Action/DownloadObject", true /* show help button */);
         cbType.setSelectedIndex(Main.pref.getInteger("downloadprimitive.lasttype", 0));
+        tfId.setType(cbType.getType());
+        if (Main.pref.getBoolean("downloadprimitive.autopaste", true)) { 
+            tryToPasteFromClipboard(tfId, cbType);
+        }
+        
         dialog.showDialog();
         if (dialog.getValue() != 1) return;
@@ -310 +315 @@
             .setContent(p, false);
     }
+
+    private void tryToPasteFromClipboard(OsmIdTextField tfId, OsmPrimitiveTypesComboBox cbType) {
+        String buf = Utils.getClipboardContent();
+        if (buf.contains("node")) cbType.setSelectedIndex(0);
+        if (buf.contains("way")) cbType.setSelectedIndex(1);
+        if (buf.contains("relation")) cbType.setSelectedIndex(2);
+        String[] res = buf.split("/");
+        String txt;
+        if (res.length>0) {
+            txt = res[res.length-1];
+            if (txt.isEmpty() && txt.length()>1) txt=res[res.length-2];
+        } else {
+            txt=buf;
+        }
+        tfId.setText(txt);
+        tfId.clearTextIfInvalid();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -43 +44 @@
 
     public void performValidation() {
+        validator.validate();
+    }
+
+    public void clearTextIfInvalid() {
+        if (!validator.isValid()) 
+            setText("");
         validator.validate();
     }