Changeset 33739 in osm for applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

Timestamp:

2017-10-28T16:44:03+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12987

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java (modified) (12 diffs)

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 public class LiveGpsAcquirer implements Runnable {
@@ -47 +48 @@
 
         gpsdHost = Main.pref.get(C_HOST, DEFAULT_HOST);
-        gpsdPort = Main.pref.getInteger(C_PORT, DEFAULT_PORT);
+        gpsdPort = Main.pref.getInt(C_PORT, DEFAULT_PORT);
         // put the settings back in to the preferences, makes keys appear.
         Main.pref.put(C_HOST, gpsdHost);
-        Main.pref.putInteger(C_PORT, gpsdPort);
+        Main.pref.putInt(C_PORT, gpsdPort);
     }
 
@@ -133 +134 @@
                         Thread.sleep(1000);
                     } catch (InterruptedException ignore) {
-                        Main.trace(ignore);
+                        Logging.trace(ignore);
                     }
                 }
@@ -162 +163 @@
                 oldGpsData = gpsData;
             } catch (IOException iox) {
-                Main.warn(iox, "LiveGps: lost connection to gpsd");
+                Logging.log(Logging.LEVEL_WARN, "LiveGps: lost connection to gpsd", iox);
                 fireGpsStatusChangeEvent(
                         LiveGpsStatus.GpsStatus.CONNECTION_FAILED,
@@ -170 +171 @@
                     Thread.sleep(1000);
                 } catch (InterruptedException ignore) {
-                    Main.trace(ignore);
+                    Logging.trace(ignore);
                 }
                 // send warning to layer
@@ -176 +177 @@
         }
 
-        Main.info("LiveGps: Disconnected from gpsd");
+        Logging.info("LiveGps: Disconnected from gpsd");
         fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED,
                 tr("Not connected"));
@@ -190 +191 @@
         String line, type, release;
 
-        Main.info("LiveGps: trying to connect to gpsd at " + gpsdHost + ":" + gpsdPort);
+        Logging.info("LiveGps: trying to connect to gpsd at " + gpsdHost + ":" + gpsdPort);
         fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
 
@@ -199 +200 @@
                 break;
             } catch (IOException e) {
-                Main.warn("LiveGps: Could not open connection to gpsd: " + e);
+                Logging.warn("LiveGps: Could not open connection to gpsd: " + e);
                 gpsdSocket = null;
             }
@@ -222 +223 @@
             if (type.equals("VERSION")) {
                 release = greeting.getString("release");
-                Main.info("LiveGps: Connected to gpsd " + release);
+                Logging.info("LiveGps: Connected to gpsd " + release);
             } else
-                Main.info("LiveGps: Unexpected JSON in gpsd greeting: " + line);
+                Logging.info("LiveGps: Unexpected JSON in gpsd greeting: " + line);
         } catch (JsonException jex) {
             if (line.startsWith("GPSD,")) {
                 connected = true;
                 JSONProtocol = false;
-                Main.info("LiveGps: Connected to old gpsd protocol version.");
+                Logging.info("LiveGps: Connected to old gpsd protocol version.");
                 fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTED, tr("Connected"));
             }
@@ -257 +258 @@
             gpsdSocket = null;
         } catch (Exception e) {
-            Main.warn("LiveGps: Unable to close socket; reconnection may not be possible");
+            Logging.warn("LiveGps: Unable to close socket; reconnection may not be possible");
         }
     }
@@ -272 +273 @@
             report = Json.createReader(new StringReader(line)).readObject();
         } catch (JsonException jex) {
-            Main.warn("LiveGps: line read from gpsd is not a JSON object:" + line);
+            Logging.warn("LiveGps: line read from gpsd is not a JSON object:" + line);
             return null;
         }
@@ -332 +333 @@
                         course = Float.parseFloat(status[8]);
                     } catch (NumberFormatException nex) {
-                        Main.debug(nex);
+                        Logging.debug(nex);
                     }
                     return new LiveGpsData(lat, lon, course, speed);