Changeset 3337 in osm for applications/editors/josm/plugins/livegps

Timestamp:

2007-06-25T19:10:28+02:00 (18 years ago)

Author:

christofd

Message:

print some status messages
fire only events if something changed

File:

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

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

@@ -22 +22 @@
         boolean shutdownFlag = false;
     private List<PropertyChangeListener> propertyChangeListener = new ArrayList<PropertyChangeListener>();
+    private PropertyChangeEvent lastStatusEvent;
+    private PropertyChangeEvent lastDataEvent;
         
         public LiveGpsAcquirer() {
@@ -45 +47 @@
     public void fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus status, String statusMessage) {
         PropertyChangeEvent event = new PropertyChangeEvent(this, "gpsstatus", null, new LiveGpsStatus(status, statusMessage));
-        firePropertyChangeEvent(event);
+        if(!event.equals(lastStatusEvent)) {
+            firePropertyChangeEvent(event);
+            lastStatusEvent = event;
+        }
     }
 
@@ -56 +61 @@
     public void fireGpsDataChangeEvent(LiveGpsData oldData, LiveGpsData newData) {
         PropertyChangeEvent event = new PropertyChangeEvent(this, "gpsdata", oldData, newData);
-        firePropertyChangeEvent(event);
+        if(!event.equals(lastDataEvent)) {
+            firePropertyChangeEvent(event);
+            lastDataEvent = event;
+        }
     }
     
@@ -84 +92 @@
                                 if (!connected)
                                 {
+                                    System.out.println("LiveGps try to connect to gpsd");
                     fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
                                         InetAddress[] addrs = InetAddress.getAllByName(gpsdHost);
@@ -99 +108 @@
                                                 gpsdReader = new BufferedReader(new InputStreamReader(gpsdSocket.getInputStream()));
                                                 gpsdSocket.getOutputStream().write(new byte[] { 'w', 13, 10 });
-                        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTED, tr("Connected"));
+                        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTING, tr("Connecting"));
                                                 connected = true;
                                         }
@@ -106 +115 @@
 
                 if(connected) {
+                    // <FIXXME date="23.06.2007" author="cdaller">
+                    // TODO this read is blocking if gps is connected but has no fix, so gpsd does not send positions
                     String line = gpsdReader.readLine();
+                    // </FIXXME> 
                     if (line == null) break;
                     String words[] = line.split(",");
@@ -155 +167 @@
                             // not interested
                         }
+                        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTED, tr("Connected"));
                         gpsData.setFix(haveFix);
                         if (haveFix) {
@@ -166 +179 @@
                 } else {
                     // not connected:
+                    fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Not connected"));
                     try { Thread.sleep(1000); } catch (InterruptedException ignore) {};
                 }
                         } catch(IOException iox) {
                                 connected = false;
-                gpsData.setFix(false);
-                fireGpsDataChangeEvent(oldGpsData, gpsData);
+                                if(gpsData != null) {
+                                    gpsData.setFix(false);
+                                    fireGpsDataChangeEvent(oldGpsData, gpsData);
+                                }
                 fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.CONNECTION_FAILED, tr("Connection Failed"));
                                 try { Thread.sleep(1000); } catch (InterruptedException ignore) {};
@@ -178 +194 @@
                         }
                 }
-        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Disconnected"));
+        fireGpsStatusChangeEvent(LiveGpsStatus.GpsStatus.DISCONNECTED, tr("Not connected"));
                 if (gpsdSocket != null) try { gpsdSocket.close(); } catch (Exception ignore) {};
         }