Changeset 33547 in osm for applications/editors/josm/plugins/imagery_offset_db

Timestamp:

2017-08-26T21:28:34+02:00 (7 years ago)

Author:

zverik

Message:

Upgrade API in imagery_offset_db

Location:

applications/editors/josm/plugins/imagery_offset_db

Files:

• build.xml (modified) (1 diff)
• src/iodb/CalibrationLayer.java (modified) (3 diffs)
• src/iodb/DeprecateOffsetAction.java (modified) (3 diffs)
• src/iodb/GetImageryOffsetAction.java (modified) (4 diffs)
• src/iodb/IODBReader.java (modified) (2 diffs)
• src/iodb/ImageryOffset.java (modified) (1 diff)
• src/iodb/ImageryOffsetPlugin.java (modified) (3 diffs)
• src/iodb/ImageryOffsetTools.java (modified) (5 diffs)
• src/iodb/ImageryOffsetWatcher.java (modified) (3 diffs)
• src/iodb/OffsetDialog.java (modified) (6 diffs)
• src/iodb/OffsetInfoAction.java (modified) (2 diffs)
• src/iodb/StoreImageryOffsetAction.java (modified) (4 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Imagery Offset Database"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12093"/>
-        <property name="plugin.canloadatruntime" value="true"/>
+    <property name="plugin.main.version" value="12643"/>
+    <property name="plugin.canloadatruntime" value="true"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java

@@ -19 +19 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -152 +152 @@
             double lat = 0.0;
             double lon = 0.0;
-            for (int i = 0; i < geometry.length; i++) {
-                lon += geometry[i].lon();
-                lat += geometry[i].lat();
+            for (LatLon ll : geometry) {
+                lon += ll.lon();
+                lat += ll.lat();
             }
             center = new LatLon(lat / geometry.length, lon / geometry.length);
         }
-        Main.map.mapView.zoomTo(center);
+        MainApplication.getMap().mapView.zoomTo(center);
     }
 
@@ -178 +178 @@
         public void actionPerformed(ActionEvent e) {
             color = c;
-            Main.map.mapView.repaint();
+            MainApplication.getMap().mapView.repaint();
         }
     }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -43 +45 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (Main.map == null || Main.map.mapView == null || !Main.map.isVisible())
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().isVisible())
             return;
 
@@ -98 +100 @@
                     if (listener != null)
                         depTask.setListener(listener);
-                    Main.worker.submit(depTask);
+                    MainApplication.worker.submit(depTask);
                 } catch (UnsupportedEncodingException ex) {
-                    Main.error(ex);
+                    Logging.error(ex);
                 }
     }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -54 +55 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (Main.map == null || Main.map.mapView == null || !Main.map.isVisible())
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().isVisible())
             return;
-        Projection proj = Main.map.mapView.getProjection();
-        LatLon center = proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        Projection proj = MainApplication.getMap().mapView.getProjection();
+        LatLon center = proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
         AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
         String imagery = ImageryOffsetTools.getImageryID(layer);
@@ -64 +65 @@
 
         DownloadOffsetsTask download = new DownloadOffsetsTask(center, layer, imagery);
-        Main.worker.submit(download);
+        MainApplication.worker.submit(download);
     }
 
@@ -74 +75 @@
     protected void updateEnabledState() {
         boolean state = true;
-        if (Main.map == null || Main.map.mapView == null || !Main.map.isVisible())
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().isVisible())
             state = false;
         AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();

applications/editors/josm/plugins/imagery_offset_db/src/iodb/IODBReader.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -163 +164 @@
                         // On one hand, we don't care, but this situation is one
                         // of those "it can never happen" cases.
-                        System.err.println(ex.getMessage());
+                        Logging.warn(ex);
                     }
                     parsingOffset = false;

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffset.java

@@ -3 +3 @@
 
 import java.util.Map;
