Changeset 33788 in osm for applications/editors

Timestamp:

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

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/NanoLog

Files:

• build.xml (modified) (1 diff)
• src/nanolog/Correlator.java (modified) (4 diffs)
• src/nanolog/GPXChooser.java (modified) (2 diffs)
• src/nanolog/NanoLogLayer.java (modified) (14 diffs)
• src/nanolog/NanoLogPanel.java (modified) (3 diffs)
• src/nanolog/NanoLogPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/NanoLog/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="NanoLog"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
     <property name="plugin.author" value="Ilya Zverev"/>
     <property name="plugin.class" value="nanolog.NanoLogPlugin"/>

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -52 +53 @@
                         break outer;
                     } catch (Exception e) {
-                        Main.warn(e);
+                        Logging.warn(e);
                     }
                 }
@@ -99 +100 @@
 
                         } catch (UncheckedParseException e) {
-                            Main.error("Error while parsing date \"" + curWpTimeStr + '"');
-                            Main.error(e);
+                            Logging.error("Error while parsing date \"" + curWpTimeStr + '"');
+                            Logging.error(e);
                             prevWp = null;
                             prevWpTime = 0;
@@ -247 +248 @@
                             prevWpTime = curWpTime;
                         } catch (UncheckedParseException e) {
-                            Main.error("Error while parsing date \"" + curWpTimeStr + '"');
-                            Main.error(e);
+                            Logging.error("Error while parsing date \"" + curWpTimeStr + '"');
+                            Logging.error(e);
                             prevWp = null;
                             prevWpTime = 0;

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

@@ -3 +3 @@
 import javax.swing.JDialog;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -20 +20 @@
     public static GpxLayer topLayer() {
         // return first found local layer
-        for (Layer layer : Main.getLayerManager().getLayers()) {
+        for (Layer layer : MainApplication.getLayerManager().getLayers()) {
             if (layer instanceof GpxLayer && ((GpxLayer) layer).isLocalFile())
                 return (GpxLayer) layer;

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() {

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

@@ -11 +11 @@
 import javax.swing.JList;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -40 +40 @@
     public void updateMarkers() {
         List<NanoLogEntry> entries = new ArrayList<>();
-        for (NanoLogLayer l : Main.getLayerManager().getLayersOfType(NanoLogLayer.class)) {
+        for (NanoLogLayer l : MainApplication.getLayerManager().getLayersOfType(NanoLogLayer.class)) {
             entries.addAll(l.getEntries());
         }
@@ -78 +78 @@
     }
 
-    private class LogListModel extends AbstractListModel<String> {
+    private static class LogListModel extends AbstractListModel<String> {
         private List<NanoLogEntry> entries;
         private final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss");

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

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -24 +25 @@
     public NanoLogPlugin(PluginInformation info) {
         super(info);
-        Main.main.menu.fileMenu.insert(new OpenNanoLogLayerAction(), 4);
+        MainApplication.getMenu().fileMenu.insert(new OpenNanoLogLayerAction(), 4);
     }
 
@@ -32 +33 @@
             NanoLogPanel panel = new NanoLogPanel();
             newFrame.addToggleDialog(panel);
-            Main.getLayerManager().addLayerChangeListener(panel);
+            MainApplication.getLayerManager().addLayerChangeListener(panel);
         }
     }
 
-    private class OpenNanoLogLayerAction extends JosmAction {
+    private static class OpenNanoLogLayerAction extends JosmAction {
 
         OpenNanoLogLayerAction() {
@@ -50 +51 @@
                     if (!entries.isEmpty()) {
                         NanoLogLayer layer = new NanoLogLayer(entries);
-                        Main.getLayerManager().addLayer(layer);
+                        MainApplication.getLayerManager().addLayer(layer);
                         layer.setupListeners();
                     }