Changeset 6674 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-01-12T10:41:20+01:00 (11 years ago)

Author:

simon04

Message:

Make strings like foo relation/123 and way/345 but also node/789 paste-able in "Download object", some refactoring of related code

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -3 +3 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
@@ -29 +31 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -187 +191 @@
         String buf = Utils.getClipboardContent();
         if (buf != null) {
-            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];
+            if (buf.length() <= Main.pref.getInteger("downloadprimitive.max-autopaste-length", 2000)) {
+                final List<SimplePrimitiveId> ids = SimplePrimitiveId.fuzzyParse(buf);
+                final String parsedText = Utils.join(", ", Utils.transform(ids, new Utils.Function<SimplePrimitiveId, String>() {
+                    @Override
+                    public String apply(SimplePrimitiveId x) {
+                        return x.getType().getAPIName().charAt(0) + String.valueOf(x.getUniqueId());
+                    }
+                }));
+                tfId.tryToPasteFrom(parsedText);
+                final Set<OsmPrimitiveType> types = new HashSet<OsmPrimitiveType>(Utils.transform(ids, new Utils.Function<SimplePrimitiveId, OsmPrimitiveType>() {
+                    @Override
+                    public OsmPrimitiveType apply(SimplePrimitiveId x) {
+                        return x.getType();
+                    }
+                }));
+                if (types.size() == 1) {
+                    // select corresponding type
+                    cbType.setSelectedItem(types.iterator().next());
+                } else {
+                    // select "mixed"
+                    cbType.setSelectedIndex(3);
+                }
             } else {
-                txt = buf;
-            }
-            if (buf.length() <= Main.pref.getInteger("downloadprimitive.max-autopaste-length", 2000)) {
-                tfId.tryToPasteFrom(txt.replaceAll("[^0-9]+", " ").replaceAll("\\s\\s+", " "));
+                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];
+                }
             }
         }