Changeset 16933 in osm for applications/editors/josm/plugins/livegps/src

Timestamp:

2009-08-09T13:32:56+02:00 (15 years ago)

Author:

stoecker

Message:

minor cleanup, removed config file

Location:

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

Files:

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

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.Main;
 
 public class LiveGpsAcquirer implements Runnable {
@@ -21 +22 @@
     BufferedReader gpsdReader;
     boolean connected = false;
-    String gpsdHost = "localhost";
-    int gpsdPort = 2947;
-    String configFile = "liveGPS.conf";
+    String gpsdHost = Main.pref.get("livegps.gpsd.host","localhost");
+    int gpsdPort = Main.pref.getInteger("livegps.gpsd.port", 2947);
     boolean shutdownFlag = false;
     private List<PropertyChangeListener> propertyChangeListener = new ArrayList<PropertyChangeListener>();
     private PropertyChangeEvent lastStatusEvent;
     private PropertyChangeEvent lastDataEvent;
-
-    public LiveGpsAcquirer(String pluginDir) {
-
-        Properties liveGPSconfig = new Properties();
-
-        FileInputStream fis = null;
-
-        try {
-            fis = new FileInputStream(pluginDir + configFile);
-        } catch (FileNotFoundException e) {
-            System.err.println("No liveGPS.conf found, using defaults");
-        }
-
-        if(fis != null)
-        {
-            try {
-                liveGPSconfig.load(fis);
-                this.gpsdHost = liveGPSconfig.getProperty("host");
-                this.gpsdPort = Integer.parseInt(liveGPSconfig.getProperty("port"));
-
-            } catch (IOException e) {
-                System.err.println("Error while loading liveGPS.conf, using defaults");
-            }
-
-            if(this.gpsdHost == null || this.gpsdPort == 0)
-            {
-                System.err.println("Error in liveGPS.conf, using defaults");
-                this.gpsdHost = "localhost";
-                this.gpsdPort = 2947;
-            }
-        }
-
-    }
 
     /**
@@ -230 +197 @@
         }
 
-    fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Not connected"));
+        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Not connected"));
         if (gpsdSocket != null) {
-      try {
-        gpsdSocket.close();
-        gpsdSocket = null;
-            System.out.println("LiveGps: Disconnected from gpsd");
-      }
-      catch (Exception e) {
-        System.out.println("LiveGps: Unable to close socket; reconnection may not be possible");
-      };
-      }
-  }
+            try {
+              gpsdSocket.close();
+              gpsdSocket = null;
+                  System.out.println("LiveGps: Disconnected from gpsd");
+            }
+            catch (Exception e) {
+              System.out.println("LiveGps: Unable to close socket; reconnection may not be possible");
+            }
+        }
+    }
 
     public void shutdown()

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

@@ -3 +3 @@
  */
 package livegps;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Point;
@@ -109 +111 @@
         return getClass().getSimpleName() + "[fix=" + fix + ", lat=" + latLon.lat()
         + ", long=" + latLon.lon() + ", speed=" + speed + ", course=" + course + "]";
-
     }
 
@@ -127 +128 @@
                     builder.append(tmp);
                 } else {
-                    builder.append("no name");
+                    builder.append(tr("no name"));
                 }
                 tmp = way.get("ref");
@@ -163 +164 @@
     public Way getWay() {
         if(way == null) {
-            EastNorth eastnorth = Main.proj.latlon2eastNorth(getLatLon());
-            Point xy = Main.map.mapView.getPoint(eastnorth);
+            Point xy = Main.map.mapView.getPoint(getLatLon());
             way = Main.map.mapView.getNearestWay(xy);
         }
         return way;
-
     }
 
@@ -206 +205 @@
         return true;
     }
-
-
-
 }

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

@@ -84 +84 @@
                     wayLabel.setText(wayString);
                 } else {
-                    wayLabel.setText("unknown");
+                    wayLabel.setText(tr("unknown"));
                 }
 

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

@@ -131 +131 @@
         {
             if (acquirer == null) {
-                acquirer = new LiveGpsAcquirer(getPluginDir());
+                acquirer = new LiveGpsAcquirer();
                 if (lgpslayer == null) {
                     lgpslayer = new LiveGpsLayer(data);