Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 15007) @@ -10,7 +10,5 @@ import java.awt.geom.Area; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -111,19 +109,4 @@ /** - * A list of things we can zoom to. The zoom target is given depending on the mode. - * @deprecated Use {@link AutoScaleMode} enum instead - */ - @Deprecated - public static final Collection MODES = Collections.unmodifiableList(Arrays.asList( - marktr(/* ICON(dialogs/autoscale/) */ "data"), - marktr(/* ICON(dialogs/autoscale/) */ "layer"), - marktr(/* ICON(dialogs/autoscale/) */ "selection"), - marktr(/* ICON(dialogs/autoscale/) */ "conflict"), - marktr(/* ICON(dialogs/autoscale/) */ "download"), - marktr(/* ICON(dialogs/autoscale/) */ "problem"), - marktr(/* ICON(dialogs/autoscale/) */ "previous"), - marktr(/* ICON(dialogs/autoscale/) */ "next"))); - - /** * One of {@link AutoScaleMode}. Defines what we are zooming to. */ @@ -171,19 +154,9 @@ /** * Performs the auto scale operation of the given mode without the need to create a new action. - * @param mode One of {@link #MODES}. + * @param mode One of {@link AutoScaleMode}. * @since 14221 */ public static void autoScale(AutoScaleMode mode) { new AutoScaleAction(mode, false).autoScale(); - } - - /** - * Performs the auto scale operation of the given mode without the need to create a new action. - * @param mode One of {@link #MODES}. - * @deprecated Use {@link #autoScale(AutoScaleMode)} instead - */ - @Deprecated - public static void autoScale(String mode) { - autoScale(AutoScaleMode.of(mode)); } @@ -221,15 +194,5 @@ /** * Constructs a new {@code AutoScaleAction}. - * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES}) - * @deprecated Use {@link #AutoScaleAction(AutoScaleMode)} instead - */ - @Deprecated - public AutoScaleAction(final String mode) { - this(AutoScaleMode.of(mode)); - } - - /** - * Constructs a new {@code AutoScaleAction}. - * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES}) + * @param mode The autoscale mode (one of {@link AutoScaleMode}) * @since 14221 */ Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 15007) @@ -178,14 +178,4 @@ /** - * Convert the time stamp of the waypoint into seconds from the epoch. - * - * @deprecated Use {@link #setTime(Date)}, {@link #setTime(long)}, {@link #setTimeInMillis(long)} - */ - @Deprecated - public void setTime() { - setTimeFromAttribute(); - } - - /** * Sets the {@link #PT_TIME} attribute to the specified time. * @@ -205,16 +195,4 @@ public void setTimeInMillis(long ts) { attr.put(PT_TIME, new Date(ts)); - } - - /** - * Convert the time stamp of the waypoint into seconds from the epoch. - * @return The parsed time if successful, or {@code null} - * @since 9383 - * @deprecated Use {@link #setTime(Date)}, {@link #setTime(long)}, {@link #setTimeInMillis(long)} - */ - @Deprecated - public Date setTimeFromAttribute() { - Logging.warn("WayPoint.setTimeFromAttribute() is deprecated, please fix calling code"); - return getDate(); } Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 15007) @@ -10,5 +10,4 @@ import java.util.Collections; import java.util.Date; -import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; @@ -83,44 +82,4 @@ /** - * Replies the sub-collection of {@link OsmPrimitive}s of type type present in - * another collection of {@link OsmPrimitive}s. The result collection is a list. - * - * If list is null, replies an empty list. - * - * @param type of data (must be one of the {@link OsmPrimitive} types - * @param list the original list - * @param type the type to filter for - * @return the sub-list of OSM primitives of type type - * @deprecated Use {@link Stream} or {@link Utils#filteredCollection(Collection, Class)} instead. - */ - @Deprecated - public static List getFilteredList(Collection list, Class type) { - return (list != null ? list.stream() : Stream.empty()) - .filter(type::isInstance) - .map(type::cast) - .collect(Collectors.toList()); - } - - /** - * Replies the sub-collection of {@link OsmPrimitive}s of type type present in - * another collection of {@link OsmPrimitive}s. The result collection is a set. - * - * If list is null, replies an empty set. - * - * @param type of data (must be one of the {@link OsmPrimitive} types - * @param set the original collection - * @param type the type to filter for - * @return the sub-set of OSM primitives of type type - * @deprecated Use {@link Stream} instead - */ - @Deprecated - public static Set getFilteredSet(Collection set, Class type) { - return (set != null ? set.stream() : Stream.empty()) - .filter(type::isInstance) - .map(type::cast) - .collect(Collectors.toCollection(LinkedHashSet::new)); - } - - /** * Replies the collection of referring primitives for the primitives in primitives. * Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 15007) @@ -216,16 +216,4 @@ * @param tag The tag * @return The number of times this tag is used in this collection. - * @since 10736 - * @deprecated use {@link #getTagOccurrence} - */ - @Deprecated - public int getTagOccurence(Tag tag) { - return getTagOccurrence(tag); - } - - /** - * Gets the number of times this tag was added to the collection. - * @param tag The tag - * @return The number of times this tag is used in this collection. * @since 14302 */ Index: trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 15007) @@ -111,17 +111,4 @@ /** - * Compute Levenshtein distance - * - * @param s First word - * @param t Second word - * @return The distance between words - * @deprecated Use {@link Utils#getLevenshteinDistance} instead - */ - @Deprecated - public static int getLevenshteinDistance(String s, String t) { - return Utils.getLevenshteinDistance(s, t); - } - - /** * Add a regular expression rule. * @param regExpr the regular expression to search for Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 15007) @@ -217,12 +217,4 @@ private static final MainLayerManager layerManager = new MainLayerManager(); - /** - * The commands undo/redo handler. - * @since 12641 - * @deprecated Use {@link UndoRedoHandler#getInstance} - */ - @Deprecated - public static final UndoRedoHandler undoRedo = UndoRedoHandler.getInstance(); - private static final LayerChangeListener undoRedoCleaner = new LayerChangeListener() { @Override Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 15007) @@ -124,13 +124,4 @@ } - /** - * Removes this history browser model as listener for data change and layer change events. - * @deprecated not needeed anymore, job is done in {@link #dispose} - */ - @Deprecated - public void unlinkAsListener() { - getHistoryBrowser().getModel().unlinkAsListener(); - } - /* ---------------------------------------------------------------------------------- */ /* interface HistoryDataSetListener */ Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 15007) @@ -696,18 +696,4 @@ /** - * Clears the currentPhoto, i.e. remove select marker, and optionally repaint. - * @param repaint Repaint flag - * @deprecated Use {@link ImageData#clearSelectedImage} - * @since 6392 - */ - @Deprecated - public void clearCurrentPhoto(boolean repaint) { - data.clearSelectedImage(); - if (repaint) { - updateBufferAndRepaint(); - } - } - - /** * Clears the currentPhoto of the other GeoImageLayer's. Otherwise there could be multiple selected photos. */ Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 15007) @@ -36,5 +36,4 @@ import org.openstreetmap.josm.io.auth.CredentialsManager; import org.openstreetmap.josm.spi.preferences.Config; -import org.openstreetmap.josm.spi.preferences.IUrls; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.HttpClient; @@ -70,12 +69,4 @@ */ public static final int MAX_DOWNLOAD_THREADS = 2; - - /** - * Default URL of the standard OSM API. - * @deprecated Use {@link IUrls#getDefaultOsmApiUrl} - * @since 5422 - */ - @Deprecated - public static final String DEFAULT_API_URL = "https://api.openstreetmap.org/api"; // The collection of instantiated OSM APIs Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 15007) @@ -124,24 +124,4 @@ /** - * The makeTooltip hook will be called whenever a tooltip for - * a menu or button is created. - * - * Tooltips are usually not system dependent, unless the - * JVM is too dumb to provide correct names for all the keys. - * - * Some LAFs don't understand HTML, such as the OSX LAFs. - * - * @param name Tooltip text to display - * @param sc Shortcut associated (to display accelerator between parenthesis) - * @return Full tooltip text (name + accelerator) - * @since 1084 - * @deprecated Use {@link Shortcut#makeTooltip} instead. - */ - @Deprecated - default String makeTooltip(String name, Shortcut sc) { - return Shortcut.makeTooltip(name, sc != null ? sc.getKeyStroke() : null); - } - - /** * Returns the default LAF to be used on this platform to look almost as a native application. * @return The default native LAF for this platform Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 15006) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 15007) @@ -17,5 +17,4 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; -import java.lang.reflect.AccessibleObject; import java.net.MalformedURLException; import java.net.URL; @@ -1554,16 +1553,4 @@ /** - * Sets {@code AccessibleObject}(s) accessible. - * @param objects objects - * @see AccessibleObject#setAccessible - * @deprecated Use {@link ReflectionUtils#setObjectsAccessible(AccessibleObject...)} - * @since 10223 - */ - @Deprecated - public static void setObjectsAccessible(final AccessibleObject... objects) { - ReflectionUtils.setObjectsAccessible(objects); - } - - /** * Clamp a value to the given range * @param val The value