Changeset 34521 in osm

Timestamp:

2018-08-18T18:08:10+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/indoor_sweepline

Files:

• build.xml (modified) (1 diff)
• src/indoor_sweepline/IndoorSweeplineWizardAction.java (modified) (2 diffs)
• src/indoor_sweepline/IndoorSweeplineWizardDialog.java (modified) (3 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13558"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineWizardAction.java

@@ -8 +8 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -31 +31 @@
     public void actionPerformed(ActionEvent event) {
         if (layer == null)
-            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
+            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()),
                     "No default layer found.");
         else if (!(layer instanceof OsmDataLayer))
-            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
+            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()),
                     "The default layer is not an OSM layer.");
         else if (MainApplication.getMap() == null)
-            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
+            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()),
                     "No map found.");
         else if (MainApplication.getMap().mapView == null)
-            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(Main.parent),
+            JOptionPane.showMessageDialog(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()),
                     "No map view found.");
         else
             new IndoorSweeplineController((OsmDataLayer) layer,
-                    Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter()));
+                    ProjectionRegistry.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter()));
     }
 

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineWizardDialog.java

@@ -32 +32 @@
 import javax.swing.table.TableModel;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -38 +38 @@
 
     public IndoorSweeplineWizardDialog(IndoorSweeplineController controller) {
-        super(JOptionPane.getFrameForComponent(Main.parent), "Indoor Sweepline Wizard", false);
+        super(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()), "Indoor Sweepline Wizard", false);
 
         this.controller = controller;
@@ -69 +69 @@
     public void setVisible(boolean visible) {
         if (visible)
-            setLocationRelativeTo(JOptionPane.getFrameForComponent(Main.parent));
+            setLocationRelativeTo(JOptionPane.getFrameForComponent(MainApplication.getMainFrame()));
         super.setVisible(visible);
     }