Changeset 33567 in osm for applications

Timestamp:

2017-08-27T20:18:01+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12671

Location:

applications/editors/josm/plugins/openvisible

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java (modified) (4 diffs)
• src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java (modified) (2 diffs)

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

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

applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
+import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.io.GpxImporter;
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -55 +56 @@
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
-        if(Main.map == null || Main.map.mapView == null) {
+        if(!MainApplication.isDisplayingMapView()) {
             JOptionPane.showMessageDialog(Main.parent, tr("No view open - cannot determine boundaries!"));
             return;
         }
-        MapView view = Main.map.mapView;
+        MapView view = MainApplication.getMap().mapView;
         Rectangle bounds = view.getBounds();
         LatLon bottomLeft = view.getLatLon(bounds.x, bounds.y + bounds.height);
@@ -109 +111 @@
             DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), NullProgressMonitor.INSTANCE);
             OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
         }
         else
@@ -131 +133 @@
             r.getGpxData().storageFile = file;
             GpxLayer gpxLayer = new GpxLayer(r.getGpxData(), fn);
-            Main.getLayerManager().addLayer(gpxLayer);
-            Main.getLayerManager().addLayer(new MarkerLayer(r.getGpxData(), tr("Markers from {0}", fn), file, gpxLayer));
+            MainApplication.getLayerManager().addLayer(gpxLayer);
+            MainApplication.getLayerManager().addLayer(new MarkerLayer(r.getGpxData(), tr("Markers from {0}", fn), file, gpxLayer));
 
         } else {

applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java

@@ -4 +4 @@
 package at.dallermassl.josm.plugin.openvisible;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -17 +17 @@
     public OpenVisiblePlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.gpsMenu, new OpenVisibleAction());
+        MainMenu.add(MainApplication.getMenu().gpsMenu, new OpenVisibleAction());
     }