Changeset 32455 in osm for applications/editors/josm/plugins/buildings_tools/src

Timestamp:

2016-06-30T00:13:14+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/buildings_tools/src/buildings_tools

Files:

• Building.java (modified) (2 diffs)
• DrawBuildingAction.java (modified) (4 diffs)
• MergeAddrPointsAction.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -207 +207 @@
 
     private Node findNode(EastNorth pos) {
-        DataSet ds = Main.main.getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
         LatLon l = eastNorth2latlon(pos);
         List<Node> nodes = ds.searchNodes(new BBox(l.lon() - 0.0000001, l.lat() - 0.0000001,
@@ -234 +234 @@
         List<Node> nodes = new LinkedList<>();
         nodesloop:
-        for (Node n : Main.main.getCurrentDataSet().searchNodes(bbox)) {
+        for (Node n : Main.getLayerManager().getEditDataSet().searchNodes(bbox)) {
             if (!n.isUsable())
                 continue;

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -20 +20 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.Map.Entry;
 
@@ -128 +127 @@
     public void enterMode() {
         super.enterMode();
-        if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             Main.map.selectSelectTool(false);
             return;
@@ -140 +139 @@
         Main.map.keyDetector.addModifierListener(this);
         DataSet.addSelectionListener(this);
-        updateSnap(getCurrentDataSet().getSelected());
+        updateSnap(getLayerManager().getEditDataSet().getSelected());
     }
 
@@ -307 +306 @@
                     showAddrDialog(w);
                 if (ToolSettings.isAutoSelect()
-                        && (Main.main.getCurrentDataSet().getSelected().isEmpty() || shift)) {
-                    Main.main.getCurrentDataSet().setSelected(w);
+                        && (getLayerManager().getEditDataSet().getSelected().isEmpty() || shift)) {
+                    getLayerManager().getEditDataSet().setSelected(w);
                 }
             }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java

@@ -49 +49 @@
         if (!isEnabled())
             return;
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
         if (selection.isEmpty()) {
             new Notification(tr("Select both address nodes and building ways to merge"))
@@ -146 +146 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 }