Changeset 33788 in osm for applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java

Timestamp:

2017-11-05T20:04:04+01:00 (9 years ago)

Author:

donvip

Message:

update to JOSM 12643

File:

• applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (modified) (14 diffs)

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -44 +45 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -65 +67 @@
 
     public void setupListeners() {
-        Main.map.mapView.addMouseListener(mouseListener);
-        Main.map.mapView.addMouseMotionListener(mouseListener);
-    }
-
-    @Override
-    public void destroy() {
-        Main.map.mapView.removeMouseListener(mouseListener);
-        Main.map.mapView.removeMouseMotionListener(mouseListener);
+        MainApplication.getMap().mapView.addMouseListener(mouseListener);
+        MainApplication.getMap().mapView.addMouseMotionListener(mouseListener);
+    }
+
+    @Override
+    public synchronized void destroy() {
+        MainApplication.getMap().mapView.removeMouseListener(mouseListener);
+        MainApplication.getMap().mapView.removeMouseMotionListener(mouseListener);
         super.destroy();
     }
@@ -123 +125 @@
                             timeDate = fmt.parse(time);
                         } catch (ParseException e) {
-                            Main.warn(e);
+                            Logging.warn(e);
                         }
                         if (message == null || message.length() == 0 || timeDate == null)
@@ -132 +134 @@
                             try {
                                 pos = new LatLon(Double.parseDouble(lat), Double.parseDouble(lon));
-                                direction = new Integer(dir);
+                                direction = Integer.valueOf(dir);
                             } catch (NumberFormatException e) {
-                                Main.trace(e);
+                                Logging.trace(e);
                             }
                         }
-                        NanoLogEntry entry = new NanoLogEntry(timeDate, message, pos, direction);
-                        result.add(entry);
+                        result.add(new NanoLogEntry(timeDate, message, pos, direction));
                     }
                 }
@@ -221 +222 @@
         else if (selectedEntry >= log.size())
             selectedEntry = log.size() - 1;
-        Main.map.repaint();
+        invalidate();
     }
 
@@ -231 +232 @@
         else if (selectedEntry >= log.size())
             selectedEntry = log.size() - 1;
-        Main.map.repaint();
+        invalidate();
     }
 
@@ -237 +238 @@
         int newSelected = i >= 0 && i < log.size() ? i : -1;
         if (newSelected != selectedEntry) {
-//            System.out.println("selected: " + log.get(newSelected).getMessage());
             selectedEntry = newSelected;
             fireMarkerSelected();
-            Main.map.mapView.repaint();
+            invalidate();
         }
     }
@@ -261 +261 @@
 
         public int nearestEntry(MouseEvent e) {
-            LatLon ll = Main.map.mapView.getLatLon(e.getX(), e.getY());
+            LatLon ll = MainApplication.getMap().mapView.getLatLon(e.getX(), e.getY());
             int radius = 8;
             if (ll != null) {
-                LatLon lld = Main.map.mapView.getLatLon(e.getX() + radius, e.getY() + radius);
+                LatLon lld = MainApplication.getMap().mapView.getLatLon(e.getX() + radius, e.getY() + radius);
                 double distance = Math.max(lld.lat() - ll.lat(), lld.lon() - ll.lon());
                 boolean selectedIsSelected = false;
@@ -303 +303 @@
         public void mousePressed(MouseEvent e) {
             int nearest = nearestEntry(e);
-            if (nearest > 0 && Main.getLayerManager().getActiveLayer() == NanoLogLayer.this) {
+            if (nearest > 0 && MainApplication.getLayerManager().getActiveLayer() == NanoLogLayer.this) {
                 dragging = nearest;
                 doDrag(e);
@@ -319 +319 @@
         if (gpx == null)
             return;
-        EastNorth eastNorth = Main.map.mapView.getEastNorth(x, y);
-        double tolerance = eastNorth.distance(Main.map.mapView.getEastNorth(x + 300, y));
+        EastNorth eastNorth = MainApplication.getMap().mapView.getEastNorth(x, y);
+        double tolerance = eastNorth.distance(MainApplication.getMap().mapView.getEastNorth(x + 300, y));
         WayPoint wp = gpx.data.nearestPointOnTrack(eastNorth, tolerance);
         if (wp == null)
@@ -329 +329 @@
         Correlator.revertPos(log);
         Correlator.correlate(log, gpx.data, log.get(entry).getTime().getTime() - newTime);
-        Main.map.mapView.repaint();
+        MainApplication.getMap().mapView.repaint();
     }
 
@@ -353 +353 @@
                 Correlator.correlate(log, layer.data, offset);
                 fireMarkersChanged();
-                Main.map.mapView.repaint();
+                MainApplication.getMap().mapView.repaint();
             }
             // 3. Show non-modal (?) window with a slider and a text input
@@ -360 +360 @@
     }
 
-    private class SaveLayer extends JosmAction {
+    private static class SaveLayer extends JosmAction {
 
         SaveLayer() {