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

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

Files:

• build.xml (modified) (1 diff)
• src/imageryadjust/ImageryAdjustMapMode.java (modified) (4 diffs)

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

@@ -2 +2 @@
 <project name="imageryadjust" default="dist" basedir=".">
     <property name="commit.message" value="ImageryAdjust: Adjust while holding shortcut key"/>
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <property name="plugin.author" value="Upliner"/>

applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java

@@ -54 +54 @@
     
     private List<? extends Layer> getVisibleLayers() {
-        List<? extends Layer> all = new ArrayList<Layer>(Main.map.mapView.getLayersOfType(ImageryLayer.class));
+        List<? extends Layer> all = new ArrayList<Layer>(Main.getLayerManager().getLayersOfType(ImageryLayer.class));
         Iterator<? extends Layer> it = all.iterator();
         while (it.hasNext()) {
@@ -76 +76 @@
             return;
         }
-        List<ImageryLayer> layers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
+        List<ImageryLayer> layers = Main.getLayerManager().getLayersOfType(ImageryLayer.class);
         if (layers.size() == 1) {
             adjustingLayer = layers.get(0);
@@ -159 +159 @@
             if (Main.map.mapView == null)
                 return false;
-            return Main.map.mapView.getActiveLayer() == layer;
+            return Main.getLayerManager().getActiveLayer() == layer;
         }
 
@@ -230 +230 @@
         if (Main.map == null) return false;
         if (Main.map.mapView == null) return false;
-        boolean b = ! Main.map.mapView.getLayersOfType(ImageryLayer.class).isEmpty();
+        boolean b = ! Main.getLayerManager().getLayersOfType(ImageryLayer.class).isEmpty();
         return b;
     }