Changeset 32462 in osm for applications/editors/josm

Timestamp:

2016-06-30T03:08:25+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/imagery_offset_db

Files:

• .settings/org.eclipse.jdt.ui.prefs (added)
• build.xml (modified) (1 diff)
• src/iodb/ImageryOffsetWatcher.java (modified) (6 diffs)
• src/iodb/OffsetDialog.java (modified) (4 diffs)
• src/iodb/StoreImageryOffsetAction.java (modified) (3 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="10279"/>
+    <property name="plugin.main.version" value="10353"/>
         <property name="plugin.canloadatruntime" value="true"/>
 

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

@@ -1 +1 @@
 package iodb;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.TreeMap;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -16 +32 @@
  * @license WTFPL
  */
-public class ImageryOffsetWatcher implements MapView.ZoomChangeListener, MapView.LayerChangeListener, Destroyable {
+public class ImageryOffsetWatcher implements ZoomChangeListener, LayerChangeListener, ActiveLayerChangeListener, Destroyable {
     private static final double THRESHOLD = 1e-8;
     private static ImageryOffsetWatcher instance;
@@ -32 +48 @@
         maxDistance = Main.pref.getDouble("iodb.offset.radius", 15);
         MapView.addZoomChangeListener(this);
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
         checkOffset(); // we assume there's at the most one imagery layer at this moment
         time = new Timer();
@@ -41 +58 @@
      * Unregister all events. This actually gets never called, but it's not a problem.
      */
+    @Override
     public void destroy() {
         MapView.removeZoomChangeListener(this);
-        MapView.removeLayerChangeListener(this);
+        Main.getLayerManager().removeLayerChangeListener(this);
+        Main.getLayerManager().removeActiveLayerChangeListener(this);
         time.cancel();
     }
@@ -165 +184 @@
     }
 
+    @Override
     public void zoomChanged() {
         checkOffset();
     }
 
-    public void activeLayerChange( Layer oldLayer, Layer newLayer ) {
-        checkOffset();
-    }
-
-    public void layerAdded( Layer newLayer ) {
-        if( newLayer instanceof ImageryLayer )
-            loadLayerOffset((ImageryLayer)newLayer);
-        checkOffset();
-    }
-
-    public void layerRemoved( Layer oldLayer ) {
-        checkOffset();
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        checkOffset();
+    }
+
+    @Override
+    public void layerAdded(LayerAddEvent e) {
+        Layer newLayer = e.getAddedLayer();
+        if (newLayer instanceof ImageryLayer)
+            loadLayerOffset((ImageryLayer) newLayer);
+        checkOffset();
+    }
+
+    @Override
+    public void layerRemoving(LayerRemoveEvent e) {
+        checkOffset();
+    }
+
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
     }
 
@@ -204 +232 @@
 
     /**
-     * Loads the current imagery layer offset from preferences. 
+     * Loads the current imagery layer offset from preferences.
      */
     private void loadLayerOffset( ImageryLayer layer ) {

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

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -51 +52 @@
  * @license WTFPL
  */
-public class OffsetDialog extends JDialog implements ActionListener, MapView.ZoomChangeListener, MapViewPaintable {
+public class OffsetDialog extends JDialog implements ActionListener, ZoomChangeListener, MapViewPaintable {
     protected static final String PREF_CALIBRATION = "iodb.show.calibration";
     protected static final String PREF_DEPRECATED = "iodb.show.deprecated";
@@ -276 +277 @@
                 JOptionPane.showMessageDialog(Main.parent,
                         tr("The topmost imagery layer has been shifted to presumably match\n"
-                        + "OSM data in the area. Please check that the offset is still valid\n"
-                        + "by downloading GPS tracks and comparing them and OSM data to the imagery."),
+                                + "OSM data in the area. Please check that the offset is still valid\n"
+                                + "by downloading GPS tracks and comparing them and OSM data to the imagery."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
                 Main.pref.put("iodb.offset.message", true);
@@ -283 +284 @@
         } else if( selectedOffset instanceof CalibrationObject ) {
             CalibrationLayer clayer = new CalibrationLayer((CalibrationObject)selectedOffset);
-            Main.map.mapView.addLayer(clayer);
+            Main.getLayerManager().addLayer(clayer);
             clayer.panToCenter();
             if( !Main.pref.getBoolean("iodb.calibration.message", false) ) {
                 JOptionPane.showMessageDialog(Main.parent,
                         tr("A layer has been added with a calibration geometry. Hide data layers,\n"
-                        + "find the corresponding feature on the imagery layer and move it accordingly."),
+                                + "find the corresponding feature on the imagery layer and move it accordingly."),
                         ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
                 Main.pref.put("iodb.calibration.message", true);

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

@@ -1 +1 @@
 package iodb;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
 import java.io.UnsupportedEncodingException;
-import java.net.*;
-import java.util.*;
+import java.net.URLEncoder;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
  * Upload the current imagery offset or an calibration geometry information.
- * 
+ *
  * @author Zverik
  * @license WTFPL
@@ -39 +46 @@
      * and we don't have one when a user name is needed.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         if( Main.map == null || Main.map.mapView == null )
@@ -56 +64 @@
         if( userName.indexOf('@') > 0 )
             userName = userName.replace('@', ',');
-            
+
         // check if an object suitable for calibration is selected
         OsmPrimitive calibration = null;
-        if( getCurrentDataSet() != null ) {
-            Collection<OsmPrimitive> selectedObjects = getCurrentDataSet().getSelected();
+        if (getLayerManager().getEditDataSet() != null) {
+            Collection<OsmPrimitive> selectedObjects = getLayerManager().getEditDataSet().getSelected();
             if( selectedObjects.size() == 1 ) {
                 OsmPrimitive selection = selectedObjects.iterator().next();