Changeset 35938 in osm

Timestamp:

2022-03-22T19:33:24+01:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #21772: Update deprecated functions in globalsat

This primarily changes ImmutableGpxTrack to GpxTrack,
along with some lint issues.

Location:

applications/editors/josm/plugins/globalsat

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java (modified) (6 diffs)

applications/editors/josm/plugins/globalsat/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="15496"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Logging;
 
 import gnu.io.CommPortIdentifier;
@@ -67 +68 @@
     };*/
     /** delete file: A0 A2 00 03 BA FF FF 02 B8 B0 B3 */
-    private static byte[] dg100CmdDelFile =
+    private static final byte[] dg100CmdDelFile =
     {(byte) 0xA0, (byte) 0xA2, (byte) 0x00, (byte) 0x03, (byte) 0xBA,
      (byte) 0xFF, (byte) 0xFF, (byte) 0x02, (byte) 0xB8, (byte) 0xB0, (byte) 0xB3
     };
     /** get file info: A0 A2 00 03 BB 00 00 00 BB B0 B3 */
-    private static byte[] dg100CmdGetFileInfo =
+    private static final byte[] dg100CmdGetFileInfo =
     {(byte) 0xA0, (byte) 0xA2, (byte) 0x00, (byte) 0x03, (byte) 0xBB,
      (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xBB, (byte) 0xB0, (byte) 0xB3
     };
     /** get gps recs: A0 A2 00 03 B5 00 02 00 B7 B0 B3 */
-    private static byte[] dg100CmdGetGpsRecs =
+    private static final byte[] dg100CmdGetGpsRecs =
     {(byte) 0xA0, (byte) 0xA2, (byte) 0x00, (byte) 0x03, (byte) 0xB5,
      (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0xB7, (byte) 0xB0, (byte) 0xB3
     };
     /** read config: A0 A2 00 01 B7 00 B7 B0 B3 */
-    private static byte[] dg100CmdGetConfig =
+    private static final byte[] dg100CmdGetConfig =
     {(byte) 0xA0, (byte) 0xA2, (byte) 0x00, (byte) 0x01, (byte) 0xB7,
      (byte) 0x00, (byte) 0xB7, (byte) 0xB0, (byte) 0xB3 };
@@ -89 +90 @@
         ii dd dd dd dd ee ee ee ee ff ff ff ff 01 xx xx
         B0 B3 */
-    private static byte[] dg100CmdSetConfig =
+    private static final byte[] dg100CmdSetConfig =
     {(byte) 0xA0, (byte) 0xA2, (byte) 0x00, (byte) 0x2A, (byte) 0xB8,
      (byte) 0x02,
@@ -116 +117 @@
       , (byte) 0x00, (byte) 0xC0, (byte) 0xB0, (byte) 0xB3};*/
 
-    private byte[] response = new byte[65536];
-
-    private CommPortIdentifier portIdentifier;
+    private final byte[] response = new byte[65536];
+
+    private final CommPortIdentifier portIdentifier;
     private SerialPort port = null;
 
@@ -166 +167 @@
                     progressMonitor.worked(1);
                 }
-                result.tracks.add(new ImmutableGpxTrack(Collections.singleton(seg), Collections.<String, Object>emptyMap()));
+                result.tracks.add(new GpxTrack(Collections.singleton(seg), Collections.emptyMap()));
             }
             return result;
@@ -246 +247 @@
 
     private Response<?> sendCmdDelFiles() throws IOException, UnsupportedCommOperationException {
-        System.out.println("deleting data...");
+        Logging.info("GlobalSat: GlobalsatDg100: deleting data...");
         int len = sendCmd(dg100CmdDelFile, response, -1);
         return Response.parseResponse(response, len);