Changeset 32329 in osm for applications/editors/josm/plugins/junctionchecking

Timestamp:

2016-06-19T16:08:56+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm12953 - Replace most uses of MapView.getActiveLayer and similar methods (patch by michael2402, modified) - gsoc-core

Location:

applications/editors/josm/plugins/junctionchecking

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java (modified) (1 diff)

applications/editors/josm/plugins/junctionchecking/build.xml

@@ -3 +3 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7575"/>
+    <property name="plugin.main.version" value="10279"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java

@@ -65 +65 @@
         //Prüfen, ob der ausgewählte Layer ein OSMDataLayer ist
         if (Main.map == null
-                || !Main.map.isVisible() || !(Main.map.mapView.getActiveLayer() instanceof OsmDataLayer)) {
+                || !Main.map.isVisible() || !(Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer)) {
             JOptionPane.showMessageDialog(Main.parent, tr("this layer is no osm data layer"));
             return;
@@ -84 +84 @@
         OSMGraph graph = new OSMGraph();
         //Der vom Benutzer in JOSM ausgewählte, zur Zeit aktive Layer wird der PLugin-OSM-Layer
-        plugin.setOsmlayer((OsmDataLayer)Main.map.mapView.getActiveLayer());
+        plugin.setOsmlayer((OsmDataLayer)Main.getLayerManager().getActiveLayer());
         Iterator<Node> it = Main.main.getCurrentDataSet().getNodes().iterator();
         while (it.hasNext()) {
@@ -147 +147 @@
         Main.map.selectMapMode(plugin.getJcMapMode());
         Main.main.addLayer(plugin.getChannelDigraphLayer());
-        Main.map.mapView.setActiveLayer(plugin.getChannelDigraphLayer());
+        Main.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
     }
 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java

@@ -91 +91 @@
             plugin.getChannelDigraph().addJunctioncandidateChannel(jc.getSubJunction().get(i));
         }
-        Main.map.mapView.setActiveLayer(plugin.getChannelDigraphLayer());
+        Main.getLayerManager().setActiveLayer(plugin.getChannelDigraphLayer());
     }
 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java

@@ -42 +42 @@
             }
         }
-        Main.map.mapView.setActiveLayer(plugin.getOsmlayer());
+        Main.getLayerManager().setActiveLayer(plugin.getOsmlayer());
         plugin.getOsmlayer().data.setSelected(ways);