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

Timestamp:

2014-06-30T21:34:02+02:00 (10 years ago)

Author:

glebius

Message:

Somehow fix EDT violations in LiveGpsDialog.

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.gui.MapFrame;
@@ -32 +33 @@
     private JLabel speedLabel;
     private JPanel panel;
+    private LiveGpsStatus status;
+    private LiveGpsData data;
 
     /**
@@ -64 +67 @@
         if (!isVisible())
             return;
+
         if("gpsdata".equals(evt.getPropertyName())) {
-            LiveGpsData data = (LiveGpsData) evt.getNewValue();
-            if(data.isFix()) {
-//                fixLabel.setText("fix");
-                panel.setBackground(Color.WHITE);
-                latLabel.setText(data.getLatitude() + "deg");
-                longLabel.setText(data.getLongitude() + "deg");
-                double mySpeed = data.getSpeed() * 3.6f;
-                speedLabel.setText((Math.round(mySpeed*100)/100) + "km/h"); // m(s to km/h
-                courseLabel.setText(data.getCourse() + "deg");
+            data = (LiveGpsData) evt.getNewValue();
 
-                String wayString = data.getWayInfo();
-                if(wayString.length() > 0) {
-                    wayLabel.setText(wayString);
+            SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                if(data.isFix()) {
+                    panel.setBackground(Color.WHITE);
+                    latLabel.setText(data.getLatitude() + "deg");
+                    longLabel.setText(data.getLongitude() + "deg");
+                    double mySpeed = data.getSpeed() * 3.6f;
+                    speedLabel.setText((Math.round(mySpeed*100)/100) + "km/h");
+                    courseLabel.setText(data.getCourse() + "deg");
+
+                    String wayString = data.getWayInfo();
+                    if(wayString.length() > 0) {
+                        wayLabel.setText(wayString);
+                    } else {
+                        wayLabel.setText(tr("unknown"));
+                    }
                 } else {
-                    wayLabel.setText(tr("unknown"));
+                    latLabel.setText("");
+                    longLabel.setText("");
+                    speedLabel.setText("");
+                    courseLabel.setText("");
+                    panel.setBackground(Color.RED);
                 }
+            }});
+        } else if ("gpsstatus".equals(evt.getPropertyName())) {
+            status = (LiveGpsStatus) evt.getNewValue();
 
-            } else {
-//                fixLabel.setText("no fix");
-                latLabel.setText("");
-                longLabel.setText("");
-                speedLabel.setText("");
-                courseLabel.setText("");
-                panel.setBackground(Color.RED);
-            }
-        } else if ("gpsstatus".equals(evt.getPropertyName())) {
-            LiveGpsStatus status = (LiveGpsStatus) evt.getNewValue();
-            statusLabel.setText(status.getStatusMessage());
-            if(status.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED) {
-                panel.setBackground(Color.RED);
-            } else {
-                panel.setBackground(Color.WHITE);
-            }
+            SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                statusLabel.setText(status.getStatusMessage());
+                if(status.getStatus() != LiveGpsStatus.GpsStatus.CONNECTED) {
+                    panel.setBackground(Color.RED);
+                } else {
+                    panel.setBackground(Color.WHITE);
+                }
+            }});
         }
-
     }
 }