Changeset 32525 in osm for applications/editors/josm

Timestamp:

2016-07-02T02:50:50+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• gui/OdDialog.java (modified) (3 diffs)
• layers/OdDataLayer.java (modified) (2 diffs)

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

@@ -49 +49 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (Main.main.getEditLayer() instanceof OdLayer) {
+            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                 dataLayer.downloadOsmData();
                 diffButton.setEnabled(dataLayer.osmLayer != null);
@@ -72 +72 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (Main.main.getEditLayer() instanceof OdLayer) {
+            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                 dataLayer.makeDiff();
             }
@@ -103 +103 @@
             @Override
             public void mousePressed(MouseEvent e) {
-                if (Main.main.getEditLayer() instanceof OdLayer) {
+                if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                     JPopupMenu popup = new JPopupMenu();
                     for (JosmAction tool : dataLayer.handler.getTools()) {

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

@@ -65 +65 @@
         removeOsmLayer();
         osmLayer = layer;
-        Main.main.addLayer(osmLayer);
+        Main.getLayerManager().addLayer(osmLayer);
     }
 
     public void removeOsmLayer() {
         if (osmLayer != null) {
-            Main.main.removeLayer(osmLayer);
+            Main.getLayerManager().removeLayer(osmLayer);
             osmLayer = null;
         }
@@ -78 +78 @@
         removeDiffLayer();
         diffLayer = layer;
-        Main.main.addLayer(diffLayer);
+        Main.getLayerManager().addLayer(diffLayer);
     }
     
     public void removeDiffLayer() {
         if (diffLayer != null) {
-            Main.main.removeLayer(diffLayer);
+            Main.getLayerManager().removeLayer(diffLayer);
             diffLayer = null;
         }