Changeset 2626 in josm for trunk/src/org/openstreetmap/josm/io/NmeaReader.java

Timestamp:

2009-12-13T11:48:12+01:00 (14 years ago)

Author:

jttt

Message:

Fixed some of the warnings found by FindBugs

File:

• trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) (16 diffs)

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

@@ -132 +132 @@
     public GpxData data;
 
-//  private final static SimpleDateFormat GGATIMEFMT =
-//      new SimpleDateFormat("HHmmss.SSS");
+    //  private final static SimpleDateFormat GGATIMEFMT =
+    //      new SimpleDateFormat("HHmmss.SSS");
     private final static SimpleDateFormat RMCTIMEFMT =
         new SimpleDateFormat("ddMMyyHHmmss.SSS");
@@ -142 +142 @@
     {
         Date d = RMCTIMEFMT.parse(p, new ParsePosition(0));
+        if (d == null) {
+            d = RMCTIMEFMTSTD.parse(p, new ParsePosition(0));
+        }
         if (d == null)
-            d = RMCTIMEFMTSTD.parse(p, new ParsePosition(0));
-        if (d == null) throw(null); // malformed
+            throw new RuntimeException("Date is malformed"); // malformed
         return d;
     }
@@ -181 +183 @@
             int loopstart_char = rd.read();
             ps = new NMEAParserState();
-            if(loopstart_char == -1) {// zero size file
+            if(loopstart_char == -1)
                 //TODO tell user about the problem?
                 return;
-            }
             sb.append((char)loopstart_char);
             ps.p_Date="010100"; // TODO date problem
             while(true) {
                 // don't load unparsable files completely to memory
-                if(sb.length()>=1020) sb.delete(0, sb.length()-1);
+                if(sb.length()>=1020) {
+                    sb.delete(0, sb.length()-1);
+                }
                 int c = rd.read();
                 if(c=='$') {
@@ -199 +202 @@
                     ParseNMEASentence(sb.toString(),ps);
                     break;
-                } else sb.append((char)c);
+                } else {
+                    sb.append((char)c);
+                }
             }
             rd.close();
@@ -209 +214 @@
         }
     }
-    private class NMEAParserState {
+    private static class NMEAParserState {
         protected Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
         protected String p_Time;
@@ -239 +244 @@
                 byte[] chb = chkstrings[0].getBytes();
                 int chk=0;
-                for(int i = 1; i < chb.length; i++) chk ^= chb[i];
+                for(int i = 1; i < chb.length; i++) {
+                    chk ^= chb[i];
+                }
                 if(Integer.parseInt(chkstrings[1].substring(0,2),16) != chk) {
                     //System.out.println("Checksum error");
@@ -246 +253 @@
                     return false;
                 }
+            } else {
+                ps.no_checksum++;
             }
-            else
-                ps.no_checksum++;
             // now for the content
             String[] e = chkstrings[0].split(",");
@@ -264 +271 @@
                         e[GPGGA.LATITUDE.position],
                         e[GPGGA.LONGITUDE.position]
-                    );
+                );
                 if(latLon==null) throw(null); // malformed
 
@@ -291 +298 @@
                 accu=e[GPGGA.HEIGHT_UNTIS.position];
                 if(accu.equals("M")) {
-                        // Ignore heights that are not in meters for now
-                        accu=e[GPGGA.HEIGHT.position];
-                        if(!accu.equals("")) {
+                    // Ignore heights that are not in meters for now
+                    accu=e[GPGGA.HEIGHT.position];
+                    if(!accu.equals("")) {
                         Double.parseDouble(accu);
                         // if it throws it's malformed; this should only happen if the
                         // device sends nonstandard data.
-                        if(!accu.equals("")) currentwp.attr.put("ele", accu);
+                        if(!accu.equals("")) {
+                            currentwp.attr.put("ele", accu);
+                        }
                     }
                 }
@@ -309 +318 @@
                 // h-dilution
                 accu=e[GPGGA.HDOP.position];
-                if(!accu.equals(""))
+                if(!accu.equals("")) {
                     currentwp.attr.put("hdop", Float.parseFloat(accu));
+                }
                 // fix
                 accu=e[GPGGA.QUALITY.position];
@@ -320 +330 @@
                         break;
                     case 1:
-                        if(sat < 4) currentwp.attr.put("fix", "2d");
-                        else currentwp.attr.put("fix", "3d");
+                        if(sat < 4) {
+                            currentwp.attr.put("fix", "2d");
+                        } else {
+                            currentwp.attr.put("fix", "3d");
+                        }
                         break;
                     case 2:
@@ -354 +367 @@
                 // vdop
                 accu=e[GPGSA.VDOP.position];
-                if(!accu.equals(""))
+                if(!accu.equals("")) {
                     currentwp.attr.put("vdop", Float.parseFloat(accu));
+                }
                 // hdop
                 accu=e[GPGSA.HDOP.position];
-                if(!accu.equals(""))
+                if(!accu.equals("")) {
                     currentwp.attr.put("hdop", Float.parseFloat(accu));
+                }
                 // pdop
                 accu=e[GPGSA.PDOP.position];
-                if(!accu.equals(""))
+                if(!accu.equals("")) {
                     currentwp.attr.put("pdop", Float.parseFloat(accu));
+                }
             }
             else if(e[0].equals("$GPRMC")) {
@@ -372 +388 @@
                         e[GPRMC.WIDTH_NORTH.position],
                         e[GPRMC.LENGTH_EAST.position]
-                    );
-                if(latLon==null) throw(null);
+                );
                 if((latLon.lat()==0.0) && (latLon.lon()==0.0)) {
                     ps.zero_coord++;
@@ -439 +454 @@
 
     private LatLon parseLatLon(String ns, String ew, String dlat, String dlon)
-        throws NumberFormatException {
+    throws NumberFormatException {
         String widthNorth = dlat.trim();
         String lengthEast = dlon.trim();
@@ -456 +471 @@
         int latdeg = Integer.parseInt(widthNorth.substring(0, latdegsep));
         double latmin = Double.parseDouble(widthNorth.substring(latdegsep));
-        if(latdeg < 0) // strange data with '-' sign
+        if(latdeg < 0) {
             latmin *= -1.0;
+        }
         double lat = latdeg + latmin / 60;
         if ("S".equals(ns)) {
@@ -468 +484 @@
         int londeg = Integer.parseInt(lengthEast.substring(0, londegsep));
         double lonmin = Double.parseDouble(lengthEast.substring(londegsep));
-        if(londeg < 0) // strange data with '-' sign
+        if(londeg < 0) {
             lonmin *= -1.0;
+        }
         double lon = londeg + lonmin / 60;
         if ("W".equals(ew)) {