Changeset 32445 in osm for applications/editors/josm/plugins/FixAddresses/src/org

Timestamp:

2016-06-29T21:10:50+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• AddressEditContainer.java (modified) (1 diff)
• FixUnresolvedStreetsAction.java (modified) (2 diffs)
• GuessAddressRunnable.java (modified) (3 diffs)
• gui/actions/SelectAddressesInMapAction.java (modified) (2 diffs)
• gui/actions/SelectIncompleteAddressesAction.java (modified) (2 diffs)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

@@ -489 +489 @@
             invalidate(workingSet);
         } else {
-            if (Main.main.getCurrentDataSet() != null) {
-                invalidate(Main.main.getCurrentDataSet().allPrimitives());
+            if (Main.getLayerManager().getEditDataSet() != null) {
+                invalidate(Main.getLayerManager().getEditDataSet().allPrimitives());
             }
         }

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java

@@ -59 +59 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 
@@ -67 +67 @@
         // Enable button if there is either a selection or at least a data set
         setEnabled( selection != null && !selection.isEmpty() ||
-                    (getCurrentDataSet() != null));
+                    (getLayerManager().getEditDataSet() != null));
     }
 

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java

@@ -119 +119 @@
     OsmTransferException {
 
-        if (Main.main.getCurrentDataSet() == null || addressesToGuess == null) return;
+        if (Main.getLayerManager().getEditDataSet() == null || addressesToGuess == null) return;
 
         isRunning = true;
@@ -152 +152 @@
 
                     // visit osm data
-                    for (Way way : Main.main.getCurrentDataSet().getWays()) {
+                    for (Way way : Main.getLayerManager().getEditDataSet().getWays()) {
                         if (canceled) {
                             break;
@@ -172 +172 @@
 
                     // visit osm data
-                    for (Node node : Main.main.getCurrentDataSet().getNodes()) {
+                    for (Node node : Main.getLayerManager().getEditDataSet().getNodes()) {
                         if (canceled) {
                             break;

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java

@@ -64 +64 @@
         List<OsmPrimitive> sel = new ArrayList<>();
 
-        getCurrentDataSet().clearSelection();
+        getLayerManager().getEditDataSet().clearSelection();
         for (OSMAddress aNode : addrToSel) {
             sel.add(aNode.getOsmObject());
@@ -76 +76 @@
         }
 
-        getCurrentDataSet().setSelected(sel);
+        getLayerManager().getEditDataSet().setSelected(sel);
     }
 

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java

@@ -35 +35 @@
                 osms.add(aNode.getOsmObject());
             }
-            getCurrentDataSet().setSelected(osms);
+            getLayerManager().getEditDataSet().setSelected(osms);
         }
     }
@@ -41 +41 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 }