Changeset 13967 in josm for trunk


Ignore:
Timestamp:
2018-06-23T00:03:08+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #14120 - remove deprecated methods ImageryLayer.getDx()/getDy()/setOffset()

Location:
trunk/src/org/openstreetmap/josm/gui/layer
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r13897 r13967  
    314314    }
    315315
    316     /**
    317      * {@inheritDoc}
    318      * @deprecated Use {@link TileSourceDisplaySettings#getDx()}
    319      */
    320     @Override
    321     @Deprecated
    322     public double getDx() {
    323         return getDisplaySettings().getDx();
    324     }
    325 
    326     /**
    327      * {@inheritDoc}
    328      * @deprecated Use {@link TileSourceDisplaySettings#getDy()}
    329      */
    330     @Override
    331     @Deprecated
    332     public double getDy() {
    333         return getDisplaySettings().getDy();
    334     }
    335 
    336     /**
    337      * {@inheritDoc}
    338      * @deprecated Use {@link TileSourceDisplaySettings}
    339      */
    340     @Override
    341     @Deprecated
    342     public void setOffset(OffsetBookmark offset) {
    343         getDisplaySettings().setOffsetBookmark(offset);
    344     }
    345 
    346316    @Override
    347317    public Object getInfoComponent() {

  • trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

    r13733 r13967  
    3232import org.openstreetmap.josm.data.ProjectionBounds;
    3333import org.openstreetmap.josm.data.imagery.ImageryInfo;
    34 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
    3534import org.openstreetmap.josm.data.preferences.IntegerProperty;
    3635import org.openstreetmap.josm.gui.MainApplication;
    … …  
    3837import org.openstreetmap.josm.gui.MenuScroller;
    3938import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
    40 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
    4139import org.openstreetmap.josm.gui.widgets.UrlLabel;
    4240import org.openstreetmap.josm.tools.GBC;
    … …  
    9189        ProjectionBounds bounds = mapView.getProjectionBounds();
    9290        return mapView.getWidth() / (bounds.maxEast - bounds.minEast);
    93     }
    94 
    95     /**
    96      * Gets the x displacement of this layer.
    97      * To be removed end of 2016
    98      * @return The x displacement.
    99      * @deprecated Use {@link TileSourceDisplaySettings#getDx()}
    100      */
    101     @Deprecated
    102     public double getDx() {
    103         // moved to AbstractTileSourceLayer/TileSourceDisplaySettings. Remains until all actions migrate.
    104         return 0;
    105     }
    106 
    107     /**
    108      * Gets the y displacement of this layer.
    109      * To be removed end of 2016
    110      * @return The y displacement.
    111      * @deprecated Use {@link TileSourceDisplaySettings#getDy()}
    112      */
    113     @Deprecated
    114     public double getDy() {
    115         // moved to AbstractTileSourceLayer/TileSourceDisplaySettings. Remains until all actions migrate.
    116         return 0;
    117     }
    118 
    119     /**
    120      * Sets the displacement offset of this layer. The layer is automatically invalidated.
    121      * To be removed end of 2016
    122      * @param offset the offset bookmark
    123      * @deprecated Use {@link TileSourceDisplaySettings}
    124      */
    125     @Deprecated
    126     public void setOffset(OffsetBookmark offset) {
    127         // moved to AbstractTileSourceLayer/TileSourceDisplaySettings. Remains until all actions migrate.
    12891    }
    12992
Note: See TracChangeset for help on using the changeset viewer.