-import org.openstreetmap.josm.Main;
 
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.imagery.OffsetBookmark;
-import org.openstreetmap.josm.data.projection.Projection;
 
 /**

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -42 +43 @@
         int version = Version.getInstance().getVersion();
         JMenu offsetMenu = version < 5803
-                ? Main.main.menu.addMenu("Offset", tr("Offset"), KeyEvent.VK_O, 6, "help")
-                        : Main.main.menu.imageryMenu;
+                ? MainApplication.getMenu().addMenu("Offset", tr("Offset"), KeyEvent.VK_O, 6, "help")
+                        : MainApplication.getMenu().imageryMenu;
                 offsetMenu.add(getAction);
                 offsetMenu.add(storeAction);
@@ -53 +54 @@
                         toolbar.add("getoffset");
                         Main.pref.putCollection("toolbar", toolbar);
-                        Main.toolbar.refreshToolbarControl();
+                        MainApplication.getToolbar().refreshToolbarControl();
                     }
                     Main.pref.put("iodb.modify.toolbar", false);

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetTools.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
@@ -36 +37 @@
      */
     public static AbstractTileSourceLayer getTopImageryLayer() {
-        if (Main.map == null || Main.map.mapView == null)
+        if (!MainApplication.isDisplayingMapView())
             return null;
-        List<AbstractTileSourceLayer> layers = Main.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
+        List<AbstractTileSourceLayer> layers = MainApplication.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
         for (AbstractTileSourceLayer layer : layers) {
             String url = layer.getInfo().getUrl();
@@ -54 +55 @@
     public static LatLon getMapCenter() {
         Projection proj = Main.getProjection();
-        return Main.map == null || Main.map.mapView == null
-                ? new LatLon(0, 0) : proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        return !MainApplication.isDisplayingMapView()
+                ? new LatLon(0, 0) : proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
     }
 
@@ -67 +68 @@
     public static LatLon getLayerOffset(AbstractTileSourceLayer layer, LatLon center) {
         Projection proj = Main.getProjection();
-        EastNorth offsetCenter = Main.map.mapView.getCenter();
+        EastNorth offsetCenter = MainApplication.getMap().mapView.getCenter();
         EastNorth centerOffset = offsetCenter.add(-layer.getDisplaySettings().getDx(),
                 -layer.getDisplaySettings().getDy());
@@ -121 +122 @@
 
     public static int getCurrentZoom() {
-        if (Main.map == null || Main.map.mapView == null) {
+        if (!MainApplication.isDisplayingMapView()) {
             return 1;
         }
-        MapView mv = Main.map.mapView;
+        MapView mv = MainApplication.getMap().mapView;
         LatLon topLeft = mv.getLatLon(0, 0);
         LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
@@ -51 +52 @@
         maxDistance = Main.pref.getDouble("iodb.offset.radius", 15);
         MapView.addZoomChangeListener(this);
-        Main.getLayerManager().addLayerChangeListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         checkOffset(); // we assume there's at the most one imagery layer at this moment
         time = new Timer();
@@ -64 +65 @@
     public void destroy() {
         MapView.removeZoomChangeListener(this);
-        Main.getLayerManager().removeLayerChangeListener(this);
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         time.cancel();
     }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
@@ -154 +155 @@
         }
         pack();
-        Main.map.mapView.repaint();
+        MainApplication.getMap().mapView.repaint();
     }
 
@@ -223 +224 @@
         MapView.addZoomChangeListener(this);
         if (!MODAL) {
-            Main.map.mapView.addTemporaryLayer(this);
-            Main.map.mapView.repaint();
+            MainApplication.getMap().mapView.addTemporaryLayer(this);
+            MainApplication.getMap().mapView.repaint();
         }
         setVisible(true);
@@ -252 +253 @@
         if (!MODAL) {
             if (closeDialog) {
-                Main.map.mapView.removeTemporaryLayer(this);
-                Main.map.mapView.repaint();
+                MainApplication.getMap().mapView.removeTemporaryLayer(this);
+                MainApplication.getMap().mapView.repaint();
             }
             if (selectedOffset != null) {
@@ -273 +274 @@
             ImageryOffsetTools.applyLayerOffset(layer, (ImageryOffset) selectedOffset);
             ImageryOffsetWatcher.getInstance().markGood();
-            Main.map.repaint();
+            MainApplication.getMap().repaint();
             if (!Main.pref.getBoolean("iodb.offset.message", false)) {
                 JOptionPane.showMessageDialog(Main.parent,
@@ -284 +285 @@
         } else if (selectedOffset instanceof CalibrationObject) {
             CalibrationLayer clayer = new CalibrationLayer((CalibrationObject) selectedOffset);
-            Main.getLayerManager().addLayer(clayer);
+            MainApplication.getLayerManager().addLayer(clayer);
             clayer.panToCenter();
             if (!Main.pref.getBoolean("iodb.calibration.message", false)) {

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -61 +63 @@
                         SimpleOffsetQueryTask reportTask =
                                 new SimpleOffsetQueryTask(query, tr("Reporting the offset..."));
-                        Main.worker.submit(reportTask);
+                        MainApplication.worker.submit(reportTask);
                     } catch (UnsupportedEncodingException ex) {
-                        Main.error(ex);
+                        Logging.error(ex);
                     }
                 }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/StoreImageryOffsetAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -49 +51 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (Main.map == null || Main.map.mapView == null)
+        if (!MainApplication.isDisplayingMapView())
             return;
 
@@ -126 +128 @@
                 query.append(key).append('=').append(URLEncoder.encode(params.get(key), "UTF8"));
             }
-            Main.worker.submit(new SimpleOffsetQueryTask(query.toString(), tr("Uploading a new offset...")));
+            MainApplication.worker.submit(new SimpleOffsetQueryTask(query.toString(), tr("Uploading a new offset...")));
         } catch (UnsupportedEncodingException ex) {
-            Main.error(ex);
+            Logging.error(ex);
         }
     }
@@ -167 +169 @@
     protected void updateEnabledState() {
         boolean state = true;
-        if (Main.map == null || Main.map.mapView == null || !Main.map.isVisible())
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().isVisible())
             state = false;
         if (ImageryOffsetTools.getTopImageryLayer() == null)