Changeset 2509 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-23T11:31:33+01:00 (15 years ago)

Author:

stoecker

Message:

fixed NPE - closes #3989

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• LambertCC9Zones.java (modified) (2 diffs)
• UTM.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java

@@ -199 +199 @@
             return null;
         layoutZone = ((JComboBox)prefcb).getSelectedIndex();
-        if (layoutZone == 0) {
-            layoutZone = layoutZone +1 -1;
-        }
         return Collections.singleton(Integer.toString(layoutZone+1));
     }
@@ -220 +217 @@
             } catch(NumberFormatException e) {}
         }
-        if (layoutZone == 0) {
-            layoutZone = layoutZone +1 -1;
-        }
     }
 

trunk/src/org/openstreetmap/josm/data/projection/UTM.java

@@ -403 +403 @@
     {
         zone = DEFAULT_ZONE;
-        try {
-            for(String s : args)
-            {
-                zone = Integer.parseInt(s);
-                if(zone <= 0 || zone > 60)
-                    zone = DEFAULT_ZONE;
-                break;
-            }
-        } catch(NumberFormatException e) {}
+        if(args != null)
+        {
+            try {
+                for(String s : args)
+                {
+                    zone = Integer.parseInt(s);
+                    if(zone <= 0 || zone > 60)
+                        zone = DEFAULT_ZONE;
+                    break;
+                }
+            } catch(NumberFormatException e) {}
+        }
     }