Changeset 34518 in osm for applications/editors/josm/plugins/imagery-xml-bounds

Timestamp:

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

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/imagery-xml-bounds

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery-xml-bounds/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13957"/>
+    <property name="plugin.main.version" value="14153"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java

@@ -11 +11 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.IPrimitiveAction;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
 
@@ -51 +51 @@
         scrollPane.setPreferredSize(new Dimension(1024, 600));
         box.add(scrollPane);
-        JOptionPane.showMessageDialog(Main.parent, box, ACTION_NAME, JOptionPane.PLAIN_MESSAGE);
+        JOptionPane.showMessageDialog(MainApplication.getMainFrame(), box, ACTION_NAME, JOptionPane.PLAIN_MESSAGE);
     }
 

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -67 +66 @@
             Logging.trace(e);
             if (JOptionPane.showConfirmDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("Validating error in file {0}:\n{1}\nDo you want to continue without validating the file ?",
                             source != null ? source : file.getPath(), e.getLocalizedMessage()),
@@ -91 +90 @@
                             if (dataSet.allPrimitives().isEmpty()) {
                                 JOptionPane.showMessageDialog(
-                                        Main.parent, tr("No data found in file {0}.", source != null ? source : file.getPath()),
+                                        MainApplication.getMainFrame(), tr("No data found in file {0}.", source != null ? source : file.getPath()),
                                         tr("Open Imagery XML file"), JOptionPane.INFORMATION_MESSAGE);
                             }