Changeset 6287 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2013-10-02T01:03:42+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Avoid Throwing Null Pointer Exception

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -121 +121 @@
             try {
                 addRecursiveFiles(files, selection);
-            } catch(NullPointerException npe) {
-                rememberError(tr("One of the selected files was null"));
+            } catch (IllegalStateException e) {
+                rememberError(e.getMessage());
             }
 
@@ -209 +209 @@
             }
 
-            if (nullFile)
-                throw new NullPointerException();
+            if (nullFile) {
+                throw new IllegalStateException(tr("One of the selected files was null"));
+            }
         }