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

Timestamp:

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

Author:

Don-vip

Message:

Sonar/Findbugs - Avoid Throwing Null Pointer Exception

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• io/NmeaReader.java (modified) (6 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"));
+            }
         }
 

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -1 @@
-//License: GPL. Copyright 2008 by Christoph Brill
-
+//License: GPL. See README for details.
 package org.openstreetmap.josm.io;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -15 +13 @@
 import java.util.Date;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -196 +195 @@
                 int c = rd.read();
                 if(c=='$') {
-                    ParseNMEASentence(sb.toString(), ps);
+                    parseNMEASentence(sb.toString(), ps);
                     sb.delete(0, sb.length());
                     sb.append('$');
                 } else if(c == -1) {
                     // EOF: add last WayPoint if it works out
-                    ParseNMEASentence(sb.toString(),ps);
+                    parseNMEASentence(sb.toString(),ps);
                     break;
                 } else {
@@ -210 +209 @@
             data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
 
-        } catch (IOException e) {
-            // TODO tell user about the problem?
+        } catch (Exception e) {
+            Main.warn(e);
         } finally {
             Utils.close(rd);
@@ -233 +232 @@
     // in the collection in the NMEAParserState object.
     // Returns true if the input made sence, false otherwise.
-    private boolean ParseNMEASentence(String s, NMEAParserState ps) {
+    private boolean parseNMEASentence(String s, NMEAParserState ps) throws IllegalDataException {
         try {
-            if (s.isEmpty())
-                throw new NullPointerException();
+            if (s.isEmpty()) {
+                throw new IllegalArgumentException("s is empty");
+            }
 
             // checksum check:
@@ -274 +274 @@
                         e[GPGGA.LONGITUDE.position]
                 );
-                if(latLon==null)
-                    throw new NullPointerException(); // malformed
-
-                if((latLon.lat()==0.0) && (latLon.lon()==0.0)) {
+                if (latLon==null) {
+                    throw new IllegalDataException("Malformed lat/lon");
+                }
+
+                if ((latLon.lat()==0.0) && (latLon.lon()==0.0)) {
                     ps.zero_coord++;
                     return false;