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

Timestamp:

2017-08-27T19:16:30+02:00 (7 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds

Files:

• ImageryXmlBoundsPlugin.java (modified) (2 diffs)
• io/XmlBoundsImporter.java (modified) (4 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.imageryxmlbounds;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -60 +60 @@
         ShowBoundsSelectionAction selectionAction = new ShowBoundsSelectionAction();
         DataSet.addSelectionListener(selectionAction);
-        Main.toolbar.register(selectionAction);
+        MainApplication.getToolbar().register(selectionAction);
         // Allow JOSM to download *.imagery.xml files
-        Main.main.menu.openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
     }
 

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -21 +22 @@
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.data.XmlBoundsConverter;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -63 +65 @@
             entries = reader.parse();
         } catch (SAXException e) {
-                if (Main.isTraceEnabled()) {
-                        Main.trace(e);
-                }
+            Logging.trace(e);
             if (JOptionPane.showConfirmDialog(
                     Main.parent,
@@ -94 +94 @@
                                         tr("Open Imagery XML file"), JOptionPane.INFORMATION_MESSAGE);
                             }
-                            Main.getLayerManager().addLayer(layer);
+                            MainApplication.getLayerManager().addLayer(layer);
                             layer.onPostLoadFromFile();
                         });
         } catch (SAXException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }