Changeset 33854 in osm for applications/editors/josm/plugins/globalsat/src/org/kaintoch

Timestamp:

2017-11-21T01:50:06+01:00 (9 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100

Files:

• Dg100Config.java (modified) (3 diffs)
• FileInfoRec.java (modified) (1 diff)
• GpsRec.java (modified) (4 diffs)

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java

@@ -12 +12 @@
 import java.util.Properties;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -466 +466 @@
             props.store(os, "dg100 config");
         } catch (Exception ex) {
-            Main.error(ex);
+            Logging.error(ex);
             throw ex;
         }
@@ -477 +477 @@
             props.load(is);
         } catch (Exception ex) {
-            Main.error(ex);;
+            Logging.error(ex);;
             throw ex;
         }

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/FileInfoRec.java

@@ -24 +24 @@
     }
 
+    @Override
     public String toString()
     {

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java

@@ -68 +68 @@
     }
 
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
+    @Override
     public boolean equals(Object arg0)
     {
@@ -142 +140 @@
     }
 
+    @Override
     public String toString()
     {
@@ -230 +229 @@
         int scale = 1000000;
         double deg = 9999.9999;
-        double degScaled = (double)(gsLatOrLon / scale);
-        double minScaled = ((double)(gsLatOrLon - degScaled * scale)) / 600000.0;
+        double degScaled = gsLatOrLon / scale;
+        double minScaled = (gsLatOrLon - degScaled * scale) / 600000.0;
         deg = degScaled + minScaled;
         return deg;
@@ -432 +431 @@
     public double getAltitude()
     {
-        return dg100Altitude / (double)10000.0;
+        return dg100Altitude / 10000.0;
     }
 
     public double getSpeed()
     {
-        return dg100Speed / (double)360.0;
+        return dg100Speed / 360.0;
     }