Changeset 34074 in osm for applications/editors/josm

Timestamp:

2018-02-20T20:03:14+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm15991 - NPE

Location:

applications/editors/josm/plugins/HouseNumberTaggingTool

Files:

• src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/housenumbertool/TagDialogTest.java (modified) (2 diffs)

applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java

@@ -359 +359 @@
 
     static String incrementHouseNumber(String number, int increment) {
-        try {
-            Matcher m = Pattern.compile("([^\\pN]+)?(\\pN+)([^\\pN]+)?").matcher(number);
-            if (m.matches()) {
-                String prefix = m.group(1) != null ? m.group(1) : "";
-                int n = Integer.valueOf(m.group(2)) + increment;
-                String suffix = m.group(3) != null ? m.group(3) : "";
-                return prefix + n + suffix;
-            }
-        } catch (NumberFormatException e)  {
-            // Do nothing
+        if (number != null) {
+            try {
+                Matcher m = Pattern.compile("([^\\pN]+)?(\\pN+)([^\\pN]+)?").matcher(number);
+                if (m.matches()) {
+                    String prefix = m.group(1) != null ? m.group(1) : "";
+                    int n = Integer.valueOf(m.group(2)) + increment;
+                    String suffix = m.group(3) != null ? m.group(3) : "";
+                    return prefix + n + suffix;
+                }
+            } catch (NumberFormatException e)  {
+                // Do nothing
+            }
         }
         return null;

applications/editors/josm/plugins/HouseNumberTaggingTool/test/unit/org/openstreetmap/josm/plugins/housenumbertool/TagDialogTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
@@ -22 +23 @@
         //assertEquals("۲", TagDialog.incrementHouseNumber("۱", 1)); // FIXME: how to increment persian numbers ?
         assertEquals("2", TagDialog.incrementHouseNumber("۱", 1));
+        assertNull(TagDialog.incrementHouseNumber(null, 1));
     }
 }