Changeset 12472 in josm for trunk/src/org

Timestamp:

2017-07-13T21:31:24+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15016 - avoid spurious remotecontrol warnings with empty parameters

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• LoadAndZoomHandler.java (modified) (1 diff)
• LoadObjectHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -280 +280 @@
             toSelect.clear();
             for (String item : args.get("select").split(",")) {
-                try {
-                    toSelect.add(SimplePrimitiveId.fromString(item));
-                } catch (IllegalArgumentException ex) {
-                    Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");
+                if (!item.isEmpty()) {
+                    try {
+                        toSelect.add(SimplePrimitiveId.fromString(item));
+                    } catch (IllegalArgumentException ex) {
+                        Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");
+                    }
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java

@@ -98 +98 @@
         ps.clear();
         for (String i : (args != null ? args.get("objects") : "").split(",\\s*")) {
-            try {
-                ps.add(SimplePrimitiveId.fromString(i));
-            } catch (IllegalArgumentException e) {
-                Main.warn(e, "RemoteControl: invalid selection '"+i+"' ignored.");
+            if (!i.isEmpty()) {
+                try {
+                    ps.add(SimplePrimitiveId.fromString(i));
+                } catch (IllegalArgumentException e) {
+                    Main.warn(e, "RemoteControl: invalid selection '"+i+"' ignored.");
+                }
             }
         }