Changeset 25797 in osm for applications/editors

Timestamp:

2011-04-05T23:26:25+02:00 (14 years ago)

Author:

glebius

Message:

Simplify suppressing. We do not really need a separate thread,
an interface and a special class for such a trivial task.

Location:

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

Files:

• ILiveGpsSuppressor.java (deleted)
• LiveGpsLayer.java (modified) (5 diffs)
• LiveGpsPlugin.java (modified) (5 diffs)
• LiveGpsSuppressor.java (deleted)

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

@@ -25 +25 @@
     public static final String LAYER_NAME = tr("LiveGPS layer");
     public static final String KEY_LIVEGPS_COLOR = "color.livegps.position";
+
+    private static final int DEFAULT_SLEEP_TIME = 500;  /* Default sleep time is 0.5 seconds. */
+    private static final String oldConfigKey = "livegps.refreshinterval";     /* in seconds */
+    private static final String ConfigKey = "livegps.refresh_interval_msec";  /* in msec */
+    private int sleepTime;
+
     LatLon lastPos;
     WayPoint lastPoint;
@@ -32 +38 @@
     // JLabel lbl;
     boolean autocenter;
-    private SimpleDateFormat dateFormat = new SimpleDateFormat(
-    "yyyy-MM-dd'T'HH:mm:ss.SSS");
-
-    /**
-     * The suppressor is queried, if the GUI shall be re-drawn.
-     */
-    private ILiveGpsSuppressor suppressor;
+    private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+    private long lastUpdate = 0;
 
     public LiveGpsLayer(GpxData data) {
@@ -49 +50 @@
         GpxTrack trackBeingWritten = new SingleSegmentGpxTrack(trackSegment, attr);
         data.tracks.add(trackBeingWritten);
+
+        initSleepTime();
     }
 
@@ -155 +158 @@
 
     /**
-     * @param suppressor the suppressor to set
-     */
-    public void setSuppressor(ILiveGpsSuppressor suppressor) {
-        this.suppressor = suppressor;
-    }
-
-    /**
-     * @return the suppressor
-     */
-    public ILiveGpsSuppressor getSuppressor() {
-        return suppressor;
-    }
-
-    /**
      * Check, if a redraw is currently allowed.
      *
@@ -175 +164 @@
      */
     private boolean allowRedraw() {
-        if (this.suppressor != null) {
-            return this.suppressor.isAllowUpdate();
-        } else {
-            return true;
+        Date date = new Date();
+        long current = date.getTime();
+
+        if (current - lastUpdate >= sleepTime) {
+                lastUpdate = current;
+                return true;
+        } else
+                return false;
+    }
+
+    /**
+     * Retrieve the sleepTime from the configuration. Be compatible with old
+     * version that stored value in seconds. If no such configuration key exists,
+     * it will be initialized here.
+     */
+    private void initSleepTime() {
+        if ((sleepTime = Main.pref.getInteger(ConfigKey, 0)) == 0) {
+                if ((sleepTime = Main.pref.getInteger(oldConfigKey, 0)) != 0) {
+                        sleepTime *= 1000;
+                        Main.pref.put(oldConfigKey, null);
+                } else
+                        sleepTime = DEFAULT_SLEEP_TIME;
         }
+
+        // creates the setting, if none present.
+        Main.pref.putInteger(ConfigKey, sleepTime);
     }
 }

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

@@ -39 +39 @@
     private LiveGpsLayer lgpslayer = null;
 
-    /**
-     * The LiveGpsSuppressor is queried, if an event shall be suppressed.
-     */
-    private LiveGpsSuppressor suppressor = null;
-
-    /**
-     * separate thread, where the LiveGpsSuppressor executes.
-     */
-    private Thread suppressorThread;
-
     public class CaptureAction extends JosmAction {
         public CaptureAction() {
@@ -165 +155 @@
         
         if (enable && !enabled) {
-            assert (suppressor == null);
-            assert (suppressorThread == null);
             assert (acquirer == null);
             assert (acquirerThread == null);
-
-            suppressor = new LiveGpsSuppressor();
-            suppressorThread = new Thread(suppressor);
 
             acquirer = new LiveGpsAcquirer();
@@ -183 +168 @@
             }
 
-            lgpslayer.setSuppressor(suppressor);
             acquirer.addPropertyChangeListener(lgpslayer);
             acquirer.addPropertyChangeListener(lgpsdialog);
 
-            suppressorThread.start();
             acquirerThread.start();
 
@@ -194 +177 @@
         } else if (!enable && enabled) {
             assert (lgpslayer != null);
-            assert (suppressor != null);
-            assert (suppressorThread != null);
             assert (acquirer != null);
             assert (acquirerThread != null);
@@ -202 +183 @@
             acquirer = null;
             acquirerThread = null;
-
-            suppressor.shutdown();
-            suppressor = null;
-            suppressorThread = null;
-
-            lgpslayer.setSuppressor(null);
 
             enabled = false;