Changeset 10742 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-08-06T01:08:18+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:CallToDeprecatedMethod - remove calls to deprecated methods

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/imagery/OffsetBookmark.java (modified) (3 diffs)
• gui/MapView.java (modified) (3 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -885 +885 @@
             return ((DrawAction) map.mapMode).getInProgressSelection();
         } else {
-            DataSet ds = getCurrentDataSet();
+            DataSet ds = getLayerManager().getEditDataSet();
             if (ds == null) return null;
             return ds.getSelected();

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 
@@ -101 +102 @@
     }
 
-    public static void bookmarkOffset(String name, ImageryLayer layer) {
+    public static void bookmarkOffset(String name, AbstractTileSourceLayer layer) {
         LatLon center;
         if (Main.isDisplayingMapView()) {
@@ -110 +111 @@
         OffsetBookmark nb = new OffsetBookmark(
                 Main.getProjection().toCode(), layer.getInfo().getName(),
-                name, layer.getDx(), layer.getDy(), center.lon(), center.lat());
+                name, layer.getDisplaySettings().getDx(), layer.getDisplaySettings().getDy(), center.lon(), center.lat());
         for (ListIterator<OffsetBookmark> it = allBookmarks.listIterator(); it.hasNext();) {
             OffsetBookmark b = it.next();

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -190 +190 @@
     /**
      * This class is an adapter for the old layer change interface.
-     * <p>
-     * New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener}
      * @author Michael Zangl
      * @since 10271
-     */
+     * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener}
+     */
+    @Deprecated
     protected static class LayerChangeAdapter implements ActiveLayerChangeListener, LayerManager.LayerChangeListener {
 
@@ -669 +669 @@
      */
     public boolean isActiveLayerDrawable() {
-         return getEditLayer() != null;
+         return layerManager.getEditLayer() != null;
     }
 
@@ -678 +678 @@
      */
     public boolean isActiveLayerVisible() {
-        OsmDataLayer e = getEditLayer();
+        OsmDataLayer e = layerManager.getEditLayer();
         return e != null && e.isVisible();
     }

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1246 +1246 @@
 
     private LatLon getShiftedLatLon(EastNorth en) {
-        return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
+        return Main.getProjection().eastNorth2latlon(en.add(-getDisplaySettings().getDx(), -getDisplaySettings().getDy()));
     }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -143 +143 @@
     public static <T> boolean exists(Iterable<T> collection, Class<? extends T> clazz) {
         CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
-        return exists(collection, clazz::isInstance);
+        return StreamUtils.toStream(collection).anyMatch(clazz::isInstance);
     }