This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit a2af10bed64f027139293f5baf8f098ec3c503cd Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Oct 1 20:25:02 2025 +0200 Removed unused deprecated methods. --- .../main/org/apache/sis/image/ImageProcessor.java | 75 +----------------- .../main/org/apache/sis/image/package-info.java | 2 +- .../apache/sis/metadata/iso/DefaultMetadata.java | 19 +---- .../iso/extent/DefaultGeographicDescription.java | 41 +--------- .../metadata/iso/extent/DefaultTemporalExtent.java | 46 +---------- .../apache/sis/metadata/iso/extent/Extents.java | 19 +---- .../sis/metadata/iso/extent/package-info.java | 6 +- .../org/apache/sis/metadata/iso/package-info.java | 2 +- .../main/org/apache/sis/geometry/Envelopes.java | 22 +----- .../apache/sis/geometry/GeneralDirectPosition.java | 12 +-- .../main/org/apache/sis/geometry/package-info.java | 2 +- .../org/apache/sis/parameter/TensorParameters.java | 89 ---------------------- .../main/org/apache/sis/referencing/CommonCRS.java | 12 +-- .../sis/referencing/crs/DefaultGeocentricCRS.java | 24 +----- .../sis/referencing/crs/DefaultGeographicCRS.java | 13 +--- .../sis/referencing/crs/DefaultParametricCRS.java | 13 +--- .../sis/referencing/crs/DefaultTemporalCRS.java | 13 +--- .../sis/referencing/crs/DefaultVerticalCRS.java | 13 +--- .../apache/sis/referencing/crs/package-info.java | 2 +- .../sis/referencing/datum/DefaultEllipsoid.java | 15 +--- .../referencing/datum/DefaultGeodeticDatum.java | 2 +- .../sis/referencing/datum/TimeDependentBWP.java | 13 +--- .../apache/sis/referencing/datum/package-info.java | 2 +- .../transform/EllipsoidToCentricTransform.java | 45 +---------- .../operation/transform/package-info.java | 2 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../main/org/apache/sis/util/ArgumentChecks.java | 49 +----------- .../main/org/apache/sis/util/StringBuilders.java | 31 +------- .../main/org/apache/sis/util/package-info.java | 2 +- 29 files changed, 32 insertions(+), 556 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java index fdf2a93ce4..174f50b33d 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java @@ -136,7 +136,7 @@ import org.apache.sis.measure.Units; * * @author Martin Desruisseaux (Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.coverage.grid.GridCoverageProcessor * @@ -168,54 +168,6 @@ public class ImageProcessor implements Cloneable { */ private ImageLayout layout; - /** - * Whether {@code ImageProcessor} can produce an image of different size compared to requested size. - * An image may be resized if the requested size cannot be subdivided into tiles of reasonable size. - * For example if the image width is a prime number, there is no way to divide the image horizontally with - * an integer number of tiles. The only way to get an integer number of tiles is to change the image size. - * - * <p>The image resizing policy may be used by any operation that involve a {@linkplain #resample resampling}. - * If a resizing is applied, the new size will be written in the {@code bounds} argument (a {@link Rectangle}).</p> - * - * @see #getImageResizingPolicy() - * @see #setImageResizingPolicy(Resizing) - * - * @deprecated Replaced by {@link ImageLayout}. - */ - @Deprecated(since="1.5", forRemoval=true) - public enum Resizing { - /** - * Image size is unmodified, the requested value is used unconditionally. - * It may result in big tiles (potentially a single tile for the whole image) - * if the image size is not divisible by a tile size. - * - * @deprecated Replaced by {@link ImageLayout#DEFAULT}. - */ - @Deprecated - NONE(ImageLayout.DEFAULT), - - /** - * Image size can be increased. {@code ImageProcessor} will try to increase - * by the smallest number of pixels allowing the image to be subdivided in tiles. - * - * @deprecated Replaced by {@code ImageLayout.DEFAULT.allowImageBoundsAdjustments(true)}. - */ - @Deprecated - EXPAND(ImageLayout.DEFAULT.allowImageBoundsAdjustments(true)); - - /** - * The layout corresponding to the enumeration value. - */ - public final ImageLayout layout; - - /** - * Creates a new enumeration value for the given size policy. - */ - private Resizing(final ImageLayout layout) { - this.layout = layout; - } - } - /** * Interpolation to use during resample operations. * @@ -417,31 +369,6 @@ public class ImageProcessor implements Cloneable { this.colorizer = colorizer; } - /** - * Returns whether {@code ImageProcessor} can produce an image of different size compared to requested size. - * If this processor can use a different size, the enumeration value specifies what kind of changes may be applied. - * - * @return the image resizing policy. - * - * @deprecated Replaced by {@link #getImageLayout()}. - */ - @Deprecated(since="1.5", forRemoval=true) - public synchronized Resizing getImageResizingPolicy() { - return layout.isImageBoundsAdjustmentAllowed ? Resizing.EXPAND : Resizing.NONE; - } - - /** - * Sets whether {@code ImageProcessor} can produce an image of different size compared to requested size. - * - * @param policy the new image resizing policy. - * - * @deprecated Replaced by {@link #setImageLayout(ImageLayout)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public synchronized void setImageResizingPolicy(final Resizing policy) { - layout = policy.layout; - } - /** * Returns hints about the desired positional accuracy, in "real world" units or in pixel units. * This is an empty array by default, which means that {@code ImageProcessor} aims for the best diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/package-info.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/package-info.java index 638db52c9d..f865d60a57 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/package-info.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/package-info.java @@ -42,7 +42,7 @@ * @author Rémi Maréchal (Geomatys) * @author Martin Desruisseaux (Geomatys) * @author Johann Sorel (Geomatys) - * @version 1.5 + * @version 1.6 * @since 1.0 */ package org.apache.sis.image; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java index 036e392187..1519e96d41 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java @@ -143,7 +143,7 @@ import org.opengis.metadata.citation.Responsibility; * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.storage.Resource#getMetadata() * @@ -348,23 +348,6 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { public DefaultMetadata() { } - /** - * Creates a meta data initialized to the specified values. - * - * @param contact party responsible for the metadata information. - * @param dateStamp date that the metadata was created. - * @param identificationInfo basic information about the resource to which the metadata applies. - * - * @deprecated Replaced by {@link #DefaultMetadata(Responsibility, Temporal, Identification)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultMetadata(final Responsibility contact, - final Date dateStamp, - final Identification identificationInfo) - { - this(contact, TemporalDate.toTemporal(dateStamp), identificationInfo); - } - /** * Creates a meta data initialized to the specified values. * diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java index 4b744cc6bf..d1812b8b08 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java @@ -19,13 +19,10 @@ package org.apache.sis.metadata.iso.extent; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; -import org.opengis.util.InternationalString; import org.opengis.metadata.Identifier; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.extent.GeographicDescription; import org.apache.sis.metadata.iso.DefaultIdentifier; -import org.apache.sis.util.CharSequences; -import org.apache.sis.util.iso.Types; /** @@ -57,7 +54,7 @@ import org.apache.sis.util.iso.Types; * @author Martin Desruisseaux (IRD, Geomatys) * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.3 */ @XmlType(name = "EX_GeographicDescription_Type") @@ -116,42 +113,6 @@ public class DefaultGeographicDescription extends AbstractGeographicExtent imple } } - /** - * Creates an inclusive geographic description initialized to the given natural language description. - * This constructor sets the {@linkplain #getInclusion() inclusion} property to {@code true} and the - * {@linkplain DefaultIdentifier#getCode() identifier code} to one of the following choices: - * - * <ul> - * <li>the given {@code description} string if it is a valid - * {@linkplain CharSequences#isUnicodeIdentifier(CharSequence) Unicode identifier},</li> - * <li>otherwise an {@linkplain CharSequences#camelCaseToAcronym(CharSequence) acronym} - * of the given {@code description}.</li> - * </ul> - * - * @param description the natural language description of the meaning of the code value, or {@code null} if none. - * - * @since 0.6 - * - * @deprecated This constructor applies too arbitrary rules. - */ - @Deprecated(since = "1.5", forRemoval = true) - public DefaultGeographicDescription(final CharSequence description) { - super(true); - if (description != null) { - final var id = new DefaultIdentifier(); - if (CharSequences.isUnicodeIdentifier(description)) { - id.setCode(description.toString()); - if (description instanceof InternationalString) { - id.setDescription((InternationalString) description); - } - } else { - id.setCode(CharSequences.camelCaseToAcronym(description).toString()); - id.setDescription(Types.toInternationalString(description)); - } - geographicIdentifier = id; - } - } - /** * Constructs a new instance initialized with the values from the specified metadata object. * This is a <em>shallow</em> copy constructor, because the other metadata contained in the diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java index 7e6dce5b42..fbe8c3468d 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java @@ -16,7 +16,6 @@ */ package org.apache.sis.metadata.iso.extent; -import java.util.Date; import java.util.Optional; import java.time.Instant; import java.time.temporal.Temporal; @@ -51,7 +50,7 @@ import org.opengis.temporal.Period; * <ul> * <li>{@link #getBeginning()} for fetching the start time from the temporal primitive.</li> * <li>{@link #getEnding()} for fetching the end time from the temporal primitive.</li> - * <li>{@link #setBounds(Date, Date)} for setting the extent from the given start and end time.</li> + * <li>{@link #setBounds(Temporal, Temporal)} for setting the extent from the given start and end time.</li> * <li>{@link #setBounds(Envelope)} for setting the extent from the given envelope.</li> * </ul> * @@ -67,7 +66,7 @@ import org.opengis.temporal.Period; * @author Martin Desruisseaux (IRD, Geomatys) * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.3 */ @XmlType(name = "EX_TemporalExtent_Type") @@ -214,47 +213,6 @@ public class DefaultTemporalExtent extends ISOMetadata implements TemporalExtent return Optional.ofNullable(getBound(extent, false)); } - /** - * The start date and time for the content of the dataset. - * This method tries to infer it from the {@linkplain #getExtent() extent}. - * - * @return the start time, or {@code null} if none. - * - * @deprecated Replaced by {@link #getBeginning()} in order to transition to {@code java.time} API. - */ - @Deprecated(since="1.5", forRemoval=true) - public Date getStartTime() { - return TemporalDate.toDate(getBeginning().orElse(null)); - } - - /** - * Returns the end date and time for the content of the dataset. - * This method tries to infer it from the {@linkplain #getExtent() extent}. - * - * @return the end time, or {@code null} if none. - * - * @deprecated Replaced by {@link #getEnding()} in order to transition to {@code java.time} API. - */ - @Deprecated(since="1.5", forRemoval=true) - public Date getEndTime() { - return TemporalDate.toDate(getEnding().orElse(null)); - } - - /** - * Sets the temporal extent to the specified values. This convenience method creates a temporal - * primitive for the given dates, then invokes {@link #setExtent(TemporalPrimitive)}. - * - * @param startTime the start date and time for the content of the dataset, or {@code null} if none. - * @param endTime the end date and time for the content of the dataset, or {@code null} if none. - * - * @deprecated Replaced by {@link #setBounds(Temporal, Temporal)} in order to transition to {@code java.time} API. - */ - @Deprecated(since="1.5", forRemoval=true) - public void setBounds(final Date startTime, final Date endTime) { - setBounds((startTime == null) ? null : startTime.toInstant(), - (endTime == null) ? null : endTime.toInstant()); - } - /** * Sets the temporal extent to the specified values. This convenience method creates a temporal * primitive for the given dates and/or times, then invokes {@link #setExtent(TemporalPrimitive)}. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java index 82433cdde1..8197f440fd 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java @@ -93,7 +93,7 @@ import org.opengis.coordinate.MismatchedCoordinateMetadataException; * </ul> * * @author Martin Desruisseaux (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.geometry.Envelopes * @@ -523,23 +523,6 @@ public final class Extents extends Static { } */ - /** - * Returns a date in the {@linkplain Extent#getTemporalElements() temporal elements} of the given extent. - * - * @param extent the extent from which to get an instant, or {@code null}. - * @param location 0 for the start time, 1 for the end time, 0.5 for the average time, or the - * coefficient (usually in the [0 … 1] range) for interpolating an instant. - * @return an instant interpolated at the given location, or {@code null} if none. - * - * @since 0.4 - * - * @deprecated Replaced by {@link #getInstant(Extent, ZoneId, double)} in order to transition to {@code java.time} API. - */ - @Deprecated(since="1.5", forRemoval=true) - public static Date getDate(final Extent extent, final double location) { - return TemporalDate.toDate(getInstant(extent, null, location).orElse(null)); - } - /** * Returns an instant in the {@linkplain Extent#getTemporalElements() temporal elements} of the given extent, * or {@code null} if none. First, this method computes the union of all temporal elements. Then this method diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/package-info.java index f54a6c2304..7979f6b913 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/package-info.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/package-info.java @@ -99,8 +99,8 @@ * </li> * <li>{@link org.apache.sis.metadata.iso.extent.DefaultTemporalExtent} * <ul> - * <li>{@link org.apache.sis.metadata.iso.extent.DefaultTemporalExtent#setBounds(java.util.Date, java.util.Date) - * setBounds(Date, Date)} + * <li>{@link org.apache.sis.metadata.iso.extent.DefaultTemporalExtent#setBounds(java.time.temporal.Temporal, java.time.temporal.Temporal) + * setBounds(Temporal, Temporal)} * for setting the temporal element from the start time and end time.</li> * * <li>{@link org.apache.sis.metadata.iso.extent.DefaultTemporalExtent#setBounds(org.opengis.geometry.Envelope) @@ -136,7 +136,7 @@ * @author Cédric Briançon (Geomatys) * @author Guilhem Legal (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.5 + * @version 1.6 * @since 0.3 */ @XmlSchema(location="https://schemas.isotc211.org/19115/-3/gex/1.0/gex.xsd";, diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java index 5f16f09845..4f8dce2813 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/package-info.java @@ -82,7 +82,7 @@ * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.5 + * @version 1.6 * @since 0.3 */ @XmlSchema(location="https://schemas.isotc211.org/19115/-3/mdb/1.0/mdb.xsd";, diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java index 9a6399e643..c7a2b0d39a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java @@ -103,7 +103,7 @@ import static org.apache.sis.util.StringBuilders.trimFractionalPart; * * @author Martin Desruisseaux (IRD, Geomatys) * @author Johann Sorel (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.metadata.iso.extent.Extents * @see CRS @@ -1039,26 +1039,6 @@ poles: for (int i=0; i<dimension; i++) { return results; } - /** - * Transforms potentially many times an envelope using the given math transform. - * If the given envelope is {@code null}, then this method returns an empty array. - * - * @param transform the transform to use. - * @param envelope envelope to transform, or {@code null}. This envelope will not be modified. - * @return the transformed envelopes, or an empty array if {@code envelope} was null. - * @throws TransformException if a transform failed. - * - * @since 1.3 - * - * @deprecated Replaced by {@link #transformWithWraparound(MathTransform, Envelope)}. - */ - @Deprecated(since = "1.5", forRemoval = true) - public static GeneralEnvelope[] wraparound(final MathTransform transform, final Envelope envelope) - throws TransformException - { - return transformWithWraparound(transform, envelope).values().toArray(GeneralEnvelope[]::new); - } - /** * Returns the bounding box of a geometry defined in <i>Well Known Text</i> (WKT) format. * This method does not check the consistency of the provided WKT. For example, it does not check diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralDirectPosition.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralDirectPosition.java index a5d50e42e1..2fa37ecbac 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralDirectPosition.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralDirectPosition.java @@ -51,7 +51,7 @@ import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches; * on the value of the containing object's {@code CoordinateReferenceSystem}. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * * @see DirectPosition1D * @see DirectPosition2D @@ -234,16 +234,6 @@ public class GeneralDirectPosition extends AbstractDirectPosition implements Ser } } - /** - * Sets the coordinate values along all dimensions. - * - * @deprecated Renamed {@link #setCoordinates(double...)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public void setCoordinate(final double... coordinates) throws MismatchedDimensionException { - setCoordinates(coordinates); - } - /** * Returns the coordinate at the specified dimension. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/package-info.java index 5346ed6cfd..fea401bb91 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/package-info.java @@ -87,7 +87,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.3 */ package org.apache.sis.geometry; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java deleted file mode 100644 index 1126f39a9f..0000000000 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sis.parameter; - -import org.opengis.parameter.ParameterDescriptor; - - -/** - * Creates parameter groups for tensors (usually matrices). - * - * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 - * - * @param <E> the type of tensor element values. - * @see org.apache.sis.referencing.operation.matrix.Matrices - * @see <a href="https://issues.apache.org/jira/browse/SIS-619";>SIS-619</a> - * - * @since 0.4 - * - * @deprecated Renamed {@link MatrixParameters} because this is not really a builder of tensors. - * Furthermore, the declared <abbr>EPSG</abbr> parameter names were incorrect. - * See <a href="https://issues.apache.org/jira/browse/SIS-619";>SIS-619</a>. - */ -@Deprecated(since = "1.5", forRemoval = true) -public class TensorParameters<E> extends MatrixParameters<E> { - /** - * Parses and creates matrix parameters with alphanumeric names. - * - * @since 0.6 - * - * @deprecated Replaced by {@link MatrixParameters#ALPHANUM}. - */ - @Deprecated(since = "1.5", forRemoval = true) - public static final TensorParameters<Double> ALPHANUM = new TensorParameters<>(MatrixParameters.ALPHANUM) { - @Override protected ParameterDescriptor<Double> createElementDescriptor(final int[] indices) { - return MatrixParameters.ALPHANUM.createElementDescriptor(indices); - } - }; - - /** - * Parses and creates matrix parameters with names matching the Well Known Text version 1 (WKT 1) convention. - * - * @deprecated Replaced by {@link MatrixParameters#WKT1}. - */ - @Deprecated(since = "1.5", forRemoval = true) - public static final TensorParameters<Double> WKT1 = new TensorParameters<>(MatrixParameters.WKT1); - - TensorParameters(final MatrixParameters<E> other) { - super(other); - } - - /** - * Constructs a descriptors provider. - * - * @param elementType the type of tensor element values. - * @param prefix the prefix to insert in front of parameter name for each tensor elements. - * @param separator the separator between dimension (row, column, …) indices in parameter names. - * @param dimensions the parameter for the size of each dimension, usually in an array of length 2. - * Length may be different if the caller wants to generalize usage of this class to tensors. - */ - @SafeVarargs - public TensorParameters(final Class<E> elementType, final String prefix, final String separator, - final ParameterDescriptor<Integer>... dimensions) - { - super(elementType, prefix, separator, dimensions); - } - - /** - * @deprecated Renamed {@link #order()} because "rank" has a different meaning in linear algebra. - */ - @Deprecated(since = "1.5", forRemoval = true) - public final int rank() { - return order(); - } -} diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java index a462affe0d..ddd75f1fed 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java @@ -146,7 +146,7 @@ import org.opengis.referencing.datum.RealizationMethod; * </table></blockquote> * * @author Martin Desruisseaux (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.factory.CommonAuthorityFactory * @@ -824,16 +824,6 @@ public enum CommonCRS { return cachedSpherical; } - /** - * Returns the datum or datum ensemble associated to this geodetic object. - * - * @deprecated Replaced by {@link #datum(boolean)} for specifying whether to include datum ensembles. - */ - @Deprecated(since="1.5", forRemoval=true) - public GeodeticDatum datum() { - return datum(true); - } - /** * Returns the geodetic reference frame associated to this geodetic object. * The following table summarizes the datums or datum ensembles known to this class, diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java index 1ae98e3ffb..0a8acc7f53 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java @@ -74,7 +74,7 @@ import org.opengis.referencing.datum.DatumEnsemble; * in the javadoc, this condition holds if all components were created using only SIS factories and static constants. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeodeticCRS(String) * @@ -167,28 +167,6 @@ public class DefaultGeocentricCRS extends DefaultGeodeticCRS { checkDimension(2, 3, cs); } - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultGeocentricCRS(final Map<String,?> properties, - final GeodeticDatum datum, - final CartesianCS cs) - { - this(properties, datum, null, cs); - } - - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultGeocentricCRS(final Map<String,?> properties, - final GeodeticDatum datum, - final SphericalCS cs) - { - this(properties, datum, null, cs); - } - /** * Creates a new CRS derived from the specified one, but with different axis order or unit. * This is for implementing the {@link #createSameType(AbstractCS)} method only. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java index ac51cf8840..3a12b1a77c 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java @@ -90,7 +90,7 @@ import org.opengis.metadata.Identifier; * in the javadoc, this condition holds if all components were created using only SIS factories and static constants. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createGeographicCRS(String) * @@ -169,17 +169,6 @@ public class DefaultGeographicCRS extends DefaultGeodeticCRS implements Geograph checkDimension(2, 3, cs); } - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultGeographicCRS(final Map<String,?> properties, - final GeodeticDatum datum, - final EllipsoidalCS cs) - { - this(properties, datum, null, cs); - } - /** * Creates a new CRS derived from the specified one, but with different axis order or unit. * This is for implementing the {@link #createSameType(AbstractCS)} method only. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java index cfa269935c..9ae8775900 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java @@ -51,7 +51,7 @@ import org.apache.sis.referencing.datum.DatumOrEnsemble; * in the javadoc, this condition holds if all components were created using only SIS factories and static constants. * * @author Johann Sorel (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.datum.DefaultParametricDatum * @see org.apache.sis.referencing.cs.DefaultParametricCS @@ -125,17 +125,6 @@ public class DefaultParametricCRS extends AbstractSingleCRS<ParametricDatum> imp checkDimension(1, 1, cs); } - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultParametricCRS(final Map<String,?> properties, - final ParametricDatum datum, - final ParametricCS cs) - { - this(properties, datum, null, cs); - } - /** * Creates a new CRS derived from the specified one, but with different axis order or unit. * This is for implementing the {@link #createSameType(AbstractCS)} method only. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java index 6c90e2b14f..0517e2e43a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java @@ -71,7 +71,7 @@ import org.opengis.referencing.datum.DatumEnsemble; * in the javadoc, this condition holds if all components were created using only SIS factories and static constants. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.datum.DefaultTemporalDatum * @see org.apache.sis.referencing.cs.DefaultTimeCS @@ -163,17 +163,6 @@ public class DefaultTemporalCRS extends AbstractSingleCRS<TemporalDatum> impleme initializeConverter(); } - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultTemporalCRS(final Map<String,?> properties, - final TemporalDatum datum, - final TimeCS cs) - { - this(properties, datum, null, cs); - } - /** * Creates a new CRS derived from the specified one, but with different axis order or unit. * This is for implementing the {@link #createSameType(AbstractCS)} method only. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java index e5ceb2785b..cf2fc0ce42 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultVerticalCRS.java @@ -52,7 +52,7 @@ import org.opengis.referencing.datum.DatumEnsemble; * in the javadoc, this condition holds if all components were created using only SIS factories and static constants. * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.datum.DefaultVerticalDatum * @see org.apache.sis.referencing.cs.DefaultVerticalCS @@ -126,17 +126,6 @@ public class DefaultVerticalCRS extends AbstractSingleCRS<VerticalDatum> impleme checkDimension(1, 1, cs); } - /** - * @deprecated A {@code DatumEnsemble} argument has been added. - */ - @Deprecated(since="1.5", forRemoval=true) - public DefaultVerticalCRS(final Map<String,?> properties, - final VerticalDatum datum, - final VerticalCS cs) - { - this(properties, datum, null, cs); - } - /** * Creates a new CRS derived from the specified one, but with different axis order or unit. * This is for implementing the {@link #createSameType(AbstractCS)} method only. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java index f4dd7163af..3e4dc8636d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/package-info.java @@ -73,7 +73,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Cédric Briançon (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.4 */ @XmlSchema(location = "http://schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd";, diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java index 62db989562..fed5564319 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java @@ -104,7 +104,7 @@ import org.opengis.metadata.Identifier; * * @author Martin Desruisseaux (IRD, Geomatys) * @author Cédric Briançon (Geomatys) - * @version 1.5 + * @version 1.6 * * @see org.apache.sis.referencing.CommonCRS#ellipsoid() * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createEllipsoid(String) @@ -400,19 +400,6 @@ public class DefaultEllipsoid extends AbstractIdentifiedObject implements Ellips return Formulas.geocentricRadius(this, Math.toRadians(φ)); } - /** - * @deprecated Renamed {@link #getGeocentricRadius(double)}. - * - * @param φ latitude in degrees, from -90° to +90° inclusive. - * @return geocentric radius at the given latitude. - * - * @since 1.3 - */ - @Deprecated(since="1.4", forRemoval=true) - public double getRadius(final double φ) { - return getGeocentricRadius(φ); - } - /** * The ratio of the distance between the center and a focus of the ellipse to the length of its semi-major axis. * The eccentricity can alternately be computed from the equation: ℯ = √(2f - f²) where <var>f</var> is the diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java index 5186790a90..3169805fc2 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java @@ -118,7 +118,7 @@ import org.opengis.referencing.datum.DynamicReferenceFrame; * <b>Example:</b> the following code gets a <cite>World Geodetic System 1984</cite> datum: * * {@snippet lang="java" : - * GeodeticDatum datum = CommonCRS.WGS84.datum(); + * GeodeticDatum datum = CommonCRS.WGS84.datum(true); * } * * <h2>Immutability and thread safety</h2> diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java index 239128adce..c4263cf49b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java @@ -16,7 +16,6 @@ */ package org.apache.sis.referencing.datum; -import java.util.Date; import java.util.Objects; import java.time.Duration; import java.time.temporal.Temporal; @@ -60,7 +59,7 @@ import static org.apache.sis.util.ArgumentChecks.*; * </ul> * * @author Martin Desruisseaux (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.4 */ @SuppressWarnings("CloneableImplementsClone") // Fields in this class do not need cloning. @@ -131,16 +130,6 @@ public class TimeDependentBWP extends BursaWolfParameters { this.timeReference = Objects.requireNonNull(timeReference); } - /** - * Creates a new instance for the given target datum, domain of validity and time reference. - * - * @deprecated Replaced by {@link #TimeDependentBWP(GeodeticDatum, Extent, Temporal)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public TimeDependentBWP(final GeodeticDatum targetDatum, final Extent domainOfValidity, final Date timeReference) { - this(targetDatum, domainOfValidity, timeReference.toInstant()); - } - /** * Verifies parameters validity after initialization. */ diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java index 60d6b1245e..9c0893bf7b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/package-info.java @@ -53,7 +53,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Cédric Briançon (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.4 */ @XmlSchema(location = "http://schemas.opengis.net/gml/3.2.1/datums.xsd";, diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java index 224e453643..59434e9254 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java @@ -100,7 +100,7 @@ import static org.apache.sis.referencing.operation.provider.GeocentricAffineBetw * </ul> * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.7 */ public class EllipsoidToCentricTransform extends AbstractMathTransform implements Serializable { @@ -296,25 +296,6 @@ public class EllipsoidToCentricTransform extends AbstractMathTransform implement inverse = new Inverse(); } - /** - * Creates a transform from angles in radians on an ellipsoid having a semi-major axis length of 1. - * - * @param semiMajor the semi-major axis length. - * @param semiMinor the semi-minor axis length. - * @param unit the unit of measurement for the semi-axes and the ellipsoidal height. - * @param withHeight {@code true} if source geographic coordinates include an ellipsoidal height - * (i.e. are 3-D), or {@code false} if they are only 2-D. - * @param csType whether the target coordinate system shall be Cartesian or spherical. - * - * @deprecated Replaced by {@link #EllipsoidToCentricTransform(Ellipsoid, boolean, TargetType)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public EllipsoidToCentricTransform(final double semiMajor, final double semiMinor, - final Unit<Length> unit, final boolean withHeight, final TargetType csType) - { - this(DefaultEllipsoid.createEllipsoid(Map.of(Ellipsoid.NAME_KEY, "source"), semiMajor, semiMinor, unit), withHeight, csType); - } - /** * Creates a transform from angles in radians on an ellipsoid having a semi-major axis length of 1. * While a full ellipsoid is specified to this constructor, only the ratio of axis lengths is used. @@ -420,30 +401,6 @@ public class EllipsoidToCentricTransform extends AbstractMathTransform implement inverse = new Inverse(); } - /** - * Creates a transform from geographic to geocentric coordinates. - * - * @param factory the factory to use for creating and concatenating the affine transforms. - * @param semiMajor the semi-major axis length. - * @param semiMinor the semi-minor axis length. - * @param unit the unit of measurement for the semi-axes and the ellipsoidal height. - * @param withHeight {@code true} if source geographic coordinates include an ellipsoidal height - * (i.e. are 3-D), or {@code false} if they are only 2-D. - * @param csType whether the target coordinate system shall be Cartesian or spherical. - * @return the conversion from geographic to geocentric coordinates. - * @throws FactoryException if an error occurred while creating a transform. - * - * @deprecated Replaced by {@link #createGeodeticConversion(MathTransformFactory, Ellipsoid, boolean, TargetType)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public static MathTransform createGeodeticConversion(final MathTransformFactory factory, - final double semiMajor, final double semiMinor, final Unit<Length> unit, - final boolean withHeight, final TargetType csType) throws FactoryException - { - var source = DefaultEllipsoid.createEllipsoid(Map.of(Ellipsoid.NAME_KEY, "source"), semiMajor, semiMinor, unit); - return createGeodeticConversion(factory, source, withHeight, csType); - } - /** * Creates a transform from geographic to geocentric coordinates. This factory method combines the * {@code EllipsoidToCentricTransform} instance with the steps needed for converting degrees to diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/package-info.java index a04776ec81..1b9d3a0e6b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/package-info.java @@ -61,7 +61,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Adrian Custer (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.5 */ package org.apache.sis.referencing.operation.transform; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java index 9a6d4d94ae..0b45e41295 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/package-info.java @@ -94,7 +94,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @author Guilhem Legal (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.4 */ @XmlSchema(location = "http://schemas.opengis.net/gml/3.2.1/referenceSystems.xsd";, diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java index 2b67e041b4..a7515d675b 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java @@ -83,7 +83,7 @@ import org.opengis.coverage.grid.GridEnvelope; * * @author Martin Desruisseaux (Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.3 */ public final class ArgumentChecks extends Static { @@ -337,53 +337,6 @@ public final class ArgumentChecks extends Static { } } - /** - * Ensures that the given index is equal or greater than zero and lower than the given - * upper value. This method is designed for methods that expect an index value as the only - * argument. For this reason, this method does not take the argument name. - * - * @param upper the maximal index value, exclusive. - * @param index the index to check. - * @throws IndexOutOfBoundsException if the given index is negative or not lower than the given upper value. - * - * @see #ensurePositive(String, int) - * - * @deprecated As of Java 9, replaced by {@link Objects#checkIndex(int, int)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public static void ensureValidIndex(final int upper, final int index) throws IndexOutOfBoundsException { - if (index < 0 || index >= upper) { - throw new IndexOutOfBoundsException(Errors.format(Errors.Keys.IndexOutOfBounds_1, index)); - } - } - - /** - * Ensures that the given index range is valid for a sequence of the given length. - * This method is designed for methods that expect an index range as their only arguments. - * For this reason, this method does not take argument names. - * - * <p>This method verifies only the {@code lower} and {@code upper} argument values. - * It does not <strong>not</strong> verify the validity of the {@code length} argument, - * because this information is assumed to be provided by the implementation rather than - * the user.</p> - * - * @param length the length of the sequence (array, {@link CharSequence}, <i>etc.</i>). - * @param lower the user-specified lower index, inclusive. - * @param upper the user-specified upper index, exclusive. - * @throws IndexOutOfBoundsException if the given [{@code lower} … {@code upper}] - * range is out of the sequence index range. - * - * @see #ensureCountBetween(String, boolean, int, int, int) - * - * @deprecated As of Java 9, replaced by {@link Objects#checkFromToIndex(int, int, int)}. - */ - @Deprecated(since="1.5", forRemoval=true) - public static void ensureValidIndexRange(final int length, final int lower, final int upper) throws IndexOutOfBoundsException { - if (lower < 0 || upper < lower || upper > length) { - throw new IndexOutOfBoundsException(Errors.format(Errors.Keys.IllegalRange_2, lower, upper)); - } - } - /** * Ensures that the given integer value is greater than or equals to zero. * This method is used for checking values that are <strong>not</strong> index. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java index 5d38dfecc8..1edc5310f2 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/StringBuilders.java @@ -34,13 +34,13 @@ import org.apache.sis.util.resources.Errors; * the <i>Basic Multilingual Plane</i> (BMP). * * @author Martin Desruisseaux (Geomatys) - * @version 1.5 + * @version 1.6 * * @see CharSequences * * @since 0.3 */ -public final class StringBuilders extends Static { +public final class StringBuilders { /** * Letters in the range 00C0 (192) to 00FF (255) inclusive with their accent removed, when possible. * This string partially duplicates the work done by {@link Normalizer} with additional replacements. @@ -181,33 +181,6 @@ public final class StringBuilders extends Static { } } - /** - * Appends the given character <var>n</var> times. - * This method does nothing if the given {@code count} is zero. - * - * @param buffer the buffer where to append the character. - * @param c the character to repeat. - * @param count number of times to repeat the given character. - * @throws NullPointerException if the given buffer is null. - * @throws IllegalArgumentException if the given count is negative. - * - * @since 1.0 - * - * @deprecated Replaced by {@link StringBuilder#repeat(int, int)} since Java 21. - */ - @Deprecated(since="1.5", forRemoval=true) - public static void repeat(final StringBuilder buffer, final char c, final int count) { - switch (count) { - case 0: break; - case 1: buffer.append(c); break; - default: { - ArgumentChecks.ensurePositive("count", count); - buffer.append(c == ' ' ? CharSequences.spaces(count) : new Repeat(c, count)); - break; - } - } - } - /** * Inserts the given character <var>n</var> times at the given position. * This method does nothing if the given {@code count} is zero. diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/package-info.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/package-info.java index 8308c4f084..6e89e547aa 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/package-info.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/package-info.java @@ -39,7 +39,7 @@ * * @author Martin Desruisseaux (Geomatys) * @author Alexis Manin (Geomatys) - * @version 1.5 + * @version 1.6 * @since 0.3 */ package org.apache.sis.util;
