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 d1b7ace8700729fdbd0aa92579b9a7246969188b Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Dec 27 20:46:13 2021 +0100 Spelling fixes. --- .../sis-console/src/main/java/org/apache/sis/console/Command.java | 4 ++-- .../sis-console/src/main/java/org/apache/sis/console/Option.java | 4 ++-- .../src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java | 2 +- .../src/main/java/org/apache/sis/metadata/PropertyAccessor.java | 4 ++-- .../src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java | 2 +- .../java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java | 2 +- core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java | 2 +- .../src/test/java/org/apache/sis/test/xml/DocumentComparator.java | 4 ++-- core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java | 4 ++-- .../src/main/java/org/apache/sis/geometry/GeneralEnvelope.java | 2 +- .../apache/sis/internal/referencing/provider/MillerCylindrical.java | 2 +- .../java/org/apache/sis/parameter/DefaultParameterDescriptor.java | 2 +- .../src/main/java/org/apache/sis/parameter/TensorParameters.java | 2 +- .../apache/sis/referencing/operation/CoordinateOperationRegistry.java | 2 +- .../sis/referencing/operation/DefaultConcatenatedOperation.java | 4 ++-- .../sis/referencing/operation/DefaultCoordinateOperationFactory.java | 2 +- .../java/org/apache/sis/referencing/operation/matrix/Matrices.java | 4 ++-- .../java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java | 2 +- .../org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java | 2 +- .../referencing/operation/transform/CoordinateSystemTransform.java | 4 ++-- .../sis/referencing/operation/transform/PassThroughTransform.java | 4 ++-- .../java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java | 2 +- .../src/main/java/org/apache/sis/internal/system/DataDirectory.java | 2 +- .../main/java/org/apache/sis/internal/system/DefaultFactories.java | 2 +- .../src/main/java/org/apache/sis/math/DecimalFunctions.java | 2 +- core/sis-utility/src/main/java/org/apache/sis/util/Classes.java | 2 +- .../src/test/java/org/apache/sis/util/collection/CacheTest.java | 2 +- .../src/test/java/org/apache/sis/util/collection/RangeSetTest.java | 2 +- .../main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +- .../java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java | 2 +- .../java/org/apache/sis/internal/storage/MetadataBuilderTest.java | 2 +- 31 files changed, 40 insertions(+), 40 deletions(-) diff --git a/application/sis-console/src/main/java/org/apache/sis/console/Command.java b/application/sis-console/src/main/java/org/apache/sis/console/Command.java index cc50d8b..75758ec 100644 --- a/application/sis-console/src/main/java/org/apache/sis/console/Command.java +++ b/application/sis-console/src/main/java/org/apache/sis/console/Command.java @@ -56,8 +56,8 @@ import org.apache.sis.util.logging.MonolineFormatter; * <tr><td>{@code --timezone} </td><td>The timezone for the dates to be formatted.</td></tr> * <tr><td>{@code --encoding} </td><td>The encoding to use for the command outputs and some inputs.</td></tr> * <tr><td>{@code --colors} </td><td>Whether colorized output shall be enabled.</td></tr> - * <tr><td>{@code --brief} </td><td>Whether the output should contains only brief information.</td></tr> - * <tr><td>{@code --verbose} </td><td>Whether the output should contains more detailed information.</td></tr> + * <tr><td>{@code --brief} </td><td>Whether the output should contain only brief information.</td></tr> + * <tr><td>{@code --verbose} </td><td>Whether the output should contain more detailed information.</td></tr> * <tr><td>{@code --debug} </td><td>Prints full stack trace in case of failure.</td></tr> * <tr><td>{@code --help} </td><td>Lists the options available for a specific command.</td></tr> * </table></blockquote> diff --git a/application/sis-console/src/main/java/org/apache/sis/console/Option.java b/application/sis-console/src/main/java/org/apache/sis/console/Option.java index 03b0bc6..62801ce 100644 --- a/application/sis-console/src/main/java/org/apache/sis/console/Option.java +++ b/application/sis-console/src/main/java/org/apache/sis/console/Option.java @@ -65,13 +65,13 @@ enum Option { COLORS(true), /** - * Whether the output should contains only brief information. + * Whether the output should contain only brief information. * This option expects no value. */ BRIEF(false), /** - * Whether the output should contains more detailed information. + * Whether the output should contain more detailed information. * This option expects no value. */ VERBOSE(false), diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java index fe9dfc1..c65ba81 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridViewSkin.java @@ -108,7 +108,7 @@ final class GridViewSkin extends VirtualContainerBase<GridView, GridRow> impleme double headerWidth, cellWidth; /** - * Width of the region where to write the text in a cell. Should be equals or slightly smaller + * Width of the region where to write the text in a cell. Should be equal or slightly smaller * than {@link #cellWidth}. We use a smaller width for leaving a small margin between cells. * * <p>This field is written by {@link #layoutChildren(double, double, double, double)}. diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java index 1b5b082..62adc82 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java @@ -755,7 +755,7 @@ class PropertyAccessor { } } catch (IllegalAccessException e) { /* - * Should never happen since 'getters' should contains only public methods. + * Should never happen since 'getters' should contain only public methods. */ throw new AssertionError(method.toString(), e); } catch (InvocationTargetException e) { @@ -908,7 +908,7 @@ class PropertyAccessor { try { setter.invoke(metadata, newValues); } catch (IllegalAccessException e) { - // Should never happen since 'setters' should contains only public methods. + // Should never happen since 'setters' should contain only public methods. throw new AssertionError(e); } catch (InvocationTargetException e) { final Throwable cause = e.getTargetException(); diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java index e05b704..158a871 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java @@ -970,7 +970,7 @@ public class DefaultMetadata extends ISOMetadata implements Metadata { /** * Sets the date(s) associated with the metadata. - * The collection should contains at least an element for {@link DateType#CREATION}. + * The collection should contain at least an element for {@link DateType#CREATION}. * * @param newValues new dates associated with the metadata. * diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java index 0cc6a40..c1b369d 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java @@ -231,7 +231,7 @@ public class DefaultTelephone extends ISOMetadata implements Telephone { * * <p>This method will be removed after we removed the deprecated public methods.</p> * - * @param phones the collection which should contains this telephone number. + * @param phones the collection which should contain this telephone number. * @return {@code this}, or a copy of this instance if we conservatively choose to not modify this instance. */ final DefaultTelephone setOwner(final Collection<Telephone> phones) { diff --git a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java index 6122e53..ba7179f 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/Transformer.java @@ -142,7 +142,7 @@ abstract class Transformer { /** * List of encountered XML tags, used for backtracking. Elements are removed from this list when they are closed. * Names should be the ones we get after conversion from namespaces used in XML document to namespaces used in - * JAXB annotations. For example given the following XML, this list should contains {@code cit:CI_Citation}, + * JAXB annotations. For example given the following XML, this list should contain {@code cit:CI_Citation}, * {@code cit:date} and {@code cit:CI_Date} (in that order) when the (un)marshalling reaches the "…" location. * * {@preformat xml diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java index 97c222b..5b293b0 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java @@ -139,9 +139,9 @@ public strictfp class DocumentComparator { * * <ul> * <li>If {@code NamespaceAware} is {@code true}, then this {@code ignoredAttributes} collection - * shall contains {@code "http://www.w3.org/2001/XMLSchema-instance:schemaLocation"}.</li> + * shall contain {@code "http://www.w3.org/2001/XMLSchema-instance:schemaLocation"}.</li> * <li>If {@code NamespaceAware} is {@code false}, then this {@code ignoredAttributes} collection - * shall contains {@code "xsi:schemaLocation"}, assuming that {@code "xsi"} is the prefix for + * shall contain {@code "xsi:schemaLocation"}, assuming that {@code "xsi"} is the prefix for * {@code "http://www.w3.org/2001/XMLSchema-instance"}.</li> * </ul> * diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java index 8e18885..bdd321f 100644 --- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkTest.java @@ -122,7 +122,7 @@ public final strictfp class XLinkTest extends TestCase { link.setLabel("SomeLabel"); fail("Should not be allowed to set the label."); } catch (IllegalStateException e) { - // This is the expected exception. The message should contains the type name. + // This is the expected exception. The message should contain the type name. assertTrue(e.getMessage().contains("label")); assertTrue(e.getMessage().contains("simple")); } @@ -131,7 +131,7 @@ public final strictfp class XLinkTest extends TestCase { link.setType(XLink.Type.EXTENDED); fail("Should not be allowed to set a type that does not include HREF."); } catch (IllegalStateException e) { - // This is the expected exception. The message should contains the type name. + // This is the expected exception. The message should contain the type name. assertTrue(e.getMessage().contains("extended")); } assertEquals("XLink[type=\"simple\", href=\"org:apache:sis:href\"]", link.toString()); diff --git a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java index 423d8e2..c18a825 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java @@ -105,7 +105,7 @@ import static org.apache.sis.math.MathFunctions.isNegativeZero; * in this class perform the following checks: * * <ul> - * <li>The number of CRS dimensions must be equals to <code>this.{@linkplain #getDimension()}</code>.</li> + * <li>The number of CRS dimensions must be equal to <code>this.{@linkplain #getDimension()}</code>.</li> * <li>For each dimension <var>i</var>, * <code>{@linkplain #getLower(int) getLower}(i) > {@linkplain #getUpper(int) getUpper}(i)</code> is allowed * only if the {@linkplain org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#getRangeMeaning() coordinate diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java index b19e353..5531117 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java @@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.citation.Citations; * </ol> * * Note that the Miller projection is typically used with spherical formulas. However the Apache SIS implementation - * supports also the ellipsoidal formulas. If spherical formulas are desired, then the parameters shall contains + * supports also the ellipsoidal formulas. If spherical formulas are desired, then the parameters shall contain * semi-major and semi-minor axis lengths of equal length. * * <h2>Additional identifiers</h2> diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java index 6c14677..91467e1 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java @@ -166,7 +166,7 @@ public class DefaultParameterDescriptor<T> extends AbstractParameterDescriptor i * * <ul> * <li>The range shall be non-{@linkplain Range#isEmpty() empty}.</li> - * <li><code>valueDomain.{@linkplain Range#getElementType() getElementType()}</code> shall be equals + * <li><code>valueDomain.{@linkplain Range#getElementType() getElementType()}</code> shall be equal * to one of the following: * <ul> * <li>to {@code valueClass} if the later is not an array,</li> diff --git a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java index fc4fbfc..9c25b9f 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java @@ -409,7 +409,7 @@ public class TensorParameters<E> implements Serializable { /** * Returns the parameter descriptor for a matrix or tensor element at the given indices. - * The length of the given {@code indices} array shall be equals to the {@linkplain #rank() rank}. + * The length of the given {@code indices} array shall be equal to the {@linkplain #rank() rank}. * That length is usually 2, where {@code indices[0]} is the <var>row</var> index and {@code indices[1]} * is the <var>column</var> index. * diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java index f81df93..f470f78 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java @@ -761,7 +761,7 @@ class CoordinateOperationRegistry { throws IllegalArgumentException, IncommensurableException, FactoryException { /* - * Assertion: source and target CRS must be equals, ignoring change in axis order or units. + * Assertion: source and target CRS must be equal, ignoring change in axis order or units. * The first line is for disabling this check if the number of dimensions are not the same * (e.g. as in the "geographic 3D to geographic 2D" conversion) because ALLOW_VARIANT mode * still requires a matching number of dimensions. diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java index 51fe6a9..ee26406 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java @@ -101,7 +101,7 @@ final class DefaultConcatenatedOperation extends AbstractCoordinateOperation imp * </table> * * @param properties the properties to be given to the identified object. - * @param operations the sequence of operations. Shall contains at least two operations. + * @param operations the sequence of operations. Shall contain at least two operations. * @param mtFactory the math transform factory to use for math transforms concatenation. * @throws FactoryException if the factory can not concatenate the math transforms. */ @@ -202,7 +202,7 @@ final class DefaultConcatenatedOperation extends AbstractCoordinateOperation imp ArgumentChecks.ensureNonNullElement("operations", i, op); /* * Verify consistency of user argument: for each coordinate operation, the number of dimensions of the - * source CRS shall be equals to the number of dimensions of the target CRS in the previous operation. + * source CRS shall be equal to the number of dimensions of the target CRS in the previous operation. */ final CoordinateReferenceSystem next = op.getSourceCRS(); if (previous != null && next != null) { diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java index 7b9484c..edc732a 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java @@ -648,7 +648,7 @@ next: for (int i=components.size(); --i >= 0;) { * </table> * * @param properties the properties to be given to the identified object. - * @param operations the sequence of operations. Shall contains at least two operations. + * @param operations the sequence of operations. Shall contain at least two operations. * @return the concatenated operation created from the given arguments. * @throws FactoryException if the object creation failed. */ diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java index 19bd26a..8c9391d 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java @@ -172,7 +172,7 @@ public final class Matrices extends Static { /** * Creates a matrix of size {@code numRow} × {@code numCol} initialized to the given elements. - * The elements array size must be equals to {@code numRow*numCol}. Column indices vary fastest. + * The elements array size must be equal to {@code numRow*numCol}. Column indices vary fastest. * * <div class="note"><b>Implementation note:</b> * For {@code numRow} == {@code numCol} with a value between @@ -200,7 +200,7 @@ public final class Matrices extends Static { /** * Creates a matrix of size {@code numRow} × {@code numCol} initialized to the given numbers. - * The elements array size must be equals to {@code numRow*numCol}. Column indices vary fastest. + * The elements array size must be equal to {@code numRow*numCol}. Column indices vary fastest. * * @param numRow number of rows. * @param numCol number of columns. diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java index d340e4b..316ac2f 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java @@ -631,7 +631,7 @@ public abstract class MatrixSIS implements Matrix, LenientComparable, Cloneable, * └ ┘ * } * - * The length of the given vector must be equals to the number of columns in this matrix. + * The length of the given vector must be equal to the number of columns in this matrix. * The last vector element is 1 for an affine transform, but other values are allowed. * This matrix will be modified in-place. * diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java index 8def848..8a7b88c 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java @@ -145,7 +145,7 @@ final class NonSquareMatrix extends GeneralMatrix { * └ ┘ * } * - * There is an issue about whether the full row shall contains NaN, or only the last element (the translation + * There is an issue about whether the full row shall contain NaN, or only the last element (the translation * term) as in the above example. The current implementation inserts a NaN value in the translation term and * sets all other values to 0 on the assumption that if (x₂,y₂) do not depend on (z,t), then conversely (z,t) * do not depend on (x₂,y₂) neither. Setting the scale factor to zero expresses that fact, while setting them diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java index 93a959c..ae211e3 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java @@ -151,7 +151,7 @@ abstract class CoordinateSystemTransform extends AbstractMathTransform { /** * Returns the number of dimensions in the source coordinate points. - * Shall be equals to {@code getSourceCS().getDimension()}. + * Shall be equal to {@code getSourceCS().getDimension()}. */ @Override public final int getSourceDimensions() { @@ -160,7 +160,7 @@ abstract class CoordinateSystemTransform extends AbstractMathTransform { /** * Returns the number of dimensions in the target coordinate points. - * Shall be equals to {@code getTargetCS().getDimension()}. + * Shall be equal to {@code getTargetCS().getDimension()}. */ @Override public final int getTargetDimensions() { diff --git a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java index ad7d333..df4e10f 100644 --- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java @@ -582,11 +582,11 @@ public class PassThroughTransform extends AbstractMathTransform implements Seria for (int j=0; j<numSubRow; j++) { elements[(j + firstAffectedCoordinate) * numCol + numColOut] = subMatrix.getNumber(j, numSubCol); } - // Copy the last row as a safety, but it should contains only 0. + // Copy the last row as a safety, but it should contain only 0. for (int i=0; i<numSubCol; i++) { elements[numRowOut * numCol + (i + firstAffectedCoordinate)] = subMatrix.getNumber(numSubRow, i); } - // Copy the lower right corner, which should contains only 1. + // Copy the lower right corner, which should contain only 1. elements[numRowOut * numCol + numColOut] = subMatrix.getNumber(numSubRow, numSubCol); } return Matrices.create(numRow, numCol, elements); diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java index f71a9d2..02baa49 100644 --- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java +++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java @@ -272,7 +272,7 @@ public final strictfp class DefaultParameterValueGroupTest extends TestCase { assertTrue(expected.add(g3)); /* * A newly created group should be initialized with 4 GeneralParameterValue instances because of - * the mandatory ones. After we added our own instances created above, the group should contains + * the mandatory ones. After we added our own instances created above, the group should contain * 6 instances (one more than what we added) because of the "Mandatory 1" parameter that we did * not provided. Note that the element order in the 'values' collection does not need to be the * order in which we provided our GeneralParameterValue instances. diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java index 1ed2403..164da27 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java +++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java @@ -59,7 +59,7 @@ public enum DataDirectory { /** * The {@code "Schemas"} directory. * This directory contains XML schemas published by ISO. If this directory is present, - * it should contains a {@code "iso/19115/-3"} sub-directory among others. + * it should contain a {@code "iso/19115/-3"} sub-directory among others. * * @see <a href="https://standards.iso.org/iso/19115/-3/">ISO schemas for metadata</a> */ diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java index 1481bf0..ce54c96 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java +++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java @@ -156,7 +156,7 @@ public final class DefaultFactories extends SystemListener { public static <T, I extends T> I forBuildin(final Class<T> type, final Class<I> impl) { final T factory = forBuildin(type); if (!impl.isInstance(factory)) { - throw new ServiceConfigurationError("The “META-INF/services/" + type.getName() + "” file should contains only “" + throw new ServiceConfigurationError("The “META-INF/services/" + type.getName() + "” file should contain only “" + impl.getName() + "” in the Apache SIS namespace, but we found “" + factory.getClass().getName() + "”."); } return impl.cast(factory); diff --git a/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java b/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java index 7f25f06..e452231 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java +++ b/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java @@ -247,7 +247,7 @@ public final class DecimalFunctions extends Static { * For reasons explained later we will actually use c/10 instead of c, so the range will be * (0.1 … 1) instead of (1 … 10). The exponent of 0.1 in base 2 is -4. Consequently for any * value between 0.1 and 1, scaling the value by 56 binary places guarantee that the result - * will be equals or greater than 2^52. At that threshold, 'double' values can not have + * will be equal or greater than 2^52. At that threshold, 'double' values can not have * fraction digits. */ final int PRECISION = SIGNIFICAND_SIZE + 4; // Number of bits to use for scaling to integers. diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java b/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java index 24cd829..fb676ee 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java +++ b/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java @@ -463,7 +463,7 @@ next: for (final Class<?> candidate : candidates) { types.remove(null); /* * Removes every classes in the types collection which are assignable from an other - * class from the same collection. As a result, the collection should contains only + * class from the same collection. As a result, the collection should contain only * leaf classes. */ for (final Iterator<Class<?>> it=types.iterator(); it.hasNext();) { diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java index 662eb18..6eb8458 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java @@ -308,7 +308,7 @@ public final strictfp class CacheTest extends TestCase { */ final Statistics afterGC = validateStressEntries("After GC", cache); out.println("Statistics on the keys before and after garbage collection."); - out.println("The minimum value shall always be equals or greater after GC."); + out.println("The minimum value shall always be equal or greater after GC."); out.println("The mean value is usually greater too, except by coincidence."); final StatisticsFormat format = StatisticsFormat.getInstance(); format.setBorderWidth(1); diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java index 664a51b..6d04746 100644 --- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java +++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java @@ -520,7 +520,7 @@ public final strictfp class RangeSetTest extends TestCase { assertTrue(ranges.add(-20, -10)); assertTrue(ranges.add( 40, 50)); final RangeSet<Integer> clone = ranges.clone(); - assertEquals("The clone shall be equals to the original set.", ranges, clone); + assertEquals("The clone shall be equal to the original set.", ranges, clone); assertTrue(ranges.add(60, 70)); assertFalse("Modifying the original set shall not modify the clone.", ranges.equals(clone)); } diff --git a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java index c536b49..d4330d9 100644 --- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java +++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java @@ -837,7 +837,7 @@ final class ImageFileDirectory extends DataCube { break; } /* - * Stores all the characters referenced by the GeoKeyDirectory. Should contains exactly one string + * Stores all the characters referenced by the GeoKeyDirectory. Should contain exactly one string * which will be splitted by CRSBuilder, but we allow an arbitrary amount as a paranoiac check. * Note that TIFF files use 0 as the end delimiter in strings (C/C++ convention). */ diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java index 8c9ff33..256dba3 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/GeographicEnvelope.java @@ -57,7 +57,7 @@ public abstract class GeographicEnvelope extends AbstractEnvelope implements Geo /** * Returns the number of dimensions, which is assumed to be 2. - * The value returned by this method shall be equals to the value returned by + * The value returned by this method shall be equal to the value returned by * {@code getCoordinateReferenceSystem().getCoordinateSystem().getDimension()}. * * @return the number of dimensions in this envelope. diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java index 616f431..9512a7e 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java @@ -76,7 +76,7 @@ public final strictfp class MetadataBuilderTest extends TestCase { /** * Verifies the metadata that contains the result of parsing a copyright statement. - * Should contains the "John Smith" name and 1992 year. + * Should contain the "John Smith" name and 1992 year. * * @param notice the copyright statement to parse. */