Changeset 23102 in osm for applications/editors/josm/plugins/addrinterpolation/src/org

Timestamp:

2010-09-10T21:40:00+02:00 (14 years ago)

Author:

miken

Message:

Bug fix JOSM trac #5393 NPE when changing interpolation method.

File:

• applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java

@@ -283 +283 @@
                         public void focusGained(FocusEvent fe){
                                 if (!interpolationMethodSet) {
-                                        AutoDetectInterpolationMethod();
-                                        interpolationMethodSet = true;  // Don't auto detect over a previous choice
+                                        if (AutoDetectInterpolationMethod()) {
+                                                interpolationMethodSet = true;  // Don't auto detect over a previous choice
+                                        }
                                 }
                         }
@@ -343 +344 @@
         // Call after both starting and ending housenumbers have been entered - usually when
         // combo box gets focus.
-        private void AutoDetectInterpolationMethod() {
+        // Return true if a method was detected
+        private boolean AutoDetectInterpolationMethod() {
 
                 String startValueString = ReadTextField(startTextField);
                 String endValueString = ReadTextField(endTextField);
-                if (startValueString.equals("") || endValueString.equals("")) {
+                if ( (startValueString == null) || (endValueString== null) ) {
                         // Not all values entered yet
-                        return;
+                        return false;
                 }
 
@@ -384 +386 @@
                                 // Both end with alpha
                                 SelectInterpolationMethod("alphabetic");
-                                return;
+                                return true;
                         }
 
@@ -392 +394 @@
                                         // First is a number, last is Latin alpha
                                         SelectInterpolationMethod("alphabetic");
-                                }
-                        }
-
-
-                }
-
+                                        return true;
+                                }
+                        }
+                        
+                        // Did not detect alpha
+                        return false;
+
+                }
+                
+                return true;
 
         }