Changeset 33846 in osm for applications/editors/josm/plugins

Timestamp:

2017-11-21T01:21:39+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12743

Location:

applications/editors/josm/plugins/irsrectify

Files:

• build.xml (modified) (1 diff)
• src/irsrectify/IRSRectifyPlugin.java (modified) (7 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="10580"/>
+    <property name="plugin.main.version" value="12743"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -31 +32 @@
     public IRSRectifyPlugin(PluginInformation info) {
         super(info);
-        Main.main.menu.toolsMenu.add(new IRSRectifyAction());
+        MainApplication.getMenu().toolsMenu.add(new IRSRectifyAction());
     }
 
@@ -65 +66 @@
             way.addNode(offset);
             way.put("timestamp", new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-            String userName = JosmUserIdentityManager.getInstance().getUserName();
+            String userName = UserIdentityManager.getInstance().getUserName();
             if( userName != null )
                 way.put("user", userName);
@@ -74 +75 @@
             data.data.addPrimitive(way);
             data.data.setSelected(way.getPrimitiveId());
-            Main.getLayerManager().setActiveLayer(data);
+            MainApplication.getLayerManager().setActiveLayer(data);
         }
 
@@ -80 +81 @@
             if( frame == null || frame.mapView == null )
                 return null;
-            for( Layer l : Main.getLayerManager().getLayers() )
+            for( Layer l : MainApplication.getLayerManager().getLayers() )
                 if( l instanceof ImageryLayer )
                     return (ImageryLayer)l;
@@ -90 +91 @@
                 return null;
 
-            OsmDataLayer l = Main.getLayerManager().getEditLayer();
+            OsmDataLayer l = MainApplication.getLayerManager().getEditLayer();
             if( isOffsetLayer(l) )
                 return l;
 
             // try to find among all layers
-            for( Layer layer : Main.getLayerManager().getLayers() )
+            for( Layer layer : MainApplication.getLayerManager().getLayers() )
                 if( layer instanceof OsmDataLayer && isOffsetLayer((OsmDataLayer)layer) )
                     return (OsmDataLayer) layer;
@@ -104 +105 @@
                 name = name + " " + newLayerNameCounter;
             l = new OsmDataLayer(new DataSet(), name, null);
-            Main.getLayerManager().addLayer(l);
+            MainApplication.getLayerManager().addLayer(l);
             return l;
         }