Changeset 33700 in osm for applications/editors/josm/plugins/tracer2/src

Timestamp:

2017-10-04T11:09:28+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15398

Location:

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2

Files:

• ConnectWays.java (modified) (7 diffs)
• TagValues.java (modified) (2 diffs)
• TracerAction.java (modified) (9 diffs)
• TracerPlugin.java (modified) (2 diffs)
• preferences/ServerParamList.java (modified) (3 diffs)
• server/GetTrace.java (modified) (3 diffs)
• server/GetVersion.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java

@@ -10 +10 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam;
 import org.openstreetmap.josm.tools.Pair;
@@ -64 +65 @@
         BBox bbox = new BBox(way);
         bbox.addPrimitive(way, s_dMinDistance);
-        s_oWays = Main.getLayerManager().getEditDataSet().searchWays(bbox);
+        s_oWays = MainApplication.getLayerManager().getEditDataSet().searchWays(bbox);
     }
 
@@ -76 +77 @@
         BBox bbox = new BBox(way);
         bbox.addPrimitive(way, s_dMinDistance);
-        s_oNodes = Main.getLayerManager().getEditDataSet().searchNodes(bbox);
+        s_oNodes = MainApplication.getLayerManager().getEditDataSet().searchNodes(bbox);
     }
 
@@ -185 +186 @@
 
         cmds2.addAll(connectTo());
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
 
         // add new Node
@@ -200 +202 @@
             for (Node node : way.getNodes()) {
                 if (firstNode == null || firstNode != node) {
-                    cmds.add(new AddCommand(node));
+                    cmds.add(new AddCommand(ds, node));
                 }
                 if (firstNode == null) {
@@ -210 +212 @@
         // add new way
         if (bAddWay == true) {
-            cmds.add(new AddCommand(s_oWay));
-        }
-
-        cmds.add(new ChangeCommand(s_oWayOld, trySplitWayByAnyNodes(s_oWay)));
+            cmds.add(new AddCommand(ds, s_oWay));
+        }
+
+        cmds.add(new ChangeCommand(ds, s_oWayOld, trySplitWayByAnyNodes(s_oWay)));
         cmds.addAll(cmds2);
 

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java

@@ -5 +5 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam;
 
@@ -37 +38 @@
         // get values
         List<String> tagValues = new ArrayList<>();
-        List<AutoCompletionListItem> values = Main.getLayerManager().getEditDataSet().getAutoCompletionManager().getValues(m_strTag);
-        for (AutoCompletionListItem i : values) {
+        for (AutoCompletionItem i : AutoCompletionManager.of(MainApplication.getLayerManager().getEditDataSet()).getTagValues(m_strTag)) {
             tagValues.add(i.getValue());
         }

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -39 +40 @@
 import org.openstreetmap.josm.plugins.tracer2.server.GetVersion;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -56 +58 @@
     TracerPlugin m_oPlugin;
 
-    TracerAction(MapFrame mapFrame) {
+    TracerAction() {
         super(tr("Tracer2"), "tracer2-sml", tr("Tracer2."),
                 Shortcut.registerShortcut("tools:tracer2", tr("Tool: {0}", tr("Tracer2")), KeyEvent.VK_T, Shortcut.DIRECT),
-                mapFrame, getCursor());
+                getCursor());
     }
 
@@ -122 +124 @@
         }
         super.enterMode();
-        Main.map.mapView.setCursor(getCursor());
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addKeyListener(this);
+        MapView mapView = MainApplication.getMap().mapView;
+        mapView.setCursor(getCursor());
+        mapView.addMouseListener(this);
+        mapView.addKeyListener(this);
     }
 
@@ -132 +135 @@
 
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeKeyListener(this);
+        MapView mapView = MainApplication.getMap().mapView;
+        mapView.removeMouseListener(this);
+        mapView.removeKeyListener(this);
     }
 
@@ -145 +149 @@
          * Positional data
          */
-        final LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y);
+        final LatLon pos = MainApplication.getMap().mapView.getLatLon(clickPoint.x, clickPoint.y);
 
         try {
@@ -166 +170 @@
             executeTraceThread.start();
         } catch (Exception e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
     }
@@ -350 +354 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable()) {
+        if (!MainApplication.getMap().mapView.isActiveLayerDrawable()) {
             return;
         }
@@ -372 +376 @@
 
 }
-

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerPlugin.java

@@ -4 +4 @@
 import java.io.File;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -20 +20 @@
     public TracerPlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.moreToolsMenu, new TracerAction(Main.map));
+        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new TracerAction());
 
         s_oPlugin = this;

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java

@@ -11 +11 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 public class ServerParamList {
@@ -58 +58 @@
             }
         } catch (Exception e) {
-            Main.warn("Tracer2 warning: can't load file " + m_strFilename);
+            Logging.warn("Tracer2 warning: can't load file " + m_strFilename);
         }
     }
@@ -68 +68 @@
             }
         } catch (Exception e) {
-            Main.warn("Tracer2 warning: can't save file " + m_strFilename);
+            Logging.warn("Tracer2 warning: can't save file " + m_strFilename);
         }
     }

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java

@@ -4 +4 @@
 import java.util.ArrayList;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam;
+import org.openstreetmap.josm.tools.Logging;
 
 public class GetTrace extends Request {
@@ -68 +68 @@
         } catch (Exception e) {
             //m_listLatLon = new ArrayList<>();
-            Main.warn(e);
+            Logging.warn(e);
         }
     }
@@ -94 +94 @@
         } catch (Exception e) {
             //m_listLatLon = new ArrayList<>();
-            Main.warn(e);
+            Logging.warn(e);
         }
     }

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetVersion.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.tracer2.server;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 public class GetVersion extends Request {
@@ -42 +42 @@
             if (astrParts.length > 3) m_nVersionRevision = Integer.parseInt(astrParts[3]);
         } catch (Exception e) {
-            Main.warn(e);
+            Logging.warn(e);
         }
     }