Ignore:
Timestamp:
2016-07-02T02:50:50+02:00 (9 years ago)
Author:
donvip
Message:

remove calls to deprecated methods

Location:
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java

    r32289 r32525  
    4949        @Override
    5050        public void actionPerformed(ActionEvent e) {
    51             if (Main.main.getEditLayer() instanceof OdLayer) {
     51            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
    5252                dataLayer.downloadOsmData();
    5353                diffButton.setEnabled(dataLayer.osmLayer != null);
    … …  
    7272        @Override
    7373        public void actionPerformed(ActionEvent e) {
    74             if (Main.main.getEditLayer() instanceof OdLayer) {
     74            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
    7575                dataLayer.makeDiff();
    7676            }
    … …  
    103103            @Override
    104104            public void mousePressed(MouseEvent e) {
    105                 if (Main.main.getEditLayer() instanceof OdLayer) {
     105                if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
    106106                    JPopupMenu popup = new JPopupMenu();
    107107                    for (JosmAction tool : dataLayer.handler.getTools()) {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

    r32289 r32525  
    6565        removeOsmLayer();
    6666        osmLayer = layer;
    67         Main.main.addLayer(osmLayer);
     67        Main.getLayerManager().addLayer(osmLayer);
    6868    }
    6969
    7070    public void removeOsmLayer() {
    7171        if (osmLayer != null) {
    72             Main.main.removeLayer(osmLayer);
     72            Main.getLayerManager().removeLayer(osmLayer);
    7373            osmLayer = null;
    7474        }
    … …  
    7878        removeDiffLayer();
    7979        diffLayer = layer;
    80         Main.main.addLayer(diffLayer);
     80        Main.getLayerManager().addLayer(diffLayer);
    8181    }
    8282   
    8383    public void removeDiffLayer() {
    8484        if (diffLayer != null) {
    85             Main.main.removeLayer(diffLayer);
     85            Main.getLayerManager().removeLayer(diffLayer);
    8686            diffLayer = null;
    8787        }
Note: See TracChangeset for help on using the changeset viewer.