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 0a71185c8ce4b15dddeaad3d8ca547b4d579fe0f
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Oct 4 17:21:23 2024 +0200
Spelling fixes (no significant changes in the code).
---
.../sis/coverage/grid/TranslatedGridCoverage.java | 4 +--
.../org/apache/sis/feature/AbstractFeature.java | 2 +-
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../org/apache/sis/feature/DefaultFeatureType.java | 2 +-
.../apache/sis/feature/ExpressionOperation.java | 2 +-
.../main/org/apache/sis/filter/Optimization.java | 2 +-
.../sis/feature/DefaultAssociationRoleTest.java | 2 +-
.../org/apache/sis/metadata/MetadataStandard.java | 2 +-
.../org/apache/sis/metadata/MetadataVisitor.java | 8 +++---
.../apache/sis/metadata/ModifiableMetadata.java | 2 +-
.../main/org/apache/sis/metadata/ObjectPair.java | 2 +-
.../apache/sis/metadata/ValueExistencePolicy.java | 2 +-
.../apache/sis/metadata/sql/MetadataWriter.java | 2 +-
.../main/org/apache/sis/xml/ReferenceResolver.java | 2 +-
.../apache/sis/metadata/AbstractMetadataTest.java | 2 +-
.../apache/sis/metadata/MetadataStandardTest.java | 4 +--
.../test/org/apache/sis/metadata/PrunerTest.java | 4 +--
.../gazetteer/AbstractLocationType.java | 10 +++----
.../referencing/gazetteer/LocationTypeTest.java | 2 +-
.../sis/referencing/crs/AbstractDerivedCRS.java | 2 +-
.../factory/ConcurrentAuthorityFactory.java | 4 +--
.../factory/LazySynchronizedIterator.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 18 ++++++------
.../operation/AbstractCoordinateOperation.java | 4 +--
.../operation/CoordinateOperationFinder.java | 4 +--
.../transform/DefaultMathTransformFactory.java | 2 +-
.../org/apache/sis/parameter/ParametersTest.java | 2 +-
.../apache/sis/referencing/ClenshawSummation.java | 2 +-
.../operation/transform/MathTransformTestCase.java | 2 +-
.../operation/transform/MathTransformWrapper.java | 4 +--
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 2 +-
.../org/apache/sis/storage/geotiff/Reader.java | 2 +-
.../sis/storage/geotiff/reader/Localization.java | 2 +-
.../sis/storage/sql/feature/FeatureAdapter.java | 4 +--
.../apache/sis/storage/sql/feature/Relation.java | 2 +-
.../org/apache/sis/storage/sql/feature/Table.java | 2 +-
.../sis/util/stream/PaginedDoubleStream.java | 4 +--
.../org/apache/sis/util/stream/PaginedStream.java | 4 +--
.../sis/storage/aggregate/GridSliceLocator.java | 2 +-
.../sis/storage/base/GridResourceWrapper.java | 6 ++--
.../apache/sis/converter/ConverterRegistry.java | 4 +--
.../org/apache/sis/converter/SystemRegistry.java | 2 +-
.../main/org/apache/sis/math/MathFunctions.java | 2 +-
.../main/org/apache/sis/math/Vector.java | 2 +-
.../main/org/apache/sis/setup/About.java | 2 +-
.../main/org/apache/sis/system/Semaphores.java | 2 +-
.../main/org/apache/sis/util/collection/Cache.java | 2 +-
.../sis/util/collection/DefaultTreeTable.java | 2 +-
.../org/apache/sis/util/collection/TreeTable.java | 6 ++--
.../sis/util/collection/TreeTableFormat.java | 32 +++++++++++-----------
.../main/org/apache/sis/util/internal/Acyclic.java | 2 +-
.../org/apache/sis/util/privy/AbstractMap.java | 2 +-
.../main/org/apache/sis/util/privy/Cloner.java | 2 +-
.../main/org/apache/sis/map/MapLayer.java | 2 +-
.../sis/gui/coverage/ImagePropertyExplorer.java | 4 +--
56 files changed, 102 insertions(+), 102 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
index 9747ebbf98..26225bd368 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/TranslatedGridCoverage.java
@@ -41,7 +41,7 @@ final class TranslatedGridCoverage extends
DerivedGridCoverage {
* This coverage will take the same sample dimensions as the source.
* The {@code domain} size must be the same as the source grid geometry
size.
*
- * @param source the source on which to delegate rendering
operations.
+ * @param source the source to which to delegate rendering
operations.
* @param domain the grid extent, CRS and conversion from cell
indices to CRS.
* @param translation translation to apply on the argument given to
{@link #render(GridExtent)}.
*/
@@ -57,7 +57,7 @@ final class TranslatedGridCoverage extends
DerivedGridCoverage {
* <p>If {@code domain} is non-null, then it should have the same size as
the source grid geometry size.
* If this is not the case, then this method returns {@code null}.</p>
*
- * @param source the source on which to delegate rendering
operations.
+ * @param source the source to which to delegate rendering
operations.
* @param domain the geometry of the grid coverage to return, or
{@code null} for automatic.
* @param translation translation to apply on the argument given to
{@link #render(GridExtent)}.
* @return the coverage, or {@code null} if {@code domain} is non-null but
does not have the expected size.
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
index ba848a3aeb..01b4d7ca64 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
@@ -843,7 +843,7 @@ public abstract class AbstractFeature implements Feature,
Serializable {
* }
*
* @return {@code true} if hash code or equality comparison can proceed, or
- * {@code false} if a recursivity is detected.
+ * {@code false} if a recursion is detected.
*/
final boolean comparisonStart() {
return COMPARING.get().put(this, Boolean.TRUE) == null;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
index ab1fbb4b57..3e8061aa23 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultAssociationRole.java
@@ -490,7 +490,7 @@ public class DefaultAssociationRole extends FieldType
implements FeatureAssociat
/*
* Do not use the full `valueType` object for computing hash code,
* because it may change before and after `resolve` is invoked. In
- * addition, this avoid infinite recursivity in case of cyclic graph.
+ * addition, this avoid infinite recursion in case of cyclic graph.
*/
return super.hashCode() + valueType.getName().hashCode();
}
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
index 772e341d96..d9110ab7c3 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
@@ -567,7 +567,7 @@ public class DefaultFeatureType extends
AbstractIdentifiedType implements Featur
}
}
/*
- * Resolve recursively the associated features, with a
check against infinite recursivity.
+ * Resolve recursively the associated features, with a
check against infinite recursion.
* If we fall in a loop (for example A → B → C → A),
conservatively returns `false`. This
* may not be the most accurate answer, but will not cause
any more hurt than checking more
* often than necessary.
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
index 3518b6b10d..7a23b3ebdf 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/ExpressionOperation.java
@@ -60,7 +60,7 @@ final class ExpressionOperation<V> extends AbstractOperation {
private static final ParameterDescriptorGroup PARAMETERS =
FeatureUtilities.parameters("Expression");
/**
- * The expression on which to delegate the execution of this operation.
+ * The expression to which to delegate the execution of this operation.
*/
@SuppressWarnings("serial") // Not statically
typed as serializable.
private final Function<? super Feature, ? extends V> expression;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
index 5a396dc0b4..63348f1ee8 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
@@ -67,7 +67,7 @@ import org.opengis.feature.FeatureType;
* Optimizations are specific to each expression and filter type.
* For optimizations to happen, classes must implement the {@link
OnExpression} or {@link OnFilter} interface.
* The {@link #apply(Filter)} and {@link #apply(Expression)} methods in this
{@code Optimization} class merely
- * delegate to the methods defined in above-cited interfaces, with safety
guards against infinite recursivity.
+ * delegate to the methods defined in above-cited interfaces, with safety
guards against infinite recursion.
*
* <h2>Behavioral changes</h2>
* Optimized filters shall produce the same results as non-optimized filters.
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
index 3f63365082..bc2323d70e 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@ -144,7 +144,7 @@ public final class DefaultAssociationRoleTest extends
TestCase {
/**
* Tests {@link DefaultFeatureType#isAssignableFrom(FeatureType)} and
{@link DefaultFeatureType#equals(Object)}
* on a feature type having a bidirectional association to another
feature. This test will fall in an infinite
- * loop if the implementation does not have proper guard against infinite
recursivity.
+ * loop if the implementation does not have proper guard against infinite
recursion.
*/
@Test
public void testCyclicAssociation() {
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
index a0efb639b8..91eb62040e 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
@@ -1074,7 +1074,7 @@ public class MetadataStandard implements Serializable {
/*
* At this point, we have to perform the actual property-by-property
comparison.
* Cycle may exist in metadata tree, so we have to keep trace of pair
in process
- * of being compared for avoiding infinite recursivity.
+ * of being compared for avoiding infinite recursion.
*/
final ObjectPair pair = new ObjectPair(metadata1, metadata2);
final Set<ObjectPair> inProgress = ObjectPair.CURRENT.get();
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
index bb8b8b95b3..e4eaafc7ab 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
@@ -27,7 +27,7 @@ import org.apache.sis.util.privy.UnmodifiableArrayList;
/**
- * A visitor of metadata properties with a safety against infinite recursivity.
+ * A visitor of metadata properties with a safety against infinite recursion.
* The visitor may compute a result, for example a hash code value or a boolean
* testing whether the metadata is empty. Each {@code MetadataVisitor} instance
* is used by one thread; this class does not need to be thread-safe.
@@ -46,17 +46,17 @@ abstract class MetadataVisitor<R> {
static final Object SKIP_SIBLINGS = InterruptedException.class; // The
choice of this type is arbitrary.
/**
- * A guard against infinite recursivity in {@link #walk(MetadataStandard,
Class, Object, boolean)}.
+ * A guard against infinite recursion in {@link #walk(MetadataStandard,
Class, Object, boolean)}.
* Keys are visited metadata instances and values are computed value.
* The value may be null if the computation is in progress.
*
* <h4>The problem</h4>
* Cyclic associations can exist in ISO 19115 metadata. For example,
{@code Instrument} has a reference
* to the platform it is mounted on, and the {@code Platform} has a list
of instruments mounted on it.
- * Consequently, walking down the metadata tree can cause infinite
recursivity, unless we keep trace of
+ * Consequently, walking down the metadata tree can cause infinite
recursion, unless we keep trace of
* previously visited metadata objects in order to avoid visiting them
again.
*
- * We use an {@link IdentityHashMap} for that purpose, since the
recursivity problem exists only when revisiting
+ * We use an {@link IdentityHashMap} for that purpose, since the recursion
problem exists only when revisiting
* the exact same instance. Furthermore, {@code HashMap} would not suit
since it invokes {@code equals(Object)}
* and {@code hashCode()}, which are among the methods that we want to
avoid invoking twice.
*/
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
index 778b3a450c..465eeb8586 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
@@ -232,7 +232,7 @@ public abstract class ModifiableMetadata extends
AbstractMetadata {
* but can be changed by a call to {@link #transitionTo(State)}.
*
* <p>{@link State#FINAL} implies that all properties are also final.
- * This recursivity does not necessarily apply to other states. For
example, {@link State#EDITABLE}
+ * This recursion does not necessarily apply to other states. For example,
{@link State#EDITABLE}
* does <strong>not</strong> imply that all {@code ModifiableMetadata}
children are also editable.</p>
*
* <div class="note"><b>API note:</b>
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ObjectPair.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ObjectPair.java
index 2954befb93..b09937e509 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ObjectPair.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ObjectPair.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.Classes;
/**
* A pair of objects in process of being compared by the {@code
MetadataStandard.equals(…)} method.
- * We have to remember those pairs for avoiding infinite recursivity when
comparing metadata objects
+ * We have to remember those pairs for avoiding infinite recursion when
comparing metadata objects
* having cyclic associations. The objects are compared using the identity
comparison.
* Object order is not significant.
*
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueExistencePolicy.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueExistencePolicy.java
index 0939e7e1bc..b0a8adcd0d 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueExistencePolicy.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueExistencePolicy.java
@@ -212,7 +212,7 @@ public enum ValueExistencePolicy {
*
* <p>This method intentionally does not inspect array or collection
elements, since this method
* is invoked from methods doing shallow copy or comparison. If we were
inspecting elements,
- * we would need to add a check against infinite recursivity.</p>
+ * we would need to add a check against infinite recursion.</p>
*
* <p>This method does not check for the {@link
org.apache.sis.util.Emptiable} interface because
* the {@code isEmpty()} method may be costly (for example {@link
AbstractMetadata#isEmpty()}
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
index 0ab6bc5ab5..549940e5f0 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
@@ -224,7 +224,7 @@ public class MetadataWriter extends MetadataSource {
/**
* Implementation of the {@link #add(Object)} method. This method invokes
itself recursively,
- * and maintains a map of metadata inserted up to date in order to avoid
infinite recursivity.
+ * and maintains a map of metadata inserted up to date in order to avoid
infinite recursion.
*
* @param stmt the statement to use for inserting data.
* @param metadata the metadata object to add.
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
index e08892b0b1..7e653cbe86 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ReferenceResolver.java
@@ -259,7 +259,7 @@ public class ReferenceResolver {
* The default implementation keeps a cache during the execution of an
{@code XML.unmarshall(…)} method
* (or actually, during a {@linkplain MarshallerPool pooled unmarshaller}
method).
* If an exception is thrown during the document unmarshalling, this
failure is also recorded in the cache.
- * Therefor, the exception is thrown only during the first attempt to read
the document
+ * Therefore, the exception is thrown only during the first attempt to
read the document
* and {@code null} is returned directly on next attempts for the same
source.
* Exceptions thrown by this method are caught by {@link
#resolve(MarshalContext, Class, XLink) resolve(…)}
* and reported as warnings.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/AbstractMetadataTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/AbstractMetadataTest.java
index d145427240..a0d198d8ad 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/AbstractMetadataTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/AbstractMetadataTest.java
@@ -50,7 +50,7 @@ public final class AbstractMetadataTest extends TestCase {
/**
* Tests the {@link AbstractMetadata#toString()} method on an object
having cyclic associations.
- * In absence of safety guard against infinite recursivity, this test
would produce either a
+ * In absence of safety guard against infinite recursion, this test would
produce either a
* {@link StackOverflowError} or an {@link OutOfMemoryError} (after quite
a long time).
*
* <p>The tree formatted by this test is:</p>
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
index 26f281da6b..e21fdbbbfc 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
@@ -226,7 +226,7 @@ public final class MetadataStandardTest extends TestCase {
/**
* Tests the {@link MetadataStandard#equals(Object, Object,
ComparisonMode)} method on an object
- * having cyclic associations. In absence of safety guard against infinite
recursivity, this test
+ * having cyclic associations. In absence of safety guard against infinite
recursion, this test
* would produce {@link StackOverflowError}.
*/
@Test
@@ -296,7 +296,7 @@ public final class MetadataStandardTest extends TestCase {
/**
* Tests the {@link MetadataStandard#hashCode(Object)} method on an object
having cyclic associations.
- * In absence of safety guard against infinite recursivity, this test
would produce {@link StackOverflowError}.
+ * In absence of safety guard against infinite recursion, this test would
produce {@link StackOverflowError}.
*
* @see AbstractMetadataTest#testHashCodeOnCyclicMetadata()
*/
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PrunerTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PrunerTest.java
index 70cffd42d4..3d68f5b171 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PrunerTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PrunerTest.java
@@ -150,7 +150,7 @@ public final class PrunerTest extends TestCase {
/**
* Tests the {@link AbstractMetadata#isEmpty()} method on a metadata
object having a cycle association.
- * In absence of safety guard against infinite recursivity, this test
would produce {@link StackOverflowError}.
+ * In absence of safety guard against infinite recursion, this test would
produce {@link StackOverflowError}.
*/
@Test
public void testIsEmptyOnCyclicMetadata() {
@@ -196,7 +196,7 @@ public final class PrunerTest extends TestCase {
/**
* Tests the {@link AbstractMetadata#prune()} method on a metadata object
having a cycle association.
- * In absence of safety guard against infinite recursivity, this test
would produce {@link StackOverflowError}.
+ * In absence of safety guard against infinite recursion, this test would
produce {@link StackOverflowError}.
*/
@Test
public void testPruneOnCyclicMetadata() {
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
index 0878aeff5e..0af8af30c2 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
@@ -75,7 +75,7 @@ abstract class AbstractLocationType implements LocationType,
LenientComparable {
/**
* Implementation of {@link #checkForCycles()} to be invoked recursively
for each children.
*
- * @throws IllegalArgumentException if an infinite recursivity is detected.
+ * @throws IllegalArgumentException if an infinite recursion is detected.
*/
private static void checkForCycles(final LocationType type, final
Map<LocationType,Boolean> parents) {
if (parents.put(type, Boolean.TRUE) != null) {
@@ -91,7 +91,7 @@ abstract class AbstractLocationType implements LocationType,
LenientComparable {
* Verifies that there is not cycles in the children.
* This method should be invoked for validating a user argument.
*
- * @throws IllegalArgumentException if an infinite recursivity is detected.
+ * @throws IllegalArgumentException if an infinite recursion is detected.
*/
final void checkForCycles() {
checkForCycles(this, new IdentityHashMap<>());
@@ -144,7 +144,7 @@ abstract class AbstractLocationType implements
LocationType, LenientComparable {
final LocationType that = (LocationType) object;
if (Objects.equals(getName(), that.getName())) {
/*
- * To be safe, we should apply some check against infinite
recursivity here.
+ * To be safe, we should apply some check against infinite
recursion here.
* We do not on the assumption that subclasses verified
that we do not have
* any cycle.
*/
@@ -184,7 +184,7 @@ abstract class AbstractLocationType implements
LocationType, LenientComparable {
public int hashCode() {
int code = Objects.hashCode(getName());
for (final LocationType child : getChildren()) {
- // Take only children name without recursivity over their own
children.
+ // Take only children name without recursion over their own
children.
code = code*31 + Objects.hashCode(child.getName());
}
return code;
@@ -214,7 +214,7 @@ abstract class AbstractLocationType implements
LocationType, LenientComparable {
/**
* Invoked recursively for formatting the given type in the given tree.
- * This method does not perform any check against infinite recursivity
+ * This method does not perform any check against infinite recursion
* on the assumption that subclasses verified this constraint by calls
* to {@link #checkForCycles()}.
*/
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
index 8fa1657115..107ac5a98c 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
@@ -237,7 +237,7 @@ public final class LocationTypeTest extends TestCase {
}
/**
- * Tests the safety against infinite recursivity.
+ * Tests the safety against infinite recursion.
* This method attempts to add "town" as a child of "street".
*/
@Test
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index 7b3b9b7f4c..ee27c22b00 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@ -214,7 +214,7 @@ abstract class AbstractDerivedCRS extends AbstractCRS
implements DerivedCRS {
if (super.equals(object, mode)) {
final boolean strict = (mode == ComparisonMode.STRICT);
/*
- * Avoid never-ending recursivity: Conversion has a `targetCRS`
field (inherited from
+ * Avoid never-ending recursion: Conversion has a `targetCRS`
field (inherited from
* the AbstractCoordinateOperation super-class) that is set to
this AbstractDerivedCRS.
*
* Do NOT compare the baseCRS explicitly. This is done implicitely
in the comparison of the Conversion
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index 95dd062d1c..38ea78fc05 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -324,7 +324,7 @@ public abstract class ConcurrentAuthorityFactory<DAO
extends GeodeticAuthorityFa
/*
* Create a cache using soft references and allowing key collisions.
*
- * NOTE 1: key collision is usually an error. But in this case we
allow them in order to enable recursivity.
+ * NOTE 1: key collision is usually an error. But in this case we
allow them in order to enable recursion.
* If during the creation of an object the program asks to this
ConcurrentAuthorityFactory for the same object
* (using the same key), then the default Cache implementation
considers that situation as an error unless the
* above property has been set to `true`.
@@ -1825,7 +1825,7 @@ public abstract class ConcurrentAuthorityFactory<DAO
extends GeodeticAuthorityFa
private static final int DOMAIN_COUNT = 4;
/**
- * The finder on which to delegate the work. This is acquired by
{@link #acquire()}
+ * The finder to which to delegate the work. This is acquired by
{@link #acquire()}
* <strong>and must be released</strong> by call to {@link #release()}
once finished.
*/
private transient IdentifiedObjectFinder finder;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
index c1bf055de5..931fcec289 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
@@ -46,7 +46,7 @@ final class LazySynchronizedIterator<E> extends
AbstractIterator<E> {
private Iterable<? extends E> provider;
/**
- * The iterator on which to delegate calls to {@link #hasNext()} and
{@link #next()}.
+ * The iterator to which to delegate calls to {@link #hasNext()} and
{@link #next()}.
* This iterator is provided by {@code
providers[providerIndex].iterator()}.
*/
private Iterator<? extends E> it;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index cdf84ef70a..f1157ed54d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -288,7 +288,7 @@ public class EPSGDataAccess extends
GeodeticAuthorityFactory implements CRSAutho
/**
* A safety guard for preventing never-ending loops in recursive calls to
some {@code createFoo(String)} methods.
- * Recursivity may happen while creating Bursa-Wolf parameters, projected
CRS if the database has erroneous data,
+ * Recursion may happen while creating Bursa-Wolf parameters, projected
CRS if the database has erroneous data,
* compound CRS if there is cycles, or coordinate operations.
*
* <h4>Example</h4>
@@ -1025,9 +1025,9 @@ codes: for (int i=0; i<codes.length; i++) {
}
/**
- * Invoked after the block protected against infinite recursivity.
+ * Invoked after the block protected against infinite recursion.
*/
- private void endOfRecursivity(final Class<?> type, final Integer code)
throws FactoryException {
+ private void endOfRecursion(final Class<?> type, final Integer code)
throws FactoryException {
if (safetyGuard.remove(code) != type) {
throw new FactoryException(String.valueOf(code)); // Would be an
EPSGDataAccess bug if it happen.
}
@@ -1389,7 +1389,7 @@ codes: for (int i=0; i<codes.length; i++) {
try {
datum =
owner.createGeographicCRS(geoCode).getDatum();
} finally {
- endOfRecursivity(GeographicCRS.class, epsg);
+ endOfRecursion(GeographicCRS.class, epsg);
}
}
crs =
crsFactory.createGeographicCRS(createProperties("Coordinate Reference System",
@@ -1477,7 +1477,7 @@ codes: for (int i=0; i<codes.length; i++) {
Semaphores.clear(Semaphores.SUSPEND_PARAMETER_CHECK, suspendParamChecks);
}
} finally {
- endOfRecursivity(ProjectedCRS.class, epsg);
+ endOfRecursion(ProjectedCRS.class, epsg);
}
break;
}
@@ -1521,7 +1521,7 @@ codes: for (int i=0; i<codes.length; i++) {
crs1 =
owner.createCoordinateReferenceSystem(code1);
crs2 =
owner.createCoordinateReferenceSystem(code2);
} finally {
- endOfRecursivity(CompoundCRS.class, epsg);
+ endOfRecursion(CompoundCRS.class, epsg);
}
// Note: Do not invoke `createProperties` sooner.
crs =
crsFactory.createCompoundCRS(createProperties("Coordinate Reference System",
@@ -1763,7 +1763,7 @@ codes: for (int i=0; i<codes.length; i++) {
{
/*
* We do not provide TOWGS84 information for WGS84 itself or for any
other datum on our list of target datum,
- * in order to avoid infinite recursivity. The `ensureNonRecursive`
call is an extra safety check which should
+ * in order to avoid infinite recursion. The `ensureNonRecursive` call
is an extra safety check which should
* never fail, unless TARGET_CRS and TARGET_DATUM values do not agree
with database content.
*/
if (code == BursaWolfInfo.TARGET_DATUM) {
@@ -1824,7 +1824,7 @@ codes: for (int i=0; i<codes.length; i++) {
try {
datum = owner.createGeodeticDatum(String.valueOf(info.target));
} finally {
- endOfRecursivity(BursaWolfParameters.class, code);
+ endOfRecursion(BursaWolfParameters.class, code);
}
/*
* Accept only Bursa-Wolf parameters between datum that use the
same prime meridian.
@@ -2924,7 +2924,7 @@ next: while (r.next()) {
operations[i] =
owner.createCoordinateOperation(codes.get(i));
}
} finally {
- endOfRecursivity(CoordinateOperation.class, epsg);
+ endOfRecursion(CoordinateOperation.class, epsg);
}
return
copFactory.createConcatenatedOperation(opProperties, operations);
} else {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index 614bff5672..27d6ecbb75 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@ -836,7 +836,7 @@ check: for (int isTarget=0; ; isTarget++) { //
0 == source check; 1
Objects.equals(transform,
that.transform) &&
Objects.equals(coordinateOperationAccuracy,
that.coordinateOperationAccuracy))
{
- // Check against never-ending recursivity with DerivedCRS.
+ // Check against never-ending recursion with DerivedCRS.
if (Semaphores.queryAndSet(Semaphores.CONVERSION_AND_CRS))
{
return true;
} else try {
@@ -865,7 +865,7 @@ check: for (int isTarget=0; ; isTarget++) { //
0 == source check; 1
* from AbstractDerivedCRS, otherwise we would fall in an
infinite recursive loop
* (because targetCRS is the DerivedCRS, which in turn
wants to compare this operation).
*
- * We also opportunistically use this "anti-recursivity"
check for another purpose.
+ * We also opportunistically use this "anti-recursion"
check for another purpose.
* The Semaphores.COMPARING flag should be set only when
AbstractDerivedCRS is comparing
* its "from base" conversion. The flag should never be
set in any other circumstance,
* since this is an internal Apache SIS mechanism. If we
know that we are comparing the
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index 9df0ff8833..971a46f18d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@ -139,7 +139,7 @@ public class CoordinateOperationFinder extends
CoordinateOperationRegistry {
/**
* The pair of source and target CRS for which we already searched a
coordinate operation.
- * This is used as a safety against infinite recursivity.
+ * This is used as a safety against infinite recursion.
*/
private final Map<CRSPair,Boolean> previousSearches;
@@ -247,7 +247,7 @@ public class CoordinateOperationFinder extends
CoordinateOperationRegistry {
* We do not perform this verification on the first invocation because
it was already verified by
* DefaultCoordinateOperationFactory.createOperation(…). We do not
block if the operation is in
* process of being computed in another thread because of the risk of
deadlock. If the operation
- * is not in the cache, store the key in our internal map for
preventing infinite recursivity.
+ * is not in the cache, store the key in our internal map for
preventing infinite recursion.
*/
final CRSPair key = new CRSPair(sourceCRS, targetCRS);
if (useCache && stopAtFirst && !previousSearches.isEmpty()) {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 84062a6b64..069ee0f462 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -638,7 +638,7 @@ public class DefaultMathTransformFactory extends
AbstractFactory implements Math
}
/**
- * Returns the builder on which to delegate the {@code MathTransform}
creation.
+ * Returns the builder to which to delegate the {@code MathTransform}
creation.
*/
final ParameterizedTransformBuilder builder() throws FactoryException {
if (builder == null) {
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
index e07cb502fc..7159dfc682 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java
@@ -139,7 +139,7 @@ public final class ParametersTest extends TestCase {
public void testCopy() {
/*
* The descriptor to be used for this test. This descriptor contain at
least
- * one subgroup, for testing the Parameters.copy(...) method
recursivity.
+ * one subgroup, for testing the Parameters.copy(...) method recursion.
*/
final String subgroupName =
DefaultParameterDescriptorGroupTest.M1_M1_O1_O2.getName().getCode();
final DefaultParameterDescriptorGroup descriptor = new
DefaultParameterDescriptorGroup(
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
index b8f57cd585..6ac5facfd3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ClenshawSummation.java
@@ -428,7 +428,7 @@ public final class ClenshawSummation {
multiplicands = new int[length][length];
multiplicands[length - 1][0] = 1;
if (b2 != null) {
- // Add −bₙ₊₂ — we add terms at the same power of cos(θ),
therefor all indices match.
+ // Add −bₙ₊₂ — we add terms at the same power of cos(θ),
therefore all indices match.
for (int term=0; term < b2.multiplicands.length; term++) {
final int max = b2.multiplicands[term].length;
for (int power=0; power<max; power++) {
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index 3b2398dda8..68e675f990 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@ -73,7 +73,7 @@ import org.opengis.test.referencing.TransformTestCase;
* </ul>
*
* <h2>Life cycle</h2>
- * GeoAPI tests have a state. Therefor, a new instance of {@code
MathTransformTestCase} should be created
+ * GeoAPI tests have a state. Therefore, a new instance of {@code
MathTransformTestCase} should be created
* for each test method to execute. However, it may be costly if the
constructor requires large resources
* (e.g., a connection to an EPSG database). For making easier to reuse the
same {@code TestCase} instance,
* a {@link #reset()} method is provided. Subclasses are responsible to
override that method with the
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
index 6866fb0fa5..ad2f8ec144 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java
@@ -51,7 +51,7 @@ public class MathTransformWrapper extends FormattableObject
implements MathTrans
private static final long serialVersionUID = -5180954407422828265L;
/**
- * The math transform on which to delegate the work.
+ * The math transform to which to delegate the work.
*/
@SuppressWarnings("serial") // Most Apache SIS implementations
are serializable.
public final MathTransform transform;
@@ -59,7 +59,7 @@ public class MathTransformWrapper extends FormattableObject
implements MathTrans
/**
* Creates a new wrapper which delegates its work to the specified math
transform.
*
- * @param transform the math transform on which to delegate the work.
+ * @param transform the math transform to which to delegate the work.
*/
public MathTransformWrapper(final MathTransform transform) {
this.transform = Objects.requireNonNull(transform);
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/MultiResolutionImage.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/MultiResolutionImage.java
index 7188a27f74..617f788f75 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/MultiResolutionImage.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/MultiResolutionImage.java
@@ -110,7 +110,7 @@ final class MultiResolutionImage extends
GridResourceWrapper implements StoreRes
}
/**
- * Creates the resource on which to delegate operations.
+ * Creates the resource to which to delegate operations.
* The source is the first image, the one having finest resolution.
* By Cloud Optimized GeoTIFF (COG) convention, this is the image
containing metadata (CRS).
* This method is invoked in a synchronized block when first needed and
the result is cached.
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 407604a885..2ad11cf80b 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
@@ -123,7 +123,7 @@ final class NativeMetadata extends GeoKeysLoader {
int imageNumber = 0;
while ((nextIFD = readInt(false)) != 0) {
if (!doneIFD.add(nextIFD)) {
- // Safety against infinite recursivity.
+ // Safety against infinite recursion.
break;
}
final TreeTable.Node image = root.newChild();
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 ed74ed213f..77f641d19d 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
@@ -102,7 +102,7 @@ final class Reader extends IOBase {
/**
* Offsets of all <i>Image File Directory</i> (IFD) that have been read so
far.
- * This field is used only as a protection against infinite recursivity,
by preventing
+ * This field is used only as a protection against infinite recursion, by
preventing
* the same offset to appear twice.
*
* @see #readNextImageOffset()
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/Localization.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/Localization.java
index 82974b59c1..4d8cbffd0b 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/Localization.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/Localization.java
@@ -166,7 +166,7 @@ final class Localization {
int largestPart = 0;
for (int i=0; i<indices.length; i++) {
final int length = lengths[i];
- if (length >= size) throw e; // Safety
against infinite recursivity.
+ if (length >= size) throw e; // Safety
against infinite recursion.
indices[i] = Arrays.copyOf(indices[i], length);
if (length > maxLength) {
maxLength = length;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
index e07765449d..53c794b92c 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
@@ -196,7 +196,7 @@ final class FeatureAdapter {
for (final Relation dependency : table.importedKeys) {
if (dependency.excluded) continue;
if (dependency != noFollow) {
- dependency.startFollowing(following); //
Safety against never-ending recursivity.
+ dependency.startFollowing(following); //
Safety against never-ending recursion.
associationNames [count] = dependency.propertyName;
foreignerKeyIndices[count] = getColumnIndices(sql,
dependency, columnIndices);
dependencies [count] = new
FeatureAdapter(dependency.getSearchTable(), metadata, following, noFollow);
@@ -215,7 +215,7 @@ final class FeatureAdapter {
*/
for (final Relation dependency : table.exportedKeys) {
if (dependency.excluded) continue;
- dependency.startFollowing(following); //
Safety against never-ending recursivity.
+ dependency.startFollowing(following); //
Safety against never-ending recursion.
final Table foreigner = dependency.getSearchTable();
final Relation inverse = foreigner.getInverseOf(dependency,
table.name);
associationNames [count] = dependency.propertyName;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
index feebce0ee6..ae9e7dfd7a 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
@@ -413,7 +413,7 @@ final class Relation extends TableReference {
/**
* Adds this relation to the given list, making sure that the relation has
not already been added.
- * The check for previous existence of {@code this} relation is for
preventing infinite recursivity.
+ * The check for previous existence of {@code this} relation is for
preventing infinite recursion.
*/
final void startFollowing(final List<Relation> following) throws
InternalDataStoreException {
for (int i = following.size(); --i >= 0;) {
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
index ff13364df8..f9f06ef535 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
@@ -383,7 +383,7 @@ final class Table extends AbstractFeatureSet {
/**
* If this table imports the inverse of the given relation, returns the
imported relation.
- * Otherwise returns {@code null}. This method is used for preventing
infinite recursivity.
+ * Otherwise returns {@code null}. This method is used for preventing
infinite recursion.
*
* @param exported the relation exported by another table.
* @param exportedOwner {@code exported.owner.name}: table that contains
the {@code exported} relation.
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
index 69c52ca101..e77b57d057 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
*/
public final class PaginedDoubleStream extends DoubleStreamWrapper {
/**
- * The root stream on which to delegate {@code skip} and {@code limit}
operations.
+ * The root stream to which to delegate {@code skip} and {@code limit}
operations.
*/
private Stream<?> root;
@@ -40,7 +40,7 @@ public final class PaginedDoubleStream extends
DoubleStreamWrapper {
* Creates a new mapped stream.
*
* @param source the stream to wrap.
- * @param root the stream on which to delegate {@code skip} and {@code
limit} operations.
+ * @param root the stream to which to delegate {@code skip} and {@code
limit} operations.
*/
public PaginedDoubleStream(final DoubleStream source, final Stream<?>
root) {
super(source);
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
index 2c4c1d92b2..6e012f43ee 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
*/
public final class PaginedStream<T> extends StreamWrapper<T> {
/**
- * The root stream on which to delegate {@code skip} and {@code limit}
operations.
+ * The root stream to which to delegate {@code skip} and {@code limit}
operations.
*/
private Stream<?> root;
@@ -43,7 +43,7 @@ public final class PaginedStream<T> extends StreamWrapper<T> {
* Creates a new mapped stream.
*
* @param source the stream to wrap.
- * @param root the stream on which to delegate {@code skip} and {@code
limit} operations.
+ * @param root the stream to which to delegate {@code skip} and {@code
limit} operations.
*/
public PaginedStream(final Stream<T> source, final Stream<?> root) {
super(source);
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSliceLocator.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSliceLocator.java
index 229f5fff8a..9c0ede5387 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSliceLocator.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSliceLocator.java
@@ -142,7 +142,7 @@ final class GridSliceLocator {
* Returns the extent to use for querying a coverage from the slice at the
given index.
*
* @param extent extent in units of aggregated grid coverage cells.
- * @param slice index of the slice on which to delegate an operation.
+ * @param slice index of the slice to which to delegate an operation.
* @return extent in units of the slice grid coverage.
*/
final GridExtent toSliceExtent(final GridExtent extent, final int slice) {
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/GridResourceWrapper.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/GridResourceWrapper.java
index 80ea66fd19..bface76118 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/GridResourceWrapper.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/GridResourceWrapper.java
@@ -66,10 +66,10 @@ public abstract class GridResourceWrapper implements
GridCoverageResource {
protected abstract Object getSynchronizationLock();
/**
- * Creates the resource on which to delegate operations.
+ * Creates the resource to which to delegate operations.
* This method is invoked in a synchronized block when first needed and
the result is cached.
*
- * @return the resource on which to delegate operations.
+ * @return the resource to which to delegate operations.
* @throws DataStoreException if the resource cannot be created.
*/
protected abstract GridCoverageResource createSource() throws
DataStoreException;
@@ -78,7 +78,7 @@ public abstract class GridResourceWrapper implements
GridCoverageResource {
* Returns the potentially cached source.
* This method invokes {@link #createSource()} when first needed and
caches the result.
*
- * @return the resource on which to delegate operations.
+ * @return the resource to which to delegate operations.
* @throws DataStoreException if the resource cannot be created.
*/
protected final GridCoverageResource source() throws DataStoreException {
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
index c9d6275046..487fe9ce8b 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
@@ -264,7 +264,7 @@ public class ConverterRegistry {
* for the place where to put the given converter in the hierarchy
of converters.
*/
if (!isInitialized) {
- isInitialized = true; // Before 'initialize()' for
preventing infinite recursivity.
+ isInitialized = true; // Before 'initialize()' for
preventing infinite recursion.
initialize();
}
for (Class<? super T> i=targetClass; i!=null && i!=stopAt;
i=i.getSuperclass()) {
@@ -451,7 +451,7 @@ public class ConverterRegistry {
* declared in all `modules-info.class` files found on the module
path and try again.
*/
if (!isInitialized) {
- isInitialized = true; // Before 'initialize()' for
preventing infinite recursivity.
+ isInitialized = true; // Before 'initialize()' for
preventing infinite recursion.
initialize();
converter = get(key);
if (converter != null) {
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
index 30d2b55c4b..277376d995 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
@@ -157,7 +157,7 @@ public final class SystemRegistry extends ConverterRegistry
{
* to java.util.Date was created by the super class, that conversion
would not contain
* an inverse conversion from java.util.Date to java.sql.Date.
*/
- if (tryInverse(targetClass) && !tryInverse(sourceClass)) { // The
! is for preventing infinite recursivity.
+ if (tryInverse(targetClass) && !tryInverse(sourceClass)) { // The
! is for preventing infinite recursion.
try {
return findExact(targetClass, sourceClass).inverse();
} catch (UnconvertibleObjectException e) {
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
index 9327ed7d30..0cefe1413e 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
@@ -774,7 +774,7 @@ public final class MathFunctions extends Static {
/*
* Other NaN values might have a meaning (e.g. NaN(1) = forest,
NaN(2) = lake, etc.)
* See above toNanFloat(int) and toNaNOrdinal(float) methods. When
truncating the value we
- * might change the meaning, which could cause several issues
later. Therefor we conservatively
+ * might change the meaning, which could cause several issues
later. Therefore we conservatively
* collapse all NaNs to the default NaN for now (this may be
revisited in a future SIS version).
*/
return Double.NaN;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
index 4bff0ab27f..6b0f75b19c 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
@@ -586,7 +586,7 @@ public abstract class Vector extends AbstractList<Number>
implements RandomAcces
* patterns that at repeated at a regular interval on the whole vector;
this method does not search for repetitions
* occurring at irregular intervals. This method returns an array of
typically 0, 1 or 2 elements where zero element
* means that no repetition has been found, one element describes a
repetition (see the example below), and two elements
- * describes a repetition of the repetitions (examples below). More
elements (deeper recursivity) are theoretically
+ * describes a repetition of the repetitions (examples below). More
elements (deeper recursion) are theoretically
* possible but not yet implemented.
*
* <p>If the values in this vector are of the form (<var>x</var>,
<var>x</var>, …, <var>x</var>, <var>y</var>, <var>y</var>,
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
index f004670739..74a02a4d46 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
@@ -615,7 +615,7 @@ pathTree: for (int j=0; ; j++) {
attributes.getValue(Attributes.Name.SPECIFICATION_VERSION), false);
if (title == null) {
// We really need a non-null value in
order to protect this code
- // against infinite recursivity.
+ // against infinite recursion.
title = "";
}
}
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Semaphores.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Semaphores.java
index ef1651a77c..3e3c6642b9 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Semaphores.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Semaphores.java
@@ -44,7 +44,7 @@ public final class Semaphores {
public static final int METADATA_ONLY = 2;
/**
- * A lock for avoiding never-ending recursivity in the {@code equals}
method of {@code AbstractDerivedCRS}
+ * A lock for avoiding never-ending recursion in the {@code equals} method
of {@code AbstractDerivedCRS}
* and {@link
org.apache.sis.referencing.operation.AbstractCoordinateOperation}.
* It is set to {@code true} when a comparison is in progress. This lock
is necessary because
* {@code AbstractDerivedCRS} objects contain a {@code conversionFromBase}
field, which contains a
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Cache.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Cache.java
index 0df482b7d8..5a99b2ddf9 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Cache.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/Cache.java
@@ -1345,7 +1345,7 @@ public class Cache<K,V> extends AbstractMap<K,V>
implements ConcurrentMap<K,V> {
* ignored by this {@code Cache} class. However, those threads still
return their computed
* values to their callers.</p>
*
- * <p>This property can also be set in order to allow some recursivity. If
during the creation
+ * <p>This property can also be set in order to allow some recursion. If
during the creation
* of an object, the program asks to this {@code Cache} for the same
object (using the same key),
* then the default {@code Cache} implementation will consider this
situation as a key collision
* unless this property has been set to {@code true}.</p>
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
index f4a5d30fa7..973054de32 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/DefaultTreeTable.java
@@ -686,7 +686,7 @@ public class DefaultTreeTable implements TreeTable,
Cloneable, Serializable {
* <h4>Implementation note</h4>
* This method ignores the parent because:
* <ul>
- * <li>When comparing the children recursively, comparing the
parents would cause infinite recursivity.</li>
+ * <li>When comparing the children recursively, comparing the
parents would cause infinite recursion.</li>
* <li>For consistency with the {@link #clone()} method, which
cannot clone the parent.</li>
* <li>For making possible to compare branches instead of only whole
trees.</li>
* </ul>
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java
index adb5b5b44e..e3645161cf 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTable.java
@@ -246,7 +246,7 @@ public interface TreeTable {
*
* The node returned by {@link #getParent()} shall
<strong>not</strong> be taken in account.
* It is necessary to ignore the parent for consistency with
{@linkplain DefaultTreeTable#clone() clone}
- * and for avoiding infinite recursivity when comparing the children.
+ * and for avoiding infinite recursion when comparing the children.
* A third reason is given below.
*
* <h4>Purpose of this method: example with ISO metadata</h4>
@@ -274,7 +274,7 @@ public interface TreeTable {
* <p>In this use case, the {@code Node.equals(Object)} implementation
needs only to compare the wrapped
* metadata (usually given by the {@linkplain #getUserObject() user
object}) since the node content,
* including the list of children, is fully determined by those
metadata. An identity comparison
- * (with {@code ==}) is sufficient for the purpose of avoiding
infinite recursivity.</p>
+ * (with {@code ==}) is sufficient for the purpose of avoiding
infinite recursion.</p>
*
* <h4>Flexibility in implementations</h4>
* The above list specifies minimal conditions that must be true when
two nodes are considered equal.
@@ -299,7 +299,7 @@ public interface TreeTable {
* Implementation details may vary, for example in the way to compare
{@code null} user objects or by invoking
* {@link Object#equals(Object)} instead of performing identity
comparisons. Note however that since this
* method purpose is to detect cyclic graphs (see above example), user
objects should be compared with
- * {@code equals(Object)} only if their implementations are known to
be safe against infinite recursivity.
+ * {@code equals(Object)} only if their implementations are known to
be safe against infinite recursion.
*
* @param other the other object to compare with this node.
* @return whether the two objects are nodes with equal values and
equal children, ignoring parents.
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
index 9907713a04..1387c5bbe2 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/TreeTableFormat.java
@@ -81,7 +81,7 @@ import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
* then insert the {@code "……"} string, repeat the {@code '…'} character as
many time as needed
* (may be zero), and finally insert a space</q>.
*
- * <h2>Safety against infinite recursivity</h2>
+ * <h2>Safety against infinite recursion</h2>
* Some {@code TreeTable} implementations generate the nodes dynamically as
wrappers around Java objects.
* Such Java objects may contain cyclic associations (<var>A</var> contains
<var>B</var> contains <var>C</var>
* contains <var>A</var>), which result in a tree of infinite depth. Some
examples can be found in ISO 19115
@@ -168,7 +168,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
* The set to be given to {@link Writer} constructor,
* created when first needed and reused for subsequent formatting.
*/
- private transient Set<TreeTable.Node> recursivityGuard;
+ private transient Set<TreeTable.Node> recursionGuard;
/**
* A clone of the number format to be used with different settings (number
of fraction digits, scientific notation).
@@ -659,9 +659,9 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
private final boolean multiLineCells;
/**
- * The node that have already been formatted. We use this map as a
safety against infinite recursivity.
+ * The node that have already been formatted. We use this map as a
safety against infinite recursion.
*/
- private final Set<TreeTable.Node> recursivityGuard;
+ private final Set<TreeTable.Node> recursionGuard;
/**
* Creates a new instance which will write to the given appendable.
@@ -669,10 +669,10 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
* @param out where to format the tree.
* @param tree the tree table to format.
* @param columns the columns of the tree table to format.
- * @param recursivityGuard an initially empty set.
+ * @param recursionGuard an initially empty set.
*/
Writer(final Appendable out, final TreeTable tree, final
TableColumn<?>[] columns,
- final Set<TreeTable.Node> recursivityGuard)
+ final Set<TreeTable.Node> recursionGuard)
{
super(columns.length >= 2 ? new TableAppender(out, "") : out);
multiLineCells = (super.out == out);
@@ -680,7 +680,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
this.formats = getFormats(columns, false);
this.values = new Object[columns.length];
this.isLast = new boolean[8];
- this.recursivityGuard = recursivityGuard;
+ this.recursionGuard = recursionGuard;
@SuppressWarnings("LocalVariableHidesMemberVariable") // To be
stored in the field if successful.
Predicate<TreeTable.Node> filter = nodeFilter;
@@ -792,7 +792,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
isLast = Arrays.copyOf(isLast, level*2);
}
/*
- * Format the children only if we do not detect an infinite
recursivity. Our recursivity detection
+ * Format the children only if we do not detect an infinite
recursion. Our recursion detection
* algorithm assumes that the Node.equals(Object) method has been
implemented as specified in its javadoc.
* In particular, the implementation may compare the values and
children but shall not compare the parent.
*
@@ -801,7 +801,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
* particular case.
*/
final boolean omitCheck =
node.getClass().isAnnotationPresent(Acyclic.class);
- if (omitCheck || recursivityGuard.add(node)) {
+ if (omitCheck || recursionGuard.add(node)) {
boolean needLineSeparator = multiLineCells;
final String lineSeparator = needLineSeparator ?
getLineSeparator() : null;
final Iterator<? extends TreeTable.Node> it =
node.getChildren().iterator();
@@ -818,7 +818,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
if (lineSeparator != null) {
setLineSeparator(lineSeparator); // Restore
previous state.
}
- if (!omitCheck && !recursivityGuard.remove(node)) {
+ if (!omitCheck && !recursionGuard.remove(node)) {
/*
* Assuming that Node.hashCode() and Node.equals(Object)
implementation are not broken,
* this exception may happen only if the node content
changed during this method execution.
@@ -827,7 +827,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
}
} else {
/*
- * Detected a recursivity. Format "(cycle omitted)" just below
the node.
+ * Detected a recursion. Format "(cycle omitted)" just below
the node.
*/
for (int i=0; i<level; i++) {
out.append(getTreeSymbols(true, isLast[i]));
@@ -882,15 +882,15 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
} else {
columns = tree.getColumns().toArray(TableColumn<?>[]::new);
}
- if (recursivityGuard == null) {
- recursivityGuard = new HashSet<>();
+ if (recursionGuard == null) {
+ recursionGuard = new HashSet<>();
}
try {
- final Writer out = new Writer(toAppendTo, tree, columns,
recursivityGuard);
+ final Writer out = new Writer(toAppendTo, tree, columns,
recursionGuard);
out.format(tree.getRoot(), 0);
out.flush();
} finally {
- recursivityGuard.clear();
+ recursionGuard.clear();
}
}
@@ -960,7 +960,7 @@ public class TreeTableFormat extends
TabularFormat<TreeTable> {
@Override
public TreeTableFormat clone() {
final TreeTableFormat c = (TreeTableFormat) super.clone();
- c.recursivityGuard = null;
+ c.recursionGuard = null;
return c;
}
}
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Acyclic.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Acyclic.java
index f62d6f6939..e8507f2a5f 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Acyclic.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Acyclic.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* Marker annotation for implementation that promise to not introduce a cyclic
graph
* in a structure that could potentially contains such cycles. If this
annotation is
* present, then some Apache SIS classes may skip the safety checks against
infinite
- * recursivity.
+ * recursion.
*
* <p>This annotation is not inherited, since a promise that a particular
class will not
* introduce cyclic graphs does not mean that subclasses will hold the same
promise.</p>
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/AbstractMap.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/AbstractMap.java
index 921f6a90dd..fda6c3c8f4 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/AbstractMap.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/AbstractMap.java
@@ -189,7 +189,7 @@ public abstract class AbstractMap<K,V> implements Map<K,V> {
*/
protected static class IteratorAdapter<K,V> extends EntryIterator<K,V> {
/**
- * The standard iterator on which to delegate the work.
+ * The standard iterator to which to delegate the work.
* It is safe to change this value before to invoke {@link #next()}.
*/
protected Iterator<Entry<K,V>> it;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Cloner.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Cloner.java
index 7d5f255059..69fc29aecc 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Cloner.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/privy/Cloner.java
@@ -56,7 +56,7 @@ public final class Cloner {
/**
* Results of cloning instances previously meet during this {@code Cloner}
lifetime.
- * This is used for preserving reference graph, and also as a safety
against infinite recursivity.
+ * This is used for preserving reference graph, and also as a safety
against infinite recursion.
* Keys must be compared using identity comparison, not {@link
Object#equals(Object)}.
*/
private final IdentityHashMap<Object,Object> cloneResults;
diff --git
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/MapLayer.java
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/MapLayer.java
index c99f33ce52..dae591e7b3 100644
---
a/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/MapLayer.java
+++
b/incubator/src/org.apache.sis.portrayal.map/main/org/apache/sis/map/MapLayer.java
@@ -222,7 +222,7 @@ public class MapLayer extends MapItem {
/**
* Returns the global opacity of this layer.
* Based on the rendering context this property may be impossible to
implement,
- * it is therefor recommended to modify the style symbolizer opacity
properties.
+ * it is therefore recommended to modify the style symbolizer opacity
properties.
*
* @return opacity between 0.0 and 1.0
*/
diff --git
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
index 051257a245..881fbfd841 100644
---
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
+++
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/coverage/ImagePropertyExplorer.java
@@ -117,7 +117,7 @@ public class ImagePropertyExplorer extends Widget {
* after a {@link ResampledImage} is found. Images not present in this map
are implicitly associated to the
* {@code false} value.
*
- * <p>This map is also opportunistically used for avoiding never-ending
recursivity
+ * <p>This map is also opportunistically used for avoiding never-ending
recursion
* during the traversal of image sources.</p>
*
* @see #setImage(RenderedImage, Rectangle)
@@ -577,7 +577,7 @@ public class ImagePropertyExplorer extends Widget {
* immediately after an {@linkplain #image} change; the update may be
deferred until the tree become visible.
*
* @param imageUseBoundsCS the {@link #imageUseBoundsCS} as an initially
empty map. This map is
- * populated by this method and opportunistically used for
avoiding infinite recursivity.
+ * populated by this method and opportunistically used for
avoiding infinite recursion.
*/
private static void setTreeNode(final TreeItem<RenderedImage> root, final
RenderedImage image,
final Map<RenderedImage,Boolean> imageUseBoundsCS, Boolean
boundsApplicable)
