Changeset 32359 in osm

Timestamp:

2016-06-22T01:50:28+02:00 (8 years ago)

Author:

donvip

Message:

update to new JOSM + findbugs

Location:

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV

Files:

• ColumbusCSVImporter.java (modified) (2 diffs)
• ColumbusCSVReader.java (modified) (4 diffs)

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java

@@ -89 +89 @@
         
                 // add layer to show way points
-                Main.main.addLayer(gpxLayer);
+                Main.getLayerManager().addLayer(gpxLayer);
         
                 progressMonitor.setTicksCount(3);
@@ -111 +111 @@
                         Main.info("Data size: " + ml.data.size());
             
-                        Main.main.addLayer(ml);
+                        Main.getLayerManager().addLayer(ml);
                         if (ml.data.isEmpty()) {
                             Main.warn("File contains no markers.");

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java

@@ -514 +514 @@
     public File getVoxFilePath(String fileDir, String voxFile) {
         // The FAT16 file name is interpreted differently from case-sensitive
-        // file systems, so we
-        // have to test several variants
+        // file systems, so we have to test several variants
         String[] fileNameVariants = new String[] { voxFile,
             voxFile.toLowerCase(), voxFile.toUpperCase() };
@@ -541 +540 @@
         // Position errors (dop = dilution of position)
         f = ColumbusCSVUtils.floatFromString(csvLine[11]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.PDOP_TAG, f);
         } else {
@@ -548 +547 @@
     
         f = ColumbusCSVUtils.floatFromString(csvLine[12]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.HDOP_TAG, f);
         } else {
@@ -555 +554 @@
     
         f = ColumbusCSVUtils.floatFromString(csvLine[13]);
-        if (f != Float.NaN) {
+        if (!Float.isNaN(f)) {
             wpt.attr.put(ColumbusCSVReader.VDOP_TAG, f);
         } else {