You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/09/24 20:15:31 UTC
[sis] branch geoapi-4.0 updated (7c107c57ee -> 6f65c2bacd)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from 7c107c57ee Move the check for perpendicular axes in the parent class. This is in anticipation for the addition of experimental coordinate systems such as `MinkowskiCS` in other branches.
new 1448606ef8 Spelling and documentation fixes.
new 200ed9511a Deprecate for removal `NullArgumentException`.
new 6f65c2bacd Remove the boolean return value in WritableFeatureSet.removeIf(Predicate)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/ImageRenderer.java | 7 +-
.../apache/sis/feature/builder/TypeBuilder.java | 4 +-
.../apache/sis/geometry/wrapper/Geometries.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 12 +-
.../main/org/apache/sis/image/ComputedImage.java | 2 +-
.../iso/DefaultApplicationSchemaInformation.java | 2 +-
.../apache/sis/metadata/iso/DefaultIdentifier.java | 2 +-
.../org/apache/sis/xml/TransformingWriter.java | 2 +-
.../main/org/apache/sis/xml/XML.java | 6 +-
.../sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
.../org/apache/sis/portrayal/CanvasFollower.java | 3 +-
.../main/org/apache/sis/style/se1/Graphic.java | 2 +-
.../org/apache/sis/style/se1/PointPlacement.java | 2 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 2 +-
.../main/org/apache/sis/geometry/Envelopes.java | 2 +-
.../main/org/apache/sis/geometry/Shapes2D.java | 2 +-
.../main/org/apache/sis/io/wkt/Formatter.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 2 +-
.../sis/referencing/cs/CoordinateSystems.java | 3 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../operation/builder/LocalizationGridBuilder.java | 4 +-
.../sis/referencing/operation/provider/NTv2.java | 6 +-
.../apache/sis/referencing/util/j2d/Bezier.java | 4 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 2 +-
.../operation/provider/MapProjectionTest.java | 2 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../org/apache/sis/storage/geotiff/GeoTIFF.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 2 +-
.../org/apache/sis/storage/geotiff/Reader.java | 4 +-
.../sis/storage/geotiff/internal/Compression.java | 2 +-
.../sis/storage/geotiff/SelfConsistencyTest.java | 2 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Grid.java | 3 +-
.../sis/storage/netcdf/base/FeatureSetTest.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../sis/storage/sql/postgis/ObjectGetter.java | 2 +-
.../org/apache/sis/storage/gpx/WritableStore.java | 7 +-
.../sis/storage/xml/stream/RewriteOnUpdate.java | 22 +--
.../org/apache/sis/storage/gpx/UpdaterTest.java | 4 +-
.../apache/sis/io/stream/ChannelDataOutput.java | 2 +-
.../sis/storage/DataStoreContentException.java | 2 +-
.../org/apache/sis/storage/WritableFeatureSet.java | 14 +-
.../main/org/apache/sis/storage/base/CodeType.java | 4 +-
.../apache/sis/storage/base/MetadataBuilder.java | 2 +-
.../apache/sis/storage/base/TiledGridResource.java | 2 +-
.../sis/storage/csv/MovingFeatureBuilder.java | 4 +-
.../sis/storage/image/WorldFileResource.java | 2 +-
.../storage/internal/WritableResourceSupport.java | 2 +-
.../main/org/apache/sis/measure/Units.java | 2 +-
.../main/org/apache/sis/util/ArraysExt.java | 172 ++++++++-------------
.../main/org/apache/sis/util/CharSequences.java | 4 +-
.../org/apache/sis/util/NullArgumentException.java | 8 +
.../main/org/apache/sis/util/StringBuilders.java | 10 +-
.../apache/sis/util/collection/TreeNodeList.java | 2 +-
.../apache/sis/util/collection/WeakHashSet.java | 5 +-
.../sis/util/collection/WeakValueHashMap.java | 8 +-
.../test/org/apache/sis/test/TestRunner.java | 2 +-
.../sis/gui/coverage/StyledRenderingData.java | 2 +-
66 files changed, 167 insertions(+), 237 deletions(-)
[sis] 01/03: Spelling and documentation fixes.
Posted by de...@apache.org.
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 1448606ef86a0495409b474d8f14a0d9f5703b43
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Sep 16 20:50:16 2023 +0200
Spelling and documentation fixes.
---
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../main/org/apache/sis/geometry/wrapper/Geometries.java | 2 +-
.../main/org/apache/sis/image/BandedSampleConverter.java | 12 ++++++------
.../main/org/apache/sis/image/ComputedImage.java | 2 +-
.../metadata/iso/DefaultApplicationSchemaInformation.java | 2 +-
.../main/org/apache/sis/metadata/iso/DefaultIdentifier.java | 2 +-
.../main/org/apache/sis/xml/TransformingWriter.java | 2 +-
.../org.apache.sis.metadata/main/org/apache/sis/xml/XML.java | 6 +++---
.../org/apache/sis/metadata/iso/citation/CitationsTest.java | 2 +-
.../sis/metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../test/org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/xml/AnnotationConsistencyCheck.java | 2 +-
.../main/org/apache/sis/style/se1/Graphic.java | 2 +-
.../main/org/apache/sis/style/se1/PointPlacement.java | 2 +-
.../referencing/gazetteer/MilitaryGridReferenceSystem.java | 2 +-
.../main/org/apache/sis/geometry/Envelopes.java | 2 +-
.../main/org/apache/sis/geometry/Shapes2D.java | 2 +-
.../main/org/apache/sis/io/wkt/Formatter.java | 2 +-
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 2 +-
.../referencing/operation/CoordinateOperationRegistry.java | 2 +-
.../operation/builder/LocalizationGridBuilder.java | 4 ++--
.../org/apache/sis/referencing/operation/provider/NTv2.java | 6 +++---
.../main/org/apache/sis/referencing/util/j2d/Bezier.java | 4 ++--
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../referencing/operation/CoordinateOperationFinderTest.java | 2 +-
.../referencing/operation/provider/MapProjectionTest.java | 2 +-
.../main/org/apache/sis/storage/geotiff/GeoTIFF.java | 2 +-
.../main/org/apache/sis/storage/geotiff/NativeMetadata.java | 2 +-
.../main/org/apache/sis/storage/geotiff/Reader.java | 4 ++--
.../org/apache/sis/storage/geotiff/internal/Compression.java | 2 +-
.../org/apache/sis/storage/geotiff/SelfConsistencyTest.java | 2 +-
.../org/apache/sis/storage/netcdf/base/FeatureSetTest.java | 2 +-
.../org/apache/sis/storage/sql/postgis/ObjectGetter.java | 2 +-
.../main/org/apache/sis/io/stream/ChannelDataOutput.java | 2 +-
.../org/apache/sis/storage/DataStoreContentException.java | 2 +-
.../main/org/apache/sis/storage/base/CodeType.java | 4 ++--
.../main/org/apache/sis/storage/base/MetadataBuilder.java | 2 +-
.../main/org/apache/sis/storage/base/TiledGridResource.java | 2 +-
.../org/apache/sis/storage/csv/MovingFeatureBuilder.java | 4 ++--
.../main/org/apache/sis/storage/image/WorldFileResource.java | 2 +-
.../apache/sis/storage/internal/WritableResourceSupport.java | 2 +-
.../main/org/apache/sis/measure/Units.java | 2 +-
.../main/org/apache/sis/util/collection/TreeNodeList.java | 2 +-
.../test/org/apache/sis/test/TestRunner.java | 2 +-
.../org/apache/sis/gui/coverage/StyledRenderingData.java | 2 +-
46 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
index d4423df9ad..22e812b063 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
@@ -331,7 +331,7 @@ abstract class CommandRunner {
/**
* Shows the help instructions for a specific command. This method is invoked instead of {@link #run()}
- * if the the user provided the {@code --help} option. The default implementation builds a description
+ * if the user provided the {@code --help} option. The default implementation builds a description
* from the texts associated to the given {@code resourceKey} in various resource bundles provided in
* this {@code org.apache.sis.console} module. Subclasses can override if needed.
*
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
index 0335f9a5b9..08cf842bad 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
@@ -277,7 +277,7 @@ public abstract class Geometries<G> implements Serializable {
*
* @param geometry the geometry instance to wrap (can be {@code null}).
* @return a wrapper for the given geometry implementation, or {@code null} if the given object was null.
- * @throws ClassCastException if the the given object is not a wrapper or a geometry object
+ * @throws ClassCastException if the given object is not a wrapper or a geometry object
* of the implementation of the library identified by {@link #library}.
*
* @see #wrap(Object)
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
index 038a846974..72974b3063 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
@@ -318,7 +318,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the width (in pixels) of this image.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the width (number of columns) of this image.
*/
@@ -329,7 +329,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the height (in pixels) of this image.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the height (number of rows) of this image.
*/
@@ -340,7 +340,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the minimum <var>x</var> coordinate (inclusive) of this image.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the minimum <var>x</var> coordinate (column) of this image.
*/
@@ -351,7 +351,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the minimum <var>y</var> coordinate (inclusive) of this image.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the minimum <var>y</var> coordinate (row) of this image.
*/
@@ -362,7 +362,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the minimum tile index in the <var>x</var> direction.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the minimum tile index in the <var>x</var> direction.
*/
@@ -373,7 +373,7 @@ class BandedSampleConverter extends WritableComputedImage {
/**
* Returns the minimum tile index in the <var>y</var> direction.
- * This is the the same value than the source image (not necessarily zero).
+ * This is the same value than the source image (not necessarily zero).
*
* @return the minimum tile index in the <var>y</var> direction.
*/
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
index 55b763e4f6..423be3a371 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
@@ -773,7 +773,7 @@ public abstract class ComputedImage extends PlanarImage implements Disposable {
/**
* Clears the error status of all tiles in the given range of indices.
- * Those tiles will be marked as dirty and recomputed next time the the
+ * Those tiles will be marked as dirty and recomputed next time the
* {@link #getTile(int, int)} method is invoked.
* The status of valid tiles is unchanged by this method call.
*
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
index 7dcf937256..ae2b2a4235 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
@@ -122,7 +122,7 @@ public class DefaultApplicationSchemaInformation extends ISOMetadata implements
* Creates a application schema information initialized to the specified values.
*
* @param name the name of the application schema used.
- * @param schemaLanguage the the identification of the schema language used.
+ * @param schemaLanguage the identification of the schema language used.
* @param constraintLanguage the formal language used in application schema.
*/
public DefaultApplicationSchemaInformation(final Citation name,
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
index 32bcaa6095..ad11bc08d7 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultIdentifier.java
@@ -194,7 +194,7 @@ public class DefaultIdentifier extends ISOMetadata implements Identifier {
* {@linkplain org.apache.sis.util.CharSequences#isUnicodeIdentifier(CharSequence) unicode identifier}.</li>
* </ol>
*
- * @param authority the the person or party responsible for maintenance of the namespace, or {@code null} if none.
+ * @param authority the person or party responsible for maintenance of the namespace, or {@code null} if none.
* @param code the alphanumeric value identifying an instance in the namespace, or {@code null} if none.
*
* @see org.apache.sis.metadata.iso.citation.Citations#toCodeSpace(Citation)
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
index d38dfbe18a..c09ebd33bf 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
@@ -187,7 +187,7 @@ final class TransformingWriter extends Transformer implements XMLEventWriter {
private Set<QName> toSkip;
/**
- * Name of the the root element of a sub-tree to handle in a special way, or {@code null} if none.
+ * Name of the root element of a sub-tree to handle in a special way, or {@code null} if none.
* At first, this is the name of the {@link StartElement} of a sub-tree to defer (i.e. one of the
* keys in the {@link #ELEMENTS_TO_REORDER} map). Later, it becomes the names of sub-trees to skip
* (i.e. the {@link #toSkip} values).
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
index 0e68b29b8c..d78b12e049 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
@@ -498,7 +498,7 @@ public final class XML extends Static {
* The destination is specified by the {@code output} argument implementation, for example
* {@link javax.xml.transform.stream.StreamResult} for writing to a file or output stream.
* The optional {@code properties} map can contain any key documented in this {@code XML} class,
- * together with the keys documented in the <cite>supported properties</cite> section of the the
+ * together with the keys documented in the <cite>supported properties</cite> section of the
* {@link Marshaller} class.
*
* @param object the root of content tree to be marshalled.
@@ -631,7 +631,7 @@ public final class XML extends Static {
* The source is specified by the {@code input} argument implementation, for example
* {@link javax.xml.transform.stream.StreamSource} for reading from a file or input stream.
* The optional {@code properties} map can contain any key documented in this {@code XML} class,
- * together with the keys documented in the <cite>supported properties</cite> section of the the
+ * together with the keys documented in the <cite>supported properties</cite> section of the
* {@link Unmarshaller} class.
*
* @param input the file from which to read a XML representation.
@@ -673,7 +673,7 @@ public final class XML extends Static {
* The source is specified by the {@code input} argument implementation, for example
* {@link javax.xml.transform.stream.StreamSource} for reading from a file or input stream.
* The optional {@code properties} map can contain any key documented in this {@code XML} class,
- * together with the keys documented in the <cite>supported properties</cite> section of the the
+ * together with the keys documented in the <cite>supported properties</cite> section of the
* {@link Unmarshaller} class.
*
* @param <T> compile-time value of the {@code declaredType} argument.
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
index 461e17aacc..5229338792 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -183,7 +183,7 @@ public final class CitationsTest extends TestCase {
assertNull("Shall not be taken as a valid identifier.",
Citations.toCodeSpace(new SimpleCitation("Proj.4")));
- assertEquals("Shall fallback on the the identifier space name.",
+ assertEquals("Shall fallback on the identifier space name.",
"TheProj4Space", Citations.toCodeSpace(new Proj4()));
}
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index addd5cd959..e5a0cc1e7d 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -116,7 +116,7 @@ public final class DefaultCitationTest extends TestUsingFile {
final IdentifierMap identifierMap = citation.getIdentifierMap();
assertTrue("Expected an initially empty set of identifiers.", identifiers.isEmpty());
/*
- * Set the ISBN code, and ensure that the the ISBN is reflected in the identifier map.
+ * Set the ISBN code, and ensure that the ISBN is reflected in the identifier map.
*/
citation.setISBN("MyISBN");
assertEquals("MyISBN", citation.getISBN());
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
index 6ef8f9cc2b..8986c4a477 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
@@ -24,7 +24,7 @@ import org.apache.sis.util.Version;
/**
* Base class of tests which contain some XML (un)marshalling of metadata as ISO 19115-3 compliant documents.
- * Tests use the the files provided in the {@code "2007/"} or {@code "2016/"} sub-directories, depending on
+ * Tests use the files provided in the {@code "2007/"} or {@code "2016/"} sub-directories, depending on
* whether ISO 19139:2007 or ISO 19115-3:2016 schema is used.
*
* @author Martin Desruisseaux (Geomatys)
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
index 1a31a0ae4a..6b40a74a76 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
@@ -452,7 +452,7 @@ public abstract class AnnotationConsistencyCheck extends TestCase {
assertNotNull("Missing namespace.", namespace);
assertFalse("Missing namespace.", namespace.trim().isEmpty());
/*
- * Get the namespace declared at the package level, and ensure the the
+ * Get the namespace declared at the package level, and ensure the
* given namespace is not redundant with that package-level namespace.
*/
final XmlSchema schema = impl.getPackage().getAnnotation(XmlSchema.class);
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Graphic.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Graphic.java
index 4d4654f128..5d14c627ee 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Graphic.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Graphic.java
@@ -258,7 +258,7 @@ public class Graphic<R> extends StyleElement<R> implements Translucent<R> {
/**
* Returns the location inside of a graphic to use for anchoring the graphic to the main-geometry point.
* The coordinates are given as (<var>x</var>,<var>y</var>) floating-point numbers
- * relative the the graphic bounding box, where (0,0) is the lower-left corner and
+ * relative the graphic bounding box, where (0,0) is the lower-left corner and
* (1,1) is the upper-right corner.
*
* <p>The returned object is <em>live</em>:
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/PointPlacement.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/PointPlacement.java
index d81bb30bd0..11b20a42c1 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/PointPlacement.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/PointPlacement.java
@@ -103,7 +103,7 @@ public class PointPlacement<R> extends LabelPlacement<R> {
/**
* Returns the location inside of a label to use for anchoring the label to the point.
* The coordinates are given as (<var>x</var>,<var>y</var>) floating-point numbers
- * relative the the label bounding box, where (0,0) is the lower-left corner and
+ * relative the label bounding box, where (0,0) is the lower-left corner and
* (1,1) is the upper-right corner.
*
* <p>The returned object is <em>live</em>:
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 723f16d979..56bba0d986 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -1752,7 +1752,7 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers {
/**
* Returns the given character as a {@code char} if it is a letter, or throws an exception otherwise.
- * The exception should never happen, unless the the encoder is used for a planet larger than Earth
+ * The exception should never happen, unless the encoder is used for a planet larger than Earth
* for which we do not have enough letters.
*/
private static char letter(final int c) throws GazetteerException {
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 316a613e7b..c86215ca2c 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
@@ -720,7 +720,7 @@ nextPoint: for (int pointIndex = 0;;) { // Break condition at th
*
* Example: If the transformed envelope above is (80 … 85°S, 10 … 50°W), and if the
* latitude in the target CRS is bounded at 90°S, then project (90°S, 30°W)
- * to the source CRS. Note that the longitude is set to the the center of
+ * to the source CRS. Note that the longitude is set to the center of
* the envelope longitude range (more on this below).
*
* 2) If the singularity point computed above is inside the source envelope,
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
index 940837ba20..f3aa671a85 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Shapes2D.java
@@ -329,7 +329,7 @@ public final class Shapes2D extends Static {
* At this point we found the extremum of the projected line segment
* using a cubic curve t = A + Bs + Cs² + Ds³ approximation. Before
* to add those extremum into the projected bounding box, we need to
- * ensure that the source coordinate is inside the the original
+ * ensure that the source coordinate is inside the original
* (unprojected) bounding box.
*/
boolean isP2 = false;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 3431b25267..7da0b28d40 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -311,7 +311,7 @@ public class Formatter implements Localized {
/**
* Indices where to insert additional margin, or {@code null} if none. The margin to insert will be
- * the the width of the keyword (e.g. {@code "BOX"}), which is usually unknown to {@code Formatter}
+ * the width of the keyword (e.g. {@code "BOX"}), which is usually unknown to {@code Formatter}
* until {@link FormattableObject} finished to write the element. This field is usually {@code null},
* unless formatting geometries.
*/
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 7f0ed9121b..b0a37810d1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -1317,7 +1317,7 @@ class GeodeticObjectParser extends MathTransformParser implements Comparator<Coo
*
* Note that in WKT 2, this element is wrapped inside a {@code Conversion} or {@code DerivingConversion}
* element which is itself inside the {@code ProjectedCRS} element. This is different than WKT 1, which
- * puts this element right into the the {@code ProjectedCRS} element without {@code Conversion} wrapper.
+ * puts this element right into the {@code ProjectedCRS} element without {@code Conversion} wrapper.
*
* @param mode {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
* @param parent the parent element.
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 0ae6a621a3..985b52f159 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
@@ -2046,7 +2046,7 @@ public enum CommonCRS {
message = Exceptions.formatChainedMessages(null, message, e);
final LogRecord record = new LogRecord(Level.WARNING, message);
if (!(e instanceof UnavailableFactoryException) || AuthorityFactories.failure((UnavailableFactoryException) e)) {
- // Append the stack trace only if the exception is the the one we expect when the factory is not available.
+ // Append the stack trace only if the exception is the one we expect when the factory is not available.
record.setThrown(e);
}
Logging.completeAndLog(AuthorityFactories.LOGGER, caller.getClass(), method, record);
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index f7f569b535..c7c43d797f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@ -389,7 +389,7 @@ class CoordinateOperationRegistry {
* Returns the horizontal component to search in the database, or {@code null} if no search should be done.
* This method returns {@code null} if the horizontal component is not different then the given CRS,
* in which case searching that CRS in the database would be redundant with previous searches.
- * It also returns {@code null} if the CRS is a compound CRS, in which case the the separation
+ * It also returns {@code null} if the CRS is a compound CRS, in which case the separation
* in single CRS should be done by the {@link CoordinateOperationFinder} subclass.
*/
static SingleCRS horizontal(final CoordinateReferenceSystem crs) {
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
index 5af4440acf..b34ebb9c34 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
@@ -418,7 +418,7 @@ public class LocalizationGridBuilder extends TransformBuilder {
* <li>transformed by the inverse of {@linkplain #getSourceToGrid() source to grid} transform.</li>
* </ol>
*
- * @param fullArea whether the the envelope shall encompass the full cell surfaces instead of only their centers.
+ * @param fullArea whether the envelope shall encompass the full cell surfaces instead of only their centers.
* @return the envelope of grid points, from lower corner to upper corner.
* @throws IllegalStateException if the grid points are not yet known.
* @throws TransformException if the envelope cannot be calculated.
@@ -549,7 +549,7 @@ public class LocalizationGridBuilder extends TransformBuilder {
* <h4>Example</h4>
* for a grid of (<var>longitude</var>, <var>latitude</var>) values in decimal degrees where longitude values
* vary (increase or decrease) with increasing column indices and latitude values vary (increase or decrease)
- * with increasing row indices, the the following method should be invoked for protecting the grid against
+ * with increasing row indices, the following method should be invoked for protecting the grid against
* discontinuities on anti-meridian:
*
* {@snippet lang="java" :
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
index 59153e4622..f3adcb2423 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
@@ -223,7 +223,7 @@ public final class NTv2 extends AbstractProvider {
private enum DataType {STRING, INTEGER, DOUBLE};
/**
- * Some known keywords that may appear in NTv2 header records, associated the the expected type of values.
+ * Some known keywords that may appear in NTv2 header records, associated the expected type of values.
* The type is not encoded in a NTv2 file; it has to be hard-coded in this table. The first 11 entries in
* this map (ignoring entries marked by "NTv1") are typically found in overview header, and the remaining
* entries in the sub-grid headers.
@@ -418,7 +418,7 @@ public final class NTv2 extends AbstractProvider {
if (key.equals(numkey) || key.equals("HEADER")) {
/*
* HEADER (NTv1), NUM_OREC (NTv2) or NUM_SREC specify the number of records expected
- * in the header, which may the the header that we are reading right now. If value
+ * in the header, which may the header that we are reading right now. If value
* applies to the reader we are reading, we need to update `numRecords` on the fly.
*/
numRecords = n;
@@ -624,7 +624,7 @@ public final class NTv2 extends AbstractProvider {
}
/**
- * Returns the value for the given key, or thrown an exception if the value is not found.
+ * Returns the value for the given key, or throws an exception if the value is not found.
* Before to fail if the key is not found, this method searches for a value associated to
* an alternative name. That alternative should be the name used in legacy NTv1.
*
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Bezier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Bezier.java
index a3de4bb33b..c7956d13f3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Bezier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/Bezier.java
@@ -180,8 +180,8 @@ public abstract class Bezier {
* @param tmax <var>t</var> value of the end point (initially 1).
* @param x2 <var>x</var> coordinate at <var>t</var>=½ (mid-point).
* @param y2 <var>y</var> coordinate at <var>t</var>=½ (mid-point).
- * @param dx2 <var>x</var> component of the the derivative (∂y/∂x) at mid-point.
- * @param dy2 <var>y</var> component of the the derivative (∂y/∂x) at mid-point.
+ * @param dx2 <var>x</var> component of the derivative (∂y/∂x) at mid-point.
+ * @param dy2 <var>y</var> component of the derivative (∂y/∂x) at mid-point.
* @param x4 <var>x</var> coordinate at <var>t</var>=1 (end point).
* @param y4 <var>y</var> coordinate at <var>t</var>=1 (end point).
* @param dx4 <var>x</var> component of the derivative (∂y/∂x) at end point.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
index 891babf259..b2ae9b6e07 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
@@ -344,7 +344,7 @@ public final class WKTFormatTest extends TestCase {
" AXIS[“Northing”, NORTH]]",
format.format(crs));
/*
- * Formats using GeoTiff identifiers. We should get different strings in PROJECTION[...]
+ * Formats using GeoTIFF identifiers. We should get different strings in PROJECTION[...]
* and PARAMETER[...] elements, but the other ones (especially DATUM[...]) are unchanged.
*/
format.setNameAuthority(Citations.GEOTIFF);
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index 9ff449ef42..e4843b6bd5 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -494,7 +494,7 @@ public final class CoordinateOperationFinderTest extends MathTransformTestCase {
/**
* Tests a datum shift applied as a position vector transformation in geocentric domain.
- * This test does not use the the EPSG geodetic dataset.
+ * This test does not use the EPSG geodetic dataset.
*
* @throws ParseException if a CRS used in this test cannot be parsed.
* @throws FactoryException if the operation cannot be created.
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
index de05366144..3136586f29 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
@@ -146,7 +146,7 @@ public final class MapProjectionTest extends TestCase {
}
/**
- * Asserts the the given parameter forces its value to zero.
+ * Asserts the given parameter forces its value to zero.
* This test is mostly for {@link Equirectangular#LATITUDE_OF_ORIGIN}.
*/
private static void assertIsForcedToZero(final ParameterDescriptor<?> parameter) {
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
index 7f289e6418..bbda390177 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTIFF.java
@@ -56,7 +56,7 @@ abstract class GeoTIFF implements Closeable {
static final short BIG_ENDIAN = 0x4D4D, LITTLE_ENDIAN = 0x4949;
/**
- * The magic number for classic (32 bits) or big TIFF files.
+ * The magic number for classic (32 bits) or big TIFF (64 bits) files.
*/
static final short CLASSIC = 42, BIG_TIFF= 43;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
index 7d273f79a9..63dd857e83 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/NativeMetadata.java
@@ -234,7 +234,7 @@ final class NativeMetadata extends GeoKeysLoader {
/**
* Reads the {@code short}, {@code int} or {@code long} value (depending if the
- * file is standard of big TIFF) at the current {@linkplain Reader#input} position.
+ * file is standard or big TIFF) at the current {@linkplain Reader#input} position.
*/
private long readInt(final boolean isShort) throws IOException {
if (isClassic) {
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
index 02affe288a..64aabf9ff0 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Reader.java
@@ -203,7 +203,7 @@ final class Reader extends GeoTIFF {
/**
* Reads the {@code int} or {@code long} value (depending if the file is
- * a standard of big TIFF) at the current {@linkplain #input} position.
+ * a standard or big TIFF) at the current {@linkplain #input} position.
*
* @return the next pointer value.
*/
@@ -220,7 +220,7 @@ final class Reader extends GeoTIFF {
/**
* Reads the {@code short} or {@code long} value (depending if the file is
- * standard of big TIFF) at the current {@linkplain #input} position.
+ * standard or big TIFF) at the current {@linkplain #input} position.
*
* @return the next directory entry value.
*/
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
index 9326d9c0df..b6b71bea55 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/internal/Compression.java
@@ -77,7 +77,7 @@ public enum Compression {
/**
* Deflate compression, like ZIP format. This is sometimes named {@code "ADOBE_DEFLATE"},
- * withe the {@code "DEFLATE"} name used for another compression method with code 32946.
+ * with the {@code "DEFLATE"} name used for another compression method with code 32946.
* <ul>
* <li>Name in WCS query: "Deflate"</li>
* <li>Name in WCS response: "Deflate"</li>
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
index 426ad766f6..9896074fe2 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
@@ -101,7 +101,7 @@ public final class SelfConsistencyTest extends CoverageReadConsistency {
assertFalse(datasets.isEmpty());
for (GridCoverageResource dataset : datasets) {
final GenericName name = dataset.getIdentifier()
- .orElseThrow(() -> new AssertionError("A component of the GeoTiff datastore is unnamed"));
+ .orElseThrow(() -> new AssertionError("A component of the GeoTIFF datastore is unnamed"));
GridCoverageResource foundResource = store.findResource(name.toString());
assertSame(dataset, foundResource);
foundResource = store.findResource(name.tip().toString());
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
index 13caeffe30..f4b6f60c7a 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/FeatureSetTest.java
@@ -193,7 +193,7 @@ public class FeatureSetTest extends TestCase {
}
/**
- * Asserts the the given shape is a line string with the following coordinates.
+ * Asserts the given shape is a line string with the following coordinates.
*
* @param trajectory the shape to verify.
* @param x expected X coordinates.
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
index 4371e14132..455893214a 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
@@ -62,7 +62,7 @@ final class ObjectGetter extends ValueGetter<Object> {
/*
* TODO: we should invoke `getType()` and select a decoding algorithm depending on the type.
* The driver also has a `PGBinaryObject` that we can check for more efficient data transfer
- * of points and bounding boxes. For now we just get the the wrapped value, which is always
+ * of points and bounding boxes. For now we just get the wrapped value, which is always
* a `String`.
*/
value = po.getValue();
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
index d2225eff51..28c4493d88 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
@@ -118,7 +118,7 @@ public class ChannelDataOutput extends ChannelData implements Flushable {
} while (after > capacity);
/*
* We wrote a sufficient amount of bytes - usually all of them, but not necessarily.
- * If there is some unwritten bytes, move them the the beginning of the buffer.
+ * If there is some unwritten bytes, move them the beginning of the buffer.
*/
bufferOffset += buffer.position();
buffer.compact();
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreContentException.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreContentException.java
index 0411bd62c3..3528b8ec0d 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreContentException.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreContentException.java
@@ -25,7 +25,7 @@ import java.util.Locale;
* or an unsupported file format version, <i>etc.</i>
*
* <h2>Usage note</h2>
- * exceptions that are caused by {@link java.io.IOException} or {@link java.sql.SQLException}
+ * Exceptions that are caused by {@link java.io.IOException} or {@link java.sql.SQLException}
* should generally be wrapped by another type of {@link DataStoreException}, unless the data
* store can determine that the error was caused by a problem with the stream content rather
* than some I/O problems.
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
index 794a498346..e6ae54d238 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
@@ -72,7 +72,7 @@ public enum CodeType {
/**
* Whether the code may be understood by the {@link org.apache.sis.referencing.CRS#forCode(String)}.
- * A value of {@code true} does not guaranteed the the code is valid. It only said that there is some
+ * A value of {@code true} does not guaranteed the code is valid. It only said that there is some
* chances that the code is valid.
*/
public final boolean isCRS;
@@ -138,7 +138,7 @@ public enum CodeType {
c = codeOrPath.charAt(separator);
} while (c == '.');
/*
- * If the the ':' if followed by at least one '/' (ignoring spaces and dots), then it is presumed
+ * If the ':' if followed by at least one '/' (ignoring spaces and dots), then it is presumed
* to be a URL protocol. In the special case where the protocol is "http(s)" and the domain after
* the '/' characters is "www.opengis.net", return HTTP_OGC instead of URL.
*/
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index 9ea4c95866..dd272ac230 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@ -974,7 +974,7 @@ public class MetadataBuilder {
* <li><b>Resource:</b> {@code metadata/identificationInfo/citation/identifier}</li>
* </ul>
*
- * @param authority the the person or party responsible for maintenance of the namespace, or {@code null} if none.
+ * @param authority the person or party responsible for maintenance of the namespace, or {@code null} if none.
* @param code the identifier code, or {@code null} for no-operation.
* @param scope whether the date applies to data, to metadata or to both.
*
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java
index 816c4085ff..c6f2b2ee71 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java
@@ -253,7 +253,7 @@ public abstract class TiledGridResource extends AbstractGridCoverageResource {
/**
* Sample dimensions for each image band. This is the range of the grid coverage to create.
- * If {@link #includedBands} is non-null, then the the size of this list should be equal to
+ * If {@link #includedBands} is non-null, then the size of this list should be equal to
* {@link #includedBands} array length. However, bands are not necessarily in the same order:
* the order of bands in this {@code ranges} list is the order specified by user, while the
* order of bands in {@link #includedBands} is always increasing index order for efficiency
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
index 161f864cac..73db51041d 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
@@ -116,7 +116,7 @@ final class MovingFeatureBuilder extends MovingFeatures {
* The minimal and maximal values will be used by {@link #storeTimeRange(String, String, Feature)}.
*
* @param startTime beginning in milliseconds since Java epoch of the period when the property value is valid.
- * @param endTime end in milliseconds since Java epoch of the period when the the property value is valid.
+ * @param endTime end in milliseconds since Java epoch of the period when the property value is valid.
*/
public final void addTimeRange(final long startTime, final long endTime) {
if (startTime < tmin) tmin = startTime;
@@ -128,7 +128,7 @@ final class MovingFeatureBuilder extends MovingFeatures {
*
* @param index the property index.
* @param startTime beginning in milliseconds since Java epoch of the period when the property value is valid.
- * @param endTime end in milliseconds since Java epoch of the period when the the property value is valid.
+ * @param endTime end in milliseconds since Java epoch of the period when the property value is valid.
* @param value the property value which is valid during the given period.
*/
public final void addValue(final int index, final long startTime, final long endTime, final Object value) {
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
index 50690e152c..9673e733fa 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
@@ -288,7 +288,7 @@ class WorldFileResource extends AbstractGridCoverageResource implements StoreRes
* Image I/O: xₒ = xᵣ + (x⋅s + Δx′)
* GridGeometry: xₒ = (truncate(xᵣ/s) + x)⋅s + Δx
*
- * Where xᵣ is the the lower coordinate of `region`, s is the subsampling and
+ * Where xᵣ is the lower coordinate of `region`, s is the subsampling and
* `truncate(xᵣ/s)` is given by the lower coordinate of subsampled extent.
* Rearranging equations:
*
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/internal/WritableResourceSupport.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/internal/WritableResourceSupport.java
index 302faa3c00..471ff22b68 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/internal/WritableResourceSupport.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/internal/WritableResourceSupport.java
@@ -131,7 +131,7 @@ public final class WritableResourceSupport implements Localized {
* <li>If the given channel is empty, then this method always returns {@code true}.</li>
* <li>Otherwise this method returns {@code true} if the {@code REPLACE} option was specified,
* or returns {@code false} if the {@code UPDATE} option was specified,
- * or thrown a {@link ResourceAlreadyExistsException} otherwise.</li>
+ * or throws a {@link ResourceAlreadyExistsException} otherwise.</li>
* </ul>
*
* @param input the channel to test for emptiness, or {@code null} if unknown.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
index b9844564bc..9be723171d 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
@@ -549,7 +549,7 @@ public final class Units extends Static {
/**
* Unit of measurement approximately equals to 365.24219 days (1 a).
* This is defined by the International Union of Geological Sciences (IUGS) as exactly 31556925.445 seconds,
- * taken as the length of the tropical year in the the year 2000.
+ * taken as the length of the tropical year in the year 2000.
* The {@linkplain ConventionalUnit#getSystemUnit() system unit} is {@link #SECOND},
* the unlocalized name is “year” and the identifier is EPSG:1029.
*
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeNodeList.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeNodeList.java
index d10b6fadbe..44c10fbb67 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeNodeList.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeNodeList.java
@@ -237,7 +237,7 @@ abstract class TreeNodeList extends AbstractList<TreeTable.Node>
}
/**
- * Ensures the the given node is not already present in this list. This checks is performed
+ * Ensures the given node is not already present in this list. This checks is performed
* only if a newly added node declares to have this list {@linkplain #parent}. Such case may
* occur either because the node is a custom user implementation with pre-set parent, or
* because the node is already presents in this list.
diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestRunner.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestRunner.java
index 51c70756aa..81e61c19f2 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestRunner.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestRunner.java
@@ -73,7 +73,7 @@ public final class TestRunner extends BlockJUnit4ClassRunner {
* Values are method names.
*
* <p>There is no need to prefix the method names by classnames because a new instance of {@code TestRunner}
- * will be created for each test class, even if the the test classes are aggregated in a test suite.</p>
+ * will be created for each test class, even if the test classes are aggregated in a test suite.</p>
*
* @see #addDependencyFailure(String)
*/
diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/StyledRenderingData.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/StyledRenderingData.java
index 7ecef0bfe4..19427b82e5 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/StyledRenderingData.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/StyledRenderingData.java
@@ -79,7 +79,7 @@ final class StyledRenderingData extends RenderingData {
}
/**
- * Prepares isolines by computing the the Java2D shapes that were not already computed in a previous rendering.
+ * Prepares isolines by computing the Java2D shapes that were not already computed in a previous rendering.
* This method shall be invoked in a background thread after image rendering has been completed (because this
* method uses some image computation results).
*
[sis] 02/03: Deprecate for removal `NullArgumentException`.
Posted by de...@apache.org.
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 200ed9511a0c569d4c55282bcdb58f4fe314b2be
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Sep 23 13:36:15 2023 +0200
Deprecate for removal `NullArgumentException`.
https://issues.apache.org/jira/browse/SIS-562
---
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/ImageRenderer.java | 7 +-
.../apache/sis/feature/builder/TypeBuilder.java | 4 +-
.../org/apache/sis/portrayal/CanvasFollower.java | 3 +-
.../sis/referencing/cs/CoordinateSystems.java | 3 +-
.../apache/sis/storage/landsat/LandsatStore.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Grid.java | 3 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../main/org/apache/sis/util/ArraysExt.java | 172 ++++++++-------------
.../main/org/apache/sis/util/CharSequences.java | 4 +-
.../org/apache/sis/util/NullArgumentException.java | 8 +
.../main/org/apache/sis/util/StringBuilders.java | 10 +-
.../apache/sis/util/collection/WeakHashSet.java | 5 +-
.../sis/util/collection/WeakValueHashMap.java | 8 +-
16 files changed, 95 insertions(+), 142 deletions(-)
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
index 86c2ec2574..d02a7a0130 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageBuilder.java
@@ -442,7 +442,7 @@ public class GridCoverageBuilder {
* {@linkplain GridGeometry#getExtent() grid extent} not matching image size or
* {@linkplain #setRanges(SampleDimension...) number of sample dimensions} not matching
* the number of bands. This exception often wraps an {@link IllegalGridGeometryException},
- * {@link IllegalArgumentException} or {@link org.apache.sis.util.NullArgumentException}.
+ * {@link IllegalArgumentException} or {@link NullPointerException}.
*/
public GridCoverage build() throws IllegalStateException {
GridGeometry grid = domain; // May be replaced by an instance with extent.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
index bdda955ad8..dc419b87d4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -47,7 +47,6 @@ import org.apache.sis.coverage.grid.j2d.ObservableImage;
import org.apache.sis.coverage.grid.j2d.TiledImage;
import org.apache.sis.coverage.grid.j2d.WritableTiledImage;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.util.NullArgumentException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArraysExt;
@@ -538,7 +537,7 @@ public class ImageRenderer {
* getExtent()}.{@linkplain GridExtent#getLow(int) getLow()}</code>, as specified in class javadoc.
*
* @param data the Java2D buffer containing data for all bands.
- * @throws NullArgumentException if {@code data} is null.
+ * @throws NullPointerException if {@code data} is null.
* @throws MismatchedCoverageRangeException if the given data buffer does not have the expected amount of banks.
*/
public void setData(final DataBuffer data) {
@@ -563,7 +562,7 @@ public class ImageRenderer {
*
* @param dataType type of data.
* @param data the buffers wrapping arrays of primitive type.
- * @throws NullArgumentException if {@code data} is null or one of {@code data} element is null.
+ * @throws NullPointerException if {@code data} is null or one of {@code data} element is null.
* @throws MismatchedCoverageRangeException if the number of specified buffers is not equal to the number of bands.
* @throws UnsupportedOperationException if a buffer is not backed by an accessible array or is read-only.
* @throws ArrayStoreException if a buffer type is incompatible with {@code dataType}.
@@ -589,7 +588,7 @@ public class ImageRenderer {
* which can be overridden by subclasses if desired.</p>
*
* @param data the vectors wrapping arrays of primitive type.
- * @throws NullArgumentException if {@code data} is null or one of {@code data} element is null.
+ * @throws NullPointerException if {@code data} is null or one of {@code data} element is null.
* @throws MismatchedCoverageRangeException if the number of specified vectors is not equal to the number of bands.
* @throws UnsupportedOperationException if a vector is not backed by an accessible array or is read-only.
* @throws RasterFormatException if vectors do not have the same size.
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
index db15562fcb..36f9c77e75 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/TypeBuilder.java
@@ -494,7 +494,7 @@ public abstract class TypeBuilder implements Localized {
*
* @param name the name of the argument to be checked. Used only if an exception is thrown.
* @param value the user argument to check against null value.
- * @throws NullArgumentException if {@code object} is null.
+ * @throws NullPointerException if {@code object} is null.
*/
final void ensureNonNull(final String name, final Object value) {
if (value == null) {
@@ -519,7 +519,7 @@ public abstract class TypeBuilder implements Localized {
*
* @param name the name of the argument to be checked. Used only if an exception is thrown.
* @param text the user argument to check against null value and empty sequences.
- * @throws NullArgumentException if {@code text} is null.
+ * @throws NullPointerException if {@code text} is null.
* @throws IllegalArgumentException if {@code text} is empty.
*/
final void ensureNonEmpty(final String name, final CharSequence text) {
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
index 694b4d4d83..9200b6457d 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasFollower.java
@@ -32,7 +32,6 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.Disposable;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.NullArgumentException;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
@@ -373,7 +372,7 @@ public class CanvasFollower implements PropertyChangeListener, Disposable {
}
transformObjectiveCoordinates(te, before);
return;
- } catch (NullArgumentException | TransformException | NoninvertibleTransformException e) {
+ } catch (NullPointerException | TransformException | NoninvertibleTransformException e) {
canNotCompute("propertyChange", e);
}
}
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
index a349b0e1c4..60503e213e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -40,7 +40,6 @@ import org.apache.sis.measure.Units;
import org.apache.sis.util.Static;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.NullArgumentException;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.internal.DoubleDouble;
import org.apache.sis.referencing.util.AxisDirections;
@@ -564,7 +563,7 @@ next: for (final CoordinateSystem cs : targets) {
*
* @param cs the coordinate system.
* @return the axis directions for the specified coordinate system.
- * @throws NullArgumentException if {@code cs} is null, or one of its axes is null,
+ * @throws NullPointerException if {@code cs} is null, or one of its axes is null,
* or a value returned by {@link CoordinateSystemAxis#getDirection()} is null.
*
* @since 0.8
diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
index 1d9e897e17..fa0ccaa9b6 100644
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
@@ -285,7 +285,7 @@ public class LandsatStore extends DataStore implements Aggregate {
*/
@Override
public <T extends StoreEvent> void addListener(Class<T> eventType, StoreListener<? super T> listener) {
- // If an argument is null, we let the parent class throws (indirectly) NullArgumentException.
+ // If an argument is null, we let the parent class throws (indirectly) NullPointerException.
if (listener == null || eventType == null || eventType.isAssignableFrom(WarningEvent.class)) {
super.addListener(eventType, listener);
}
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
index ea8243f57e..192a7a4bf2 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -531,7 +531,7 @@ public class GeoTiffStore extends DataStore implements Aggregate {
*/
@Override
public <T extends StoreEvent> void addListener(Class<T> eventType, StoreListener<? super T> listener) {
- // If an argument is null, we let the parent class throws (indirectly) NullArgumentException.
+ // If an argument is null, we let the parent class throws (indirectly) NullPointerException.
if (listener == null || eventType == null || eventType.isAssignableFrom(WarningEvent.class)) {
super.addListener(eventType, listener);
}
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
index 2b1a5a784b..79581f2013 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
@@ -253,7 +253,7 @@ public class NetcdfStore extends DataStore implements Aggregate {
*/
@Override
public <T extends StoreEvent> void addListener(Class<T> eventType, StoreListener<? super T> listener) {
- // If an argument is null, we let the parent class throws (indirectly) NullArgumentException.
+ // If an argument is null, we let the parent class throws (indirectly) NullPointerException.
if (listener == null || eventType == null || eventType.isAssignableFrom(WarningEvent.class)) {
super.addListener(eventType, listener);
}
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
index 4acc9b5cf1..692914e3b8 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Grid.java
@@ -36,7 +36,6 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.IllegalGridGeometryException;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.netcdf.internal.Resources;
-import org.apache.sis.util.NullArgumentException;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.ArraysExt;
@@ -307,7 +306,7 @@ public abstract class Grid extends NamedElement {
final CoordinateReferenceSystem result = CRSBuilder.assemble(decoder, this, linearizations, reorderGridToCRS);
if (useCache) crs = result;
return result;
- } catch (FactoryException | NullArgumentException ex) {
+ } catch (FactoryException | NullPointerException ex) {
if (isNewWarning(ex, warnings)) {
canNotCreate(decoder, "getCoordinateReferenceSystem", Resources.Keys.CanNotCreateCRS_3, ex);
}
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
index 1b79bb327c..38e3e9d24f 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
@@ -318,7 +318,7 @@ public class SQLStore extends DataStore implements Aggregate {
*/
@Override
public <T extends StoreEvent> void addListener(Class<T> eventType, StoreListener<? super T> listener) {
- // If an argument is null, we let the parent class throws (indirectly) NullArgumentException.
+ // If an argument is null, we let the parent class throws (indirectly) NullPointerException.
if (listener == null || eventType == null || eventType.isAssignableFrom(WarningEvent.class)) {
super.addListener(eventType, listener);
}
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java
index 0575e37b2d..e6baf24db0 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArraysExt.java
@@ -160,7 +160,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(Object[], int)
*/
- public static <E> E[] resize(final E[] array, final int length) throws NegativeArraySizeException {
+ public static <E> E[] resize(final E[] array, final int length) {
return (array == null || array.length == length) ? array : Arrays.copyOf(array, length);
}
@@ -178,7 +178,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(double[], int)
*/
- public static double[] resize(final double[] array, final int length) throws NegativeArraySizeException {
+ public static double[] resize(final double[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_DOUBLE;
@@ -204,7 +204,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(float[], int)
*/
- public static float[] resize(final float[] array, final int length) throws NegativeArraySizeException {
+ public static float[] resize(final float[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_FLOAT;
@@ -230,7 +230,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(long[], int)
*/
- public static long[] resize(final long[] array, final int length) throws NegativeArraySizeException {
+ public static long[] resize(final long[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_LONG;
@@ -256,7 +256,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(int[], int)
*/
- public static int[] resize(final int[] array, final int length) throws NegativeArraySizeException {
+ public static int[] resize(final int[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_INT;
@@ -282,7 +282,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(short[], int)
*/
- public static short[] resize(final short[] array, final int length) throws NegativeArraySizeException {
+ public static short[] resize(final short[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_SHORT;
@@ -308,7 +308,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(byte[], int)
*/
- public static byte[] resize(final byte[] array, final int length) throws NegativeArraySizeException {
+ public static byte[] resize(final byte[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_BYTE;
@@ -334,7 +334,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(char[], int)
*/
- public static char[] resize(final char[] array, final int length) throws NegativeArraySizeException {
+ public static char[] resize(final char[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_CHAR;
@@ -360,7 +360,7 @@ public final class ArraysExt extends Static {
*
* @see Arrays#copyOf(boolean[], int)
*/
- public static boolean[] resize(final boolean[] array, final int length) throws NegativeArraySizeException {
+ public static boolean[] resize(final boolean[] array, final int length) {
if (array != null) {
if (length == 0) {
return EMPTY_BOOLEAN;
@@ -383,14 +383,12 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*/
@SuppressWarnings("SuspiciousSystemArraycopy")
- private static <T> T doRemove(final T array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ private static <T> T doRemove(final T array, final int first, final int length) {
if (length == 0) {
return array; // May be null
}
@@ -415,15 +413,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(Object[], int, int)
*/
- public static <E> E[] remove(final E[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static <E> E[] remove(final E[] array, final int first, final int length) {
return doRemove(array, first, length);
}
@@ -438,15 +434,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(double[], int, int)
*/
- public static double[] remove(final double[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static double[] remove(final double[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_DOUBLE : doRemove(array, first, length);
}
@@ -462,15 +456,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(float[], int, int)
*/
- public static float[] remove(final float[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static float[] remove(final float[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_FLOAT : doRemove(array, first, length);
}
@@ -486,15 +478,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(long[], int, int)
*/
- public static long[] remove(final long[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static long[] remove(final long[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_LONG : doRemove(array, first, length);
}
@@ -510,15 +500,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(int[], int, int)
*/
- public static int[] remove(final int[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static int[] remove(final int[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_INT : doRemove(array, first, length);
}
@@ -534,15 +522,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(short[], int, int)
*/
- public static short[] remove(final short[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static short[] remove(final short[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length) ?
EMPTY_SHORT : doRemove(array, first, length);
}
@@ -558,15 +544,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(byte[], int, int)
*/
- public static byte[] remove(final byte[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static byte[] remove(final byte[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_BYTE : doRemove(array, first, length);
}
@@ -582,15 +566,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(char[], int, int)
*/
- public static char[] remove(final char[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static char[] remove(final char[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_CHAR : doRemove(array, first, length);
}
@@ -606,15 +588,13 @@ public final class ArraysExt extends Static {
* @param length number of elements to remove.
* @return array with the same elements than the given {@code array} except for the removed elements,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(boolean[], int, int)
*/
- public static boolean[] remove(final boolean[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static boolean[] remove(final boolean[] array, final int first, final int length) {
return (first == 0 && array != null && length == array.length)
? EMPTY_BOOLEAN : doRemove(array, first, length);
}
@@ -633,14 +613,12 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*/
@SuppressWarnings("SuspiciousSystemArraycopy")
- private static <T> T doInsert(final T array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ private static <T> T doInsert(final T array, final int first, final int length) {
if (length == 0) {
return array; // May be null
}
@@ -669,16 +647,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(Object[], int, Object[], int, int)
* @see #remove(Object[], int, int)
*/
- public static <E> E[] insert(final E[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static <E> E[] insert(final E[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -695,16 +671,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(double[], int, double[], int, int)
* @see #remove(double[], int, int)
*/
- public static double[] insert(final double[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static double[] insert(final double[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -721,16 +695,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(float[], int, float[], int, int)
* @see #remove(float[], int, int)
*/
- public static float[] insert(final float[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static float[] insert(final float[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -747,16 +719,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(long[], int, long[], int, int)
* @see #remove(long[], int, int)
*/
- public static long[] insert(final long[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static long[] insert(final long[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -773,16 +743,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(int[], int, int[], int, int)
* @see #remove(int[], int, int)
*/
- public static int[] insert(final int[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static int[] insert(final int[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -798,16 +766,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(short[], int, short[], int, int)
* @see #remove(short[], int, int)
*/
- public static short[] insert(final short[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static short[] insert(final short[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -824,16 +790,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(byte[], int, byte[], int, int)
* @see #remove(byte[], int, int)
*/
- public static byte[] insert(final byte[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static byte[] insert(final byte[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -850,16 +814,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(char[], int, char[], int, int)
* @see #remove(char[], int, int)
*/
- public static char[] insert(final char[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static char[] insert(final char[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -876,16 +838,14 @@ public final class ArraysExt extends Static {
* @param length number of spaces to insert.
* @return array containing the {@code array} elements with the additional space inserted,
* or {@code array} (which may be null) if {@code length} is 0.
- * @throws NullArgumentException if {@code array} is null and {@code length} is different than 0.
+ * @throws NullPointerException if {@code array} is null and {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code first} or {@code first+length} is out of array bounds.
*
* @see #insert(boolean[], int, boolean[], int, int)
* @see #remove(boolean[], int, int)
*/
- public static boolean[] insert(final boolean[] array, final int first, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
- {
+ public static boolean[] insert(final boolean[] array, final int first, final int length) {
return doInsert(array, first, length);
}
@@ -905,14 +865,13 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
@SuppressWarnings("SuspiciousSystemArraycopy")
private static <T> T doInsert(final T src, final int srcOff,
final T dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
if (length == 0) {
return dst; // May be null
@@ -945,13 +904,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static <E> E[] insert(final E[] src, final int srcOff,
final E[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -971,13 +929,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static double[] insert(final double[] src, final int srcOff,
final double[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -997,13 +954,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static float[] insert(final float[] src, final int srcOff,
final float[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1023,13 +979,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static long[] insert(final long[] src, final int srcOff,
final long[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1049,13 +1004,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static int[] insert(final int[] src, final int srcOff,
final int[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1075,13 +1029,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static short[] insert(final short[] src, final int srcOff,
final short[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1101,13 +1054,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static byte[] insert(final byte[] src, final int srcOff,
final byte[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1127,13 +1079,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static char[] insert(final char[] src, final int srcOff,
final char[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1153,13 +1104,12 @@ public final class ArraysExt extends Static {
* @param length number of {@code src} elements to insert.
* @return array which contains the merge of {@code src} and {@code dst}.
* This method returns directly {@code dst} when {@code length} is zero, but never return {@code src}.
- * @throws NullArgumentException if {@code src} or {@code dst} is null while {@code length} is different than 0.
+ * @throws NullPointerException if {@code src} or {@code dst} is null while {@code length} is different than 0.
* @throws IllegalArgumentException if {@code length} is negative.
* @throws IndexOutOfBoundsException if {@code srcOff}, {@code srcOff+length} or {@code dstOff} is out of array bounds.
*/
public static boolean[] insert(final boolean[] src, final int srcOff,
final boolean[] dst, final int dstOff, final int length)
- throws NullArgumentException, IllegalArgumentException, IndexOutOfBoundsException
{
return doInsert(src, srcOff, dst, dstOff, length);
}
@@ -1173,11 +1123,11 @@ public final class ArraysExt extends Static {
* @param array the array to copy with a new element. The original array will not be modified.
* @param element the element to add (can be null).
* @return a copy of the given array with the given element appended at the end.
- * @throws NullArgumentException if the given array is null.
+ * @throws NullPointerException if the given array is null.
*
* @see #concatenate(Object[][])
*/
- public static <T> T[] append(final T[] array, final T element) throws NullArgumentException{
+ public static <T> T[] append(final T[] array, final T element) {
ArgumentChecks.ensureNonNull("array", array);
final T[] copy = Arrays.copyOf(array, array.length + 1);
copy[array.length] = element;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
index e153d9d486..aa2baf7227 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/CharSequences.java
@@ -232,7 +232,7 @@ public final class CharSequences extends Static {
* It shall contain at least one character.
* @return the number of occurrences of {@code toSearch} in {@code text},
* or 0 if {@code text} was null or empty.
- * @throws NullArgumentException if the {@code toSearch} argument is null.
+ * @throws NullPointerException if the {@code toSearch} argument is null.
* @throws IllegalArgumentException if the {@code toSearch} argument is empty.
*/
public static int count(final CharSequence text, final String toSearch) {
@@ -301,7 +301,7 @@ public final class CharSequences extends Static {
* @param toIndex the index after the last character where to perform the search.
* @return the index within the text of the first occurrence of the specified part, starting at the specified index,
* or -1 if no occurrence has been found or if the {@code text} argument is null.
- * @throws NullArgumentException if the {@code toSearch} argument is null.
+ * @throws NullPointerException if the {@code toSearch} argument is null.
* @throws IllegalArgumentException if the {@code toSearch} argument is empty.
*
* @see String#indexOf(String, int)
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/NullArgumentException.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/NullArgumentException.java
index 1c4bfa8283..0c81bf89b2 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/NullArgumentException.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/NullArgumentException.java
@@ -34,7 +34,15 @@ package org.apache.sis.util;
* @see ArgumentChecks#ensureNonNull(String, Object)
*
* @since 0.3
+ *
+ * @deprecated This exception was introduced before Java introduced {@code Objects.requireNonNull(…)}.
+ * Usages of {@code ArgumentChecks.ensureNonNull(…)} may be progressively replaced in the
+ * future, which would cause {@code NullArgumentException} to not be thrown anymore.
+ * Use {@code NullPointerException} instead.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/SIS-562">JIRA issue SIS-562</a>
*/
+@Deprecated(since = "1.4", forRemoval = true)
public class NullArgumentException extends NullPointerException {
/**
* For cross-version compatibility.
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 bf69588883..4fcbd39b26 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
@@ -62,7 +62,7 @@ public final class StringBuilders extends Static {
* @param buffer the string in which to perform the replacements.
* @param toSearch the character to replace.
* @param replaceBy the replacement for the searched character.
- * @throws NullArgumentException if the {@code buffer} arguments is null.
+ * @throws NullPointerException if the {@code buffer} arguments is null.
*
* @see String#replace(char, char)
*/
@@ -85,7 +85,7 @@ public final class StringBuilders extends Static {
* @param buffer the string in which to perform the replacements.
* @param toSearch the string to replace.
* @param replaceBy the replacement for the searched string.
- * @throws NullArgumentException if any of the arguments is null.
+ * @throws NullPointerException if any of the arguments is null.
* @throws IllegalArgumentException if the {@code toSearch} argument is empty.
*
* @see String#replace(char, char)
@@ -115,7 +115,7 @@ public final class StringBuilders extends Static {
* @param start the beginning index in the {@code buffer}, inclusive.
* @param end the ending index in the {@code buffer}, exclusive.
* @param chars the array that will replace previous contents.
- * @throws NullArgumentException if the {@code buffer} or {@code chars} argument is null.
+ * @throws NullPointerException if the {@code buffer} or {@code chars} argument is null.
*
* @see StringBuilder#replace(int, int, String)
*/
@@ -266,7 +266,7 @@ public final class StringBuilders extends Static {
* been appended to the buffer}, in order to make it appears like an integer when possible.
*
* @param buffer the buffer to trim if possible.
- * @throws NullArgumentException if the given {@code buffer} is null.
+ * @throws NullPointerException if the given {@code buffer} is null.
*
* @see CharSequences#trimFractionalPart(CharSequence)
*/
@@ -290,7 +290,7 @@ public final class StringBuilders extends Static {
* by the corresponding sequences of characters.
*
* @param buffer the text to scan for Unicode characters to replace by ASCII characters.
- * @throws NullArgumentException if the given {@code buffer} is null.
+ * @throws NullPointerException if the given {@code buffer} is null.
*
* @see CharSequences#toASCII(CharSequence)
* @see Normalizer#normalize(CharSequence, Normalizer.Form)
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakHashSet.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakHashSet.java
index 738b4aa922..0549124ccb 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakHashSet.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakHashSet.java
@@ -25,7 +25,6 @@ import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.NullArgumentException;
import static org.apache.sis.util.collection.WeakEntry.*;
@@ -210,10 +209,10 @@ public class WeakHashSet<E> extends AbstractSet<E> implements CheckedContainer<E
*
* @param element element to be added to this set.
* @return {@code true} if this set did not already contain the specified element.
- * @throws NullArgumentException if the given object is {@code null}.
+ * @throws NullPointerException if the given object is {@code null}.
*/
@Override
- public synchronized boolean add(final E element) throws NullArgumentException {
+ public synchronized boolean add(final E element) {
ArgumentChecks.ensureNonNull("element", element);
return intern(element, ADD) == null;
}
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakValueHashMap.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakValueHashMap.java
index 5ffff63ca2..fd461a7449 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakValueHashMap.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakValueHashMap.java
@@ -538,7 +538,7 @@ public class WeakValueHashMap<K,V> extends AbstractMap<K,V> {
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
* @return the previous value associated with specified key, or {@code null} if there was no mapping for the key.
- * @throws NullArgumentException if the key or the value is {@code null}.
+ * @throws NullPointerException if the key or the value is {@code null}.
*/
@Override
public V put(final K key, final V value) {
@@ -558,7 +558,7 @@ public class WeakValueHashMap<K,V> extends AbstractMap<K,V> {
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
* @return the current value associated with specified key, or {@code null} if there was no mapping for the key.
- * @throws NullArgumentException if the key or the value is {@code null}.
+ * @throws NullPointerException if the key or the value is {@code null}.
*
* @since 0.7
*/
@@ -577,7 +577,7 @@ public class WeakValueHashMap<K,V> extends AbstractMap<K,V> {
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
* @return the previous value associated with specified key, or {@code null} if there was no mapping for the key.
- * @throws NullArgumentException if the value is {@code null}.
+ * @throws NullPointerException if the value is {@code null}.
*
* @since 1.2
*/
@@ -597,7 +597,7 @@ public class WeakValueHashMap<K,V> extends AbstractMap<K,V> {
* @param oldValue value expected to be associated with the specified key.
* @param newValue value to be associated with the specified key.
* @return {@code true} if the value was replaced.
- * @throws NullArgumentException if the new value is {@code null}.
+ * @throws NullPointerException if the new value is {@code null}.
*
* @since 1.2
*/
[sis] 03/03: Remove the boolean return value in WritableFeatureSet.removeIf(Predicate)
Posted by de...@apache.org.
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 6f65c2bacd120b81235735611fb0480383e9670e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Sep 23 14:00:05 2023 +0200
Remove the boolean return value in WritableFeatureSet.removeIf(Predicate)
https://issues.apache.org/jira/browse/SIS-560
---
.../org/apache/sis/storage/gpx/WritableStore.java | 7 ++++---
.../sis/storage/xml/stream/RewriteOnUpdate.java | 22 +++++-----------------
.../org/apache/sis/storage/gpx/UpdaterTest.java | 4 +---
.../org/apache/sis/storage/WritableFeatureSet.java | 14 ++------------
4 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
index a04fc2742e..2fd3599554 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/WritableStore.java
@@ -40,7 +40,7 @@ import org.opengis.feature.FeatureType;
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @version 1.3
+ * @version 1.4
* @since 1.3
*/
public final class WritableStore extends Store implements WritableFeatureSet {
@@ -95,9 +95,10 @@ public final class WritableStore extends Store implements WritableFeatureSet {
* @throws DataStoreException if the feature stream cannot be obtained or updated.
*/
@Override
- public synchronized boolean removeIf(final Predicate<? super Feature> filter) throws DataStoreException {
+ public synchronized void removeIf(final Predicate<? super Feature> filter) throws DataStoreException {
try (Updater updater = updater()) {
- return updater.removeIf(filter);
+ updater.removeIf(filter);
+ updater.flush();
}
}
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
index cf1e77ac84..60ba5e50a4 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/RewriteOnUpdate.java
@@ -161,29 +161,17 @@ public abstract class RewriteOnUpdate implements AutoCloseable {
* Removes all feature instances from the {@code FeatureSet} which matches the given predicate.
*
* @param filter a predicate which returns {@code true} for feature instances to be removed.
- * @return {@code true} if any elements were removed.
* @throws DataStoreException if the feature stream cannot be obtained or updated.
*/
- public boolean removeIf(final Predicate<? super Feature> filter) throws DataStoreException {
+ public void removeIf(final Predicate<? super Feature> filter) throws DataStoreException {
ArgumentChecks.ensureNonNull("filter", filter);
- if (isEmpty()) {
- return false;
+ if (!isEmpty()) {
+ filtered = filtered().filter((feature) -> {
+ return !filter.test(feature);
+ });
}
- filtered = filtered().filter((feature) -> {
- boolean r = filter.test(feature);
- if (r) modified = true;
- return !r;
- });
- modified = false;
- flush(); // Need immediate execution for getting the boolean value.
- return modified;
}
- /**
- * A flag telling whether {@link #removeIf(Predicate)} removed at least one feature.
- */
- private boolean modified;
-
/**
* Updates all feature instances from the {@code FeatureSet} which match the given predicate.
* If the given operator returns {@code null}, then the filtered feature is removed.
diff --git a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
index 7d7f9c4ff1..d15c85c75a 100644
--- a/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
+++ b/endorsed/src/org.apache.sis.storage.xml/test/org/apache/sis/storage/gpx/UpdaterTest.java
@@ -165,14 +165,12 @@ public final class UpdaterTest extends TestCase {
Files.copy(in, file, StandardCopyOption.REPLACE_EXISTING);
}
assertTrue(containsLat20());
- final boolean result;
try (final WritableStore store = create()) {
- result = store.removeIf((feature) -> {
+ store.removeIf((feature) -> {
Object point = feature.getPropertyValue("sis:geometry");
return ((Point) point).getY() == 20;
});
}
- assertTrue(result);
assertFalse(containsLat20());
}
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
index c6641cc256..14820d87da 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/WritableFeatureSet.java
@@ -32,7 +32,7 @@ import org.opengis.feature.FeatureType;
* or {@linkplain #replaceIf(Predicate, UnaryOperator) replace} feature instances.
*
* @author Johann Sorel (Geomatys)
- * @version 1.0
+ * @version 1.4
* @since 1.0
*/
public interface WritableFeatureSet extends FeatureSet {
@@ -80,21 +80,11 @@ public interface WritableFeatureSet extends FeatureSet {
/**
* Removes all feature instances from this {@code FeatureSet} which matches the given predicate.
*
- * <div class="warning"><b>Possible API change:</b>
- * The {@code boolean} return type may be removed in a future version.
- * It currently exists for compatibility with the {@link java.util.Collection#removeIf(Predicate)} method
- * if an implementation chooses to implements {@code WritableFeatureSet} and {@link java.util.Collection}
- * in same time. But this is not recommended, and the current method signature is a blocker for deferred
- * method execution. Telling if there is any feature to remove requires immediate execution of the filter,
- * while an implementation may want to wait in case the filtering can be combined with other operations
- * such as {@code add(…)} or {@code replaceIf(…)}.
- * See <a href="https://issues.apache.org/jira/browse/SIS-560">SIS-560 on issue tracker</a>.</div>
- *
* @param filter a predicate which returns {@code true} for feature instances to be removed.
* @return {@code true} if any elements were removed.
* @throws DataStoreException if an error occurred while removing features.
*/
- boolean removeIf(Predicate<? super Feature> filter) throws DataStoreException;
+ void removeIf(Predicate<? super Feature> filter) throws DataStoreException;
/**
* Updates all feature instances from this {@code FeatureSet} which match the given predicate.