Changeset 5372 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-07-28T14:40:33+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7909 - NPE upon selection of "file" -> "load object"

File:

• trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (modified) (1 diff)

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

@@ -318 +318 @@
     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();
+        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];
+                } else {
+                    txt=buf;
+                }
+                tfId.setText(txt);
+                tfId.clearTextIfInvalid();
+        }
     }
 }