Ignore:
Timestamp:
2016-06-29T21:10:50+02:00 (8 years ago)
Author:
donvip
Message:

remove calls to deprecated methods

Location:
applications/editors/josm/plugins/FixAddresses
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/FixAddresses/build.xml

    r31926 r32445  
    44    <property name="commit.message" value="[josm_fixadresses]: Fixes #josm8336"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="7001"/>
     6    <property name="plugin.main.version" value="10353"/>
    77       
    88    <!-- Configure these properties (replace "..." accordingly).

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

    r30737 r32445  
    489489            invalidate(workingSet);
    490490        } else {
    491             if (Main.main.getCurrentDataSet() != null) {
    492                 invalidate(Main.main.getCurrentDataSet().allPrimitives());
     491            if (Main.getLayerManager().getEditDataSet() != null) {
     492                invalidate(Main.getLayerManager().getEditDataSet().allPrimitives());
    493493            }
    494494        }

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

    r30348 r32445  
    5959    @Override
    6060    protected void updateEnabledState() {
    61         setEnabled(getCurrentDataSet() != null);
     61        setEnabled(getLayerManager().getEditDataSet() != null);
    6262    }
    6363
    … …  
    6767        // Enable button if there is either a selection or at least a data set
    6868        setEnabled( selection != null && !selection.isEmpty() ||
    69                     (getCurrentDataSet() != null));
     69                    (getLayerManager().getEditDataSet() != null));
    7070    }
    7171

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

    r30737 r32445  
    119119    OsmTransferException {
    120120
    121         if (Main.main.getCurrentDataSet() == null || addressesToGuess == null) return;
     121        if (Main.getLayerManager().getEditDataSet() == null || addressesToGuess == null) return;
    122122
    123123        isRunning = true;
    … …  
    152152
    153153                    // visit osm data
    154                     for (Way way : Main.main.getCurrentDataSet().getWays()) {
     154                    for (Way way : Main.getLayerManager().getEditDataSet().getWays()) {
    155155                        if (canceled) {
    156156                            break;
    … …  
    172172
    173173                    // visit osm data
    174                     for (Node node : Main.main.getCurrentDataSet().getNodes()) {
     174                    for (Node node : Main.getLayerManager().getEditDataSet().getNodes()) {
    175175                        if (canceled) {
    176176                            break;

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

    r30737 r32445  
    6464        List<OsmPrimitive> sel = new ArrayList<>();
    6565
    66         getCurrentDataSet().clearSelection();
     66        getLayerManager().getEditDataSet().clearSelection();
    6767        for (OSMAddress aNode : addrToSel) {
    6868            sel.add(aNode.getOsmObject());
    … …  
    7676        }
    7777
    78         getCurrentDataSet().setSelected(sel);
     78        getLayerManager().getEditDataSet().setSelected(sel);
    7979    }
    8080

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

    r30737 r32445  
    3535                osms.add(aNode.getOsmObject());
    3636            }
    37             getCurrentDataSet().setSelected(osms);
     37            getLayerManager().getEditDataSet().setSelected(osms);
    3838        }
    3939    }
    … …  
    4141    @Override
    4242    protected void updateEnabledState() {
    43         setEnabled(getCurrentDataSet() != null);
     43        setEnabled(getLayerManager().getEditDataSet() != null);
    4444    }
    4545}
Note: See TracChangeset for help on using the changeset viewer.