Changeset 6417 in osm for applications/editors/josm

Timestamp:

2008-01-17T01:07:16+01:00 (17 years ago)

Author:

frederik

Message:

Properly re-connect after losing gpsd connection, and more debug output for LiveGPS plugin; patch by Gervase Markham <gerv@…>

File:

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

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

@@ -111 +111 @@
                         fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
                                                 connected = true;
+                                        System.out.println("LiveGps: Connected to gpsd");
                                         }
                                 }
@@ -195 +196 @@
                         }
                 }
-        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Not connected"));
-                if (gpsdSocket != null) try { gpsdSocket.close(); } catch (Exception ignore) {};
-        }
-    
-
+    
+    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");
+      };
+          }
+  }
         
         public void shutdown()