Changeset 32474 in osm

Timestamp:

2016-06-30T23:46:16+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/tracer2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/tracer2/TagValues.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (modified) (5 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="see #josm11090"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10353"/>
 
     <!-- Configure these properties (replace "..." accordingly).
-
-
-
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
     -->

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

@@ -75 +75 @@
         BBox bbox = new BBox(way);
         bbox.addPrimitive(way,s_dMinDistance);
-        s_oWays = Main.main.getCurrentDataSet().searchWays(bbox);
+        s_oWays = Main.getLayerManager().getEditDataSet().searchWays(bbox);
     }
     
@@ -87 +87 @@
         BBox bbox = new BBox(way);
         bbox.addPrimitive(way,s_dMinDistance);
-        s_oNodes = Main.main.getCurrentDataSet().searchNodes(bbox);
+        s_oNodes = Main.getLayerManager().getEditDataSet().searchNodes(bbox);
     }
     

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

@@ -54 +54 @@
         // get values
         List<String> tagValues = new ArrayList<>();
-        List<AutoCompletionListItem> values = Main.main.getCurrentDataSet().getAutoCompletionManager().getValues(m_strTag);
+        List<AutoCompletionListItem> values = Main.getLayerManager().getEditDataSet().getAutoCompletionManager().getValues(m_strTag);
         for ( AutoCompletionListItem i : values ) {
                 tagValues.add(i.getValue());

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

@@ -27 +27 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38 +38 @@
 import javax.swing.JOptionPane;
 
-import org.xml.sax.SAXException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -47 +45 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 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.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParam;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamList;
 import org.openstreetmap.josm.plugins.tracer2.preferences.ServerParamSelectDialog;
+import org.openstreetmap.josm.plugins.tracer2.server.GetTrace;
 import org.openstreetmap.josm.plugins.tracer2.server.GetVersion;
-import org.openstreetmap.josm.plugins.tracer2.server.GetTrace;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.xml.sax.SAXException;
 
 class TracerAction extends MapMode implements MouseListener, KeyListener {
@@ -82 +81 @@
         //System.out.println("keyPressed: key:" + e.getKeyChar() + " code" + e.getKeyCode() + " Loc" + e.getKeyLocation()+ " ID" + KeyEvent.getKeyText(e.getKeyCode()));
         
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
         List<Command> commands = new ArrayList<>();
         
@@ -340 +339 @@
                 
                 if (m_bShift) {
-                    Main.main.getCurrentDataSet().addSelected(ConnectWays.s_oWay);
+                    getLayerManager().getEditDataSet().addSelected(ConnectWays.s_oWay);
                 } else {
-                    Main.main.getCurrentDataSet().setSelected(ConnectWays.s_oWay);
+                    getLayerManager().getEditDataSet().setSelected(ConnectWays.s_oWay);
                 }
             } else {