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

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/irsrectify

Files:

• build.xml (modified) (1 diff)
• src/irsrectify/IRSRectifyPlugin.java (modified) (3 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="irsrectify shortcut conflict"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java

@@ -74 +74 @@
             data.data.addPrimitive(way);
             data.data.setSelected(way.getPrimitiveId());
-            frame.mapView.setActiveLayer(data);
+            Main.getLayerManager().setActiveLayer(data);
         }
 
@@ -80 +80 @@
             if( frame == null || frame.mapView == null )
                 return null;
-            for( Layer l : frame.mapView.getAllLayers() )
+            for( Layer l : Main.getLayerManager().getLayers() )
                 if( l instanceof ImageryLayer )
                     return (ImageryLayer)l;
@@ -90 +90 @@
                 return null;
 
-            OsmDataLayer l = frame.mapView.getEditLayer();
+            OsmDataLayer l = Main.getLayerManager().getEditLayer();
             if( isOffsetLayer(l) )
                 return l;
 
             // try to find among all layers
-            for( Layer layer : frame.mapView.getAllLayers() )
+            for( Layer layer : Main.getLayerManager().getLayers() )
                 if( layer instanceof OsmDataLayer && isOffsetLayer((OsmDataLayer)layer) )
                     return (OsmDataLayer) layer;