Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java (revision 19320) @@ -174,17 +174,4 @@ * is returned if that copy exists. * @return the GPS time value - * @deprecated Use {@link #getGpsInstant} - */ - @Deprecated - public Date getGpsTime() { - if (tmp != null) - return getDefensiveDate(tmp.gpsTime); - return getDefensiveDate(gpsTime); - } - - /** - * Returns the GPS time value. The GPS time value from the temporary copy - * is returned if that copy exists. - * @return the GPS time value */ @Override @@ -247,15 +234,4 @@ public boolean hasExifTime() { return exifTime != null; - } - - /** - * Returns the EXIF GPS time. - * @return the EXIF GPS time - * @since 6392 - * @deprecated Use {@link #getExifGpsInstant} - */ - @Deprecated - public Date getExifGpsTime() { - return getDefensiveDate(exifGpsTime); } Index: trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java (revision 19319) +++ (revision ) @@ -1,37 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.data.gpx; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * GPX track, NOT immutable - * @since 2907 - * @deprecated Use {@link GpxTrack} instead! - */ -@Deprecated -public class ImmutableGpxTrack extends GpxTrack { - - /** - * Constructs a new {@code ImmutableGpxTrack}. - * @param trackSegs track segments - * @param attributes track attributes - */ - public ImmutableGpxTrack(Collection> trackSegs, Map attributes) { - super(trackSegs, attributes); - } - - /** - * Constructs a new {@code ImmutableGpxTrack} from {@code GpxTrackSegment} objects. - * @param segments The segments to build the track from. Input is not deep-copied, - * which means the caller may reuse the same segments to build - * multiple ImmutableGpxTrack instances from. This should not be - * a problem, since this object cannot modify {@code this.segments}. - * @param attributes Attributes for the GpxTrack, the input map is copied. - * @since 13210 - */ - public ImmutableGpxTrack(List segments, Map attributes) { - super(segments, attributes); - } -} Index: trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (revision 19320) @@ -134,16 +134,4 @@ * Sets the {@link #PT_TIME} attribute to the specified time. * - * @param ts seconds from the epoch - * @since 13210 - * @deprecated Use {@link #setInstant(Instant)} - */ - @Deprecated - public void setTime(long ts) { - setInstant(Instant.ofEpochSecond(ts)); - } - - /** - * Sets the {@link #PT_TIME} attribute to the specified time. - * * @param ts milliseconds from the epoch * @since 14434 @@ -195,17 +183,4 @@ public boolean hasDate() { return attr.get(PT_TIME) instanceof Instant; - } - - /** - * Returns the waypoint time Date object. - * - * @return a copy of the Date object associated with this waypoint - * @since 14456 - * @deprecated Use {@link #getInstant()} - */ - @Deprecated - public Date getDate() { - Instant instant = getInstant(); - return instant == null ? null : Date.from(instant); } Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthVersion.java (revision 19320) @@ -8,10 +8,4 @@ */ public enum OAuthVersion { - /** - * OAuth 1.0a - * @deprecated The OSM API server has deprecated and will remove OAuth 1.0a support in June 2024. - */ - @Deprecated - OAuth10a, /** OAuth 2.0 */ OAuth20, Index: trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 19320) @@ -33,23 +33,4 @@ */ public static final String REVERSE_VALUE = "-1"; - - /** - * Discouraged synonym for {@link #TRUE_VALUE} - * @deprecated since 18801, use {@link #TRUE_VALUE} instead. - */ - @Deprecated - public static final String trueval = TRUE_VALUE; - /** - * Discouraged synonym for {@link #FALSE_VALUE} - * @deprecated since 18801, use {@link #FALSE_VALUE} instead. - */ - @Deprecated - public static final String falseval = FALSE_VALUE; - /** - * Discouraged synonym for {@link #REVERSE_VALUE} - * @deprecated since 18801, use {@link #REVERSE_VALUE} instead. - */ - @Deprecated - public static final String reverseval = REVERSE_VALUE; private OsmUtils() { Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 19320) @@ -159,14 +159,4 @@ * Returns the timestamp. * @return the timestamp - * @deprecated Use {@link #getInstant()} - */ - @Deprecated - public Date getTimestamp() { - return Date.from(timestamp); - } - - /** - * Returns the timestamp. - * @return the timestamp */ public Instant getInstant() { Index: trunk/src/org/openstreetmap/josm/data/protobuf/ProtobufPacked.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/protobuf/ProtobufPacked.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/data/protobuf/ProtobufPacked.java (revision 19320) @@ -15,16 +15,4 @@ private final long[] numbers; private int location; - - /** - * Create a new ProtobufPacked object - * - * @param ignored A reusable ByteArrayOutputStream (no longer used) - * @param bytes The packed bytes - * @deprecated since we aren't using the output stream anymore - */ - @Deprecated - public ProtobufPacked(ByteArrayOutputStream ignored, byte[] bytes) { - this(bytes); - } /** Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONImporter.java (revision 19320) @@ -36,20 +36,4 @@ } - /** - * Parse GeoJSON dataset. - * @param source geojson file - * @return GeoJSON dataset - * @throws IOException in case of I/O error - * @throws IllegalDataException if an error was found while parsing the data from the source - * @deprecated since 18807, use {@link #parseDataSet(InputStream, ProgressMonitor)} instead - */ - @Deprecated - public DataSet parseDataSet(final String source) throws IOException, IllegalDataException { - try (CachedFile cf = new CachedFile(source)) { - InputStream fileInputStream = Compression.getUncompressedFileInputStream(cf.getFile()); // NOPMD - return this.parseDataSet(fileInputStream, NullProgressMonitor.INSTANCE); - } - } - @Override protected DataSet parseDataSet(InputStream in, ProgressMonitor progressMonitor) throws IllegalDataException { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 19320) @@ -234,20 +234,4 @@ /** - * Returns the node icon that would be displayed for the given tag. - * @param tag The tag to look an icon for - * @return {@code null} if no icon found - * @deprecated use {@link OsmPrimitiveImageProvider#getResource} - */ - @Deprecated - public static ImageIcon getNodeIcon(Tag tag) { - if (tag != null) { - return OsmPrimitiveImageProvider.getResource(tag.getKey(), tag.getValue(), OsmPrimitiveType.NODE) - .map(resource -> resource.getPaddedIcon(ImageProvider.ImageSizes.SMALLICON.getImageDimension())) - .orElse(null); - } - return null; - } - - /** * Gets the directories that should be searched for icons * @param source The style source the icon is from Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 19320) @@ -234,16 +234,4 @@ * @param apiUrl The OSM API URL * @param executor the executor used for running the HTTP requests for the authorization - * @since 5422 - * @deprecated since 18991 - */ - @Deprecated - public FullyAutomaticAuthorizationUI(String apiUrl, Executor executor) { - this(apiUrl, executor, OAuthVersion.OAuth10a); - } - - /** - * Constructs a new {@code FullyAutomaticAuthorizationUI} for the given API URL. - * @param apiUrl The OSM API URL - * @param executor the executor used for running the HTTP requests for the authorization * @param oAuthVersion The OAuth version to use for this UI * @since 18991 Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 19320) @@ -48,17 +48,4 @@ private final HtmlPanel pnlMessage = new HtmlPanel(); private final transient Executor executor; - - /** - * Constructs a new {@code ManualAuthorizationUI} for the given API URL. - * @param apiUrl The OSM API URL - * @param executor the executor used for running the HTTP requests for the authorization - * @since 5422 - * @deprecated since 18991, use {@link ManualAuthorizationUI#ManualAuthorizationUI(String, Executor, OAuthVersion)} - * instead. - */ - @Deprecated - public ManualAuthorizationUI(String apiUrl, Executor executor) { - this(apiUrl, executor, OAuthVersion.OAuth10a); - } /** Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 19319) +++ (revision ) @@ -1,16 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.tagging.ac; - -import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem; - -/** - * An auto-completing ComboBox. - * - * @author guilhem.bonnefille@gmail.com - * @since 272 - * @deprecated Use the generic type {@link AutoCompComboBox} instead. Eg. - * {@code AutoCompComboBox} or {@code AutoCompComboBox}. - */ -@Deprecated -public class AutoCompletingComboBox extends AutoCompComboBox { -} Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 19319) +++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 19320) @@ -59,17 +59,4 @@ /** - * Lookup the current OAuth Access Token to access the OSM server. Replies null, if no - * Access Token is currently managed by this CredentialAgent. - * - * @return the current OAuth Access Token to access the OSM server. - * @throws CredentialsAgentException if something goes wrong - * @deprecated since 18991 -- OAuth 1.0 is being removed from the OSM API - */ - @Deprecated - default IOAuthToken lookupOAuthAccessToken() throws CredentialsAgentException { - throw new CredentialsAgentException("Call to deprecated method"); - } - - /** * Lookup the current OAuth Access Token to access the specified server. Replies null, if no * Access Token is currently managed by this CredentialAgent. @@ -82,16 +69,4 @@ @Nullable IOAuthToken lookupOAuthAccessToken(String host) throws CredentialsAgentException; - - /** - * Stores the OAuth Access Token accessToken. - * - * @param accessToken the access Token. null, to remove the Access Token. - * @throws CredentialsAgentException if something goes wrong - * @deprecated since 18991 -- OAuth 1.0 is being removed from the OSM API - */ - @Deprecated - default void storeOAuthAccessToken(IOAuthToken accessToken) throws CredentialsAgentException { - throw new CredentialsAgentException("Call to deprecated method"); - } /**