Changeset 33563 in osm

Timestamp:

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

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin

Files:

• ImportImagePlugin.java (modified) (2 diffs)
• LayerPropertiesDialog.java (modified) (4 diffs)
• LoadImageAction.java (modified) (2 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -17 +17 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -84 +85 @@
             loadFileAction.setEnabled(true);
             if (Main.main != null) {
-                MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction);
+                MainMenu.add(MainApplication.getMenu().imagerySubMenu, loadFileAction);
             }
 

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java

@@ -34 +34 @@
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -234 +235 @@
                 crsDescription = imageLayer.getBbox().getCoordinateReferenceSystem().getIdentifiers().iterator().next().toString();
             } catch (Exception e) {
-                Main.debug(e);
+                Logging.debug(e);
             }
             crsValueLabel.setText(crsDescription + "(" + imageLayer.getBbox().getCoordinateReferenceSystem().getName().toString() + ")");
@@ -297 +298 @@
                 crsDescription = imageLayer.getSourceRefSys().getIdentifiers().iterator().next().toString();
             } catch (Exception e) {
-                Main.debug(e);
+                Logging.debug(e);
             }
             currentCRSValueLabel.setText(crsDescription);
@@ -539 +540 @@
 
                                 } catch (IOException | FactoryException e2) {
-                                    Main.error(e2);
+                                    Logging.error(e2);
                                 }
                             } else {

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCanceledException;
 
@@ -57 +58 @@
 
             // Add layer:
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
-            Main.map.mapView.zoomTo(boundingXYVisitor);
+            MainApplication.getMap().mapView.zoomTo(boundingXYVisitor);
         }
     }