Changeset 32952 in osm for applications/editors/josm

Timestamp:

2016-09-08T21:38:58+02:00 (8 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/livegps/src/livegps

Files:

• LiveGpsAcquirer.java (modified) (3 diffs)
• LiveGpsData.java (modified) (2 diffs)
• LiveGpsDialog.java (modified) (1 diff)
• LiveGpsLayer.java (modified) (5 diffs)

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

@@ -11 +11 @@
 import java.net.InetAddress;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -208 +209 @@
         gpsdSocket.getOutputStream().write(new byte[] { 'w', 13, 10 });
 
-        gpsdReader = new BufferedReader(new InputStreamReader(gpsdSocket.getInputStream()));
+        gpsdReader = new BufferedReader(new InputStreamReader(gpsdSocket.getInputStream(), StandardCharsets.UTF_8));
         line = gpsdReader.readLine();
         if (line == null)
@@ -231 +232 @@
 
         if (JSONProtocol == true) {
-            JsonObject Watch = Json.createObjectBuilder()
+            JsonObject watch = Json.createObjectBuilder()
                     .add("enable", true)
                     .add("json", true)
                     .build();
 
-            String Request = "?WATCH=" + Watch.toString() + ";\n";
-            gpsdSocket.getOutputStream().write(Request.getBytes());
+            String request = "?WATCH=" + watch.toString() + ";\n";
+            gpsdSocket.getOutputStream().write(request.getBytes(StandardCharsets.UTF_8));
 
             connected = true;

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

@@ -138 +138 @@
     }
 
+    @Override
     public String toString() {
         return getClass().getSimpleName() + "[fix=" + fix + ", lat=" + latLon.lat()
-        + ", long=" + latLon.lon() + ", speed=" + speed + ", course=" + course + "]";
+        + ", long=" + latLon.lon() + ", speed=" + speed + ", course=" + course + ']';
     }
 
@@ -195 +196 @@
         if(way == null && Main.map != null && Main.map.mapView != null) {
             Point xy = Main.map.mapView.getPoint(getLatLon());
-            way = Main.map.mapView.getNearestWay(xy,
-                OsmPrimitive.isUsablePredicate);
+            way = Main.map.mapView.getNearestWay(xy, OsmPrimitive::isUsable);
         }
         return way;

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

@@ -64 +64 @@
     }
 
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (!isVisible())

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.preferences.CachingProperty;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -28 +30 @@
     public static final String C_LIVEGPS_COLOR_POSITION = "color.livegps.position";
     public static final String C_LIVEGPS_COLOR_POSITION_ESTIMATE = "color.livegps.position_estimate";
+
+    private static final CachingProperty<Color> COLOR_POSITION = new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.RED).cached();
+    private static final CachingProperty<Color> COLOR_POSITION_ESTIMATE = new ColorProperty(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN).cached();
 
     private static final int DEFAULT_REFRESH_INTERVAL = 250;
@@ -122 +127 @@
          */
     
-        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION_ESTIMATE, Color.CYAN));
+        g.setColor(COLOR_POSITION_ESTIMATE.get());
         int w, h;
         double ppm = 100 / mv.getDist100Pixel();    /* pixels per metre */
@@ -148 +153 @@
         float ccos240 = (float )Math.cos(Math.toRadians(course + 240));
     
-        g.setColor(Main.pref.getColor(C_LIVEGPS_COLOR_POSITION, Color.RED));
+        g.setColor(COLOR_POSITION.get());
     
         for (int i = 0; i < TriaThick; i++, TriaHeight--, TriaWidth--) {
@@ -166 +171 @@
     }
 
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (!isVisible()) {