Index: trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/command/RemoveNodesCommand.java (revision 15390) @@ -4,6 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.util.HashSet; -import java.util.List; import java.util.Set; @@ -21,15 +19,4 @@ */ public class RemoveNodesCommand extends AbstractNodesCommand> { - - /** - * Constructs a new {@code RemoveNodesCommand}. - * @param way The way to modify. Must not be null, and belong to a data set - * @param rmNodes The list of nodes to remove - * @deprecated Use {@link #RemoveNodesCommand(Way, Set)} - */ - @Deprecated - public RemoveNodesCommand(Way way, List rmNodes) { - super(way.getDataSet(), way, new HashSet<>(rmNodes)); - } /** Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxDistance.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxDistance.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxDistance.java (revision 15390) @@ -2,13 +2,6 @@ package org.openstreetmap.josm.data.gpx; -import java.util.ArrayList; -import java.util.List; - -import org.openstreetmap.josm.data.coor.EastNorth; -import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.tools.Geometry; @@ -36,99 +29,3 @@ .min().orElse(Double.MAX_VALUE); } - - /** - * Get the distance between an object and a waypoint - * @param p OsmPrimitive to get the distance to the WayPoint - * @param waypoint WayPoint to get the distance from - * @return The shortest distance between p and waypoint - * @deprecated Use {@code Geometry.getDistance(p, new Node(waypoint.getCoor()))} - * instead - */ - @Deprecated - public static double getDistance(OsmPrimitive p, WayPoint waypoint) { - return Geometry.getDistance(p, new Node(waypoint.getCoor())); - } - - /** - * Get the shortest distance between a relation and a waypoint - * @param relation Relation to get the distance from - * @param waypoint WayPoint to get the distance to - * @return The distance between the relation and the waypoint - * @deprecated Use {@code Geometry.getDistance(relation, new Node(waypoint.getCoor()))} - * instead - */ - @Deprecated - public static double getDistanceRelation(Relation relation, WayPoint waypoint) { - double shortestDistance = Double.MAX_VALUE; - List nodes = new ArrayList<>(relation.getMemberPrimitives(Node.class)); - List ways = new ArrayList<>(relation.getMemberPrimitives(Way.class)); - List relations = new ArrayList<>(relation.getMemberPrimitives(Relation.class)); - if (nodes.isEmpty() && ways.isEmpty() && relations.isEmpty()) return Double.MAX_VALUE; - for (Relation nrelation : relations) { - double distance = getDistanceRelation(nrelation, waypoint); - if (distance < shortestDistance) shortestDistance = distance; - } - for (Way way : ways) { - double distance = getDistanceWay(way, waypoint); - if (distance < shortestDistance) shortestDistance = distance; - } - for (Node node : nodes) { - double distance = getDistanceNode(node, waypoint); - if (distance < shortestDistance) shortestDistance = distance; - } - return shortestDistance; - } - - /** - * Get the shortest distance between a way and a waypoint - * @param way Way to get the distance from - * @param waypoint WayPoint to get the distance to - * @return The distance between the way and the waypoint - * @deprecated Use {@code Geometry.getDistanceWayNode(way, new Node(waypoint.getCoor()))} instead - */ - @Deprecated - public static double getDistanceWay(Way way, WayPoint waypoint) { - if (way == null || waypoint == null) return Double.MAX_VALUE; - return Geometry.getDistanceWayNode(way, new Node(waypoint.getCoor())); - } - - /** - * Get the distance between a node and a waypoint - * @param node Node to get the distance from - * @param waypoint WayPoint to get the distance to - * @return The distance between the two points - * @deprecated Use {@code Geometry.getDistance(node, new Node(waypoint.getCoor()))} - * instead - */ - @Deprecated - public static double getDistanceNode(Node node, WayPoint waypoint) { - if (node == null || waypoint == null) return Double.MAX_VALUE; - return Geometry.getDistance(node, new Node(waypoint.getCoor())); - } - - /** - * Get the distance between coordinates (provided by EastNorth) and a waypoint - * @param en The EastNorth to get the distance to - * @param waypoint WayPoint to get the distance to - * @return The distance between the two points - * @deprecated Use {@code Geometry.getDistance(new Node(en), new Node(waypoint.getCoor()))} instead - */ - @Deprecated - public static double getDistanceEastNorth(EastNorth en, WayPoint waypoint) { - if (en == null || waypoint == null) return Double.MAX_VALUE; - return Geometry.getDistance(new Node(en), new Node(waypoint.getCoor())); - } - - /** - * Get the distance between coordinates (latitude longitude) and a waypoint - * @param latlon LatLon to get the distance from - * @param waypoint WayPoint to get the distance to - * @return The distance between the two points - * @deprecated Use {@code Geometry.getDistance(new Node(latlon), new Node(waypoint.getCoor()))} instead - */ - @Deprecated - public static double getDistanceLatLon(LatLon latlon, WayPoint waypoint) { - if (latlon == null || waypoint == null || waypoint.getCoor() == null) return Double.MAX_VALUE; - return Geometry.getDistance(new Node(latlon), new Node(waypoint.getCoor())); - } } Index: trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java (revision 15390) @@ -281,16 +281,4 @@ } - /** - * Sets/replaces the filter for a given row. - * @param rowIndex The row index - * @param filter The filter that should be placed in that row - * @return the filter previously at the specified position - * @deprecated Use {@link #setValue} - */ - @Deprecated - public Filter setFilter(int rowIndex, Filter filter) { - return setValue(rowIndex, filter); - } - @Override public Filter setValue(int rowIndex, Filter filter) { @@ -298,15 +286,4 @@ updateFilterMatcher(); return result; - } - - /** - * Gets the filter by row index - * @param rowIndex The row index - * @return The filter in that row - * @deprecated Use {@link #getValue} - */ - @Deprecated - public Filter getFilter(int rowIndex) { - return getValue(rowIndex); } Index: trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (revision 15390) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Rectangle; import java.awt.geom.Area; import java.util.ArrayList; @@ -41,9 +40,4 @@ /** the area in east/north space */ public final Area area; - /** the integer bounds, - * @deprecated better use area.getBounds2D() - * */ - @Deprecated - public final Rectangle bounds; /** @@ -57,5 +51,4 @@ this.nodes = this.getNodes(); this.area = Geometry.getArea(nodes); - this.bounds = area.getBounds(); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 15390) @@ -164,24 +164,4 @@ /** - * Moves down the filter in the given row. - * @param rowIndex The filter row - * @deprecated Use {@link #moveDown(int...)} - */ - @Deprecated - public void moveDownFilter(int rowIndex) { - moveDown(rowIndex); - } - - /** - * Moves up the filter in the given row - * @param rowIndex The filter row - * @deprecated Use {@link #moveUp(int...)} - */ - @Deprecated - public void moveUpFilter(int rowIndex) { - moveUp(rowIndex); - } - - /** * Removes the filter that is displayed in the given row * @param rowIndex The index of the filter to remove @@ -193,15 +173,4 @@ fireTableRowsDeleted(rowIndex, rowIndex); } - } - - /** - * Sets/replaces the filter for a given row. - * @param rowIndex The row index - * @param filter The filter that should be placed in that row - * @deprecated Use {@link #setValue} - */ - @Deprecated - public void setFilter(int rowIndex, Filter filter) { - setValue(rowIndex, filter); } @@ -213,15 +182,4 @@ fireTableRowsUpdated(rowIndex, rowIndex); return result; - } - - /** - * Gets the filter by row index - * @param rowIndex The row index - * @return The filter in that row - * @deprecated Use {@link #getValue} - */ - @Deprecated - public Filter getFilter(int rowIndex) { - return getValue(rowIndex); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 15390) @@ -34,6 +34,4 @@ import javax.swing.ListSelectionModel; import javax.swing.UIManager; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListSelectionEvent; import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; @@ -360,32 +358,4 @@ } - /** - * Wires listener to listSelectionModel in such a way, that - * listener receives a {@link IEnabledStateUpdating#updateEnabledState()} - * on every {@link ListSelectionEvent}. - * - * @param listener the listener - * @param listSelectionModel the source emitting {@link ListSelectionEvent}s - * @deprecated Use {@link TableHelper#adaptTo} - */ - @Deprecated - protected void adaptTo(final IEnabledStateUpdating listener, ListSelectionModel listSelectionModel) { - TableHelper.adaptTo(listener, listSelectionModel); - } - - /** - * Wires listener to listModel in such a way, that - * listener receives a {@link IEnabledStateUpdating#updateEnabledState()} - * on every {@link ListDataEvent}. - * - * @param listener the listener - * @param listModel the source emitting {@link ListDataEvent}s - * @deprecated Use {@link TableHelper#adaptTo} - */ - @Deprecated - protected void adaptTo(final IEnabledStateUpdating listener, LayerListModel listModel) { - TableHelper.adaptTo(listener, listModel); - } - @Override public void destroy() { Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 15389) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 15390) @@ -382,15 +382,4 @@ /** - * Displays image for the given data. - * @param data geo image data - * @param entry image entry - * @deprecated Use {@link #displayImage} - */ - @Deprecated - public static void showImage(ImageData data, ImageEntry entry) { - getInstance().displayImage(data, entry); - } - - /** * Enables (or disables) the "Previous" button. * @param value {@code true} to enable the button, {@code false} otherwise