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 1de7bff8271e4f4184e7326c8aa6e445f33a4417 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sun Jan 28 21:44:45 2024 +0100 Fix grammatical errors. --- .../main/org/apache/sis/xml/ReferenceResolver.java | 2 +- .../org.apache.sis.portrayal/main/org/apache/sis/style/se1/Halo.java | 4 ++-- .../main/org/apache/sis/parameter/DefaultParameterValue.java | 2 +- .../main/org/apache/sis/referencing/cs/AbstractCS.java | 2 +- .../main/org/apache/sis/referencing/factory/sql/SQLTranslator.java | 2 +- .../test/org/apache/sis/io/wkt/ExtraCRS.txt | 2 +- .../test/org/apache/sis/referencing/datum/VerticalDatum (GML 3.1).xml | 2 +- .../org/apache/sis/referencing/operation/ConcatenatedOperation.xml | 2 +- .../org/apache/sis/referencing/operation/PassThroughOperation.xml | 2 +- .../main/org/apache/sis/util/internal/Strings.java | 2 +- .../main/org/apache/sis/util/resources/Errors.properties | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) 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 68ef4e7bfb..6867bfa714 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 @@ -193,7 +193,7 @@ public class ReferenceResolver { } else try { /* * URI to an external document. If a `javax.xml.stream.XMLResolver` property was set on the unmarshaller, - * use the user-supplied `URIResolver`. If there is no URI resolver or the URI resolver can not resolve, + * use the user supplied `URIResolver`. If there is no URI resolver or the URI resolver cannot resolve, * fallback on the Apache SIS `ExternalLinkHandler` implementation. The latter is the usual case. */ final ExternalLinkHandler handler = Context.linkHandler(c); diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Halo.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Halo.java index d0cc30611d..e99788dd1f 100644 --- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Halo.java +++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/Halo.java @@ -42,7 +42,7 @@ import org.opengis.filter.Expression; @XmlRootElement(name = "Halo") public class Halo<R> extends StyleElement<R> { /** - * Radius (in pixels) of the the halo around the text, or {@code null} for the default value. + * Radius (in pixels) of the halo around the text, or {@code null} for the default value. * * @see #getRadius() * @see #setRadius(Expression) @@ -93,7 +93,7 @@ public class Halo<R> extends StyleElement<R> { * It extends the area to the outside edge of glyphs and the inside edge of "holes" in the glyphs. * Negative values are not allowed. * - * @return radius (in pixels) of the the halo around the text. + * @return radius (in pixels) of the halo around the text. */ public Expression<R, ? extends Number> getRadius() { return defaultToOne(radius); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java index 312d03f242..4a10b78221 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java @@ -72,7 +72,7 @@ import org.apache.sis.util.logging.Logging; * {@link #intValue()} or {@link #doubleValue()} methods. But other types of parameter values are possible * and can be handled by the more generic {@link #getValue()} and {@link #setValue(Object)} methods. * All {@code xxxValue()} methods in this class are convenience methods converting the value from {@code Object} - * to some commonly used types. Those types are specified in ISO 19111 as an union of attributes, listed below with + * to some commonly used types. Those types are specified in ISO 19111 as a union of attributes, listed below with * the corresponding getter and setter methods: * * <table class="sis"> diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java index cb1cc73f1f..4433ad7035 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java @@ -393,7 +393,7 @@ public class AbstractCS extends AbstractIdentifiedObject implements CoordinateSy } /** - * {@return whether this coordinate system has the same axes than the specified CS, ignoring axis order}. + * {@return whether this coordinate system has the same axes as the specified CS, ignoring axis order}. * If true, then the two coordinate systems have the same number of dimensions and the same set of axes. * Axis instances are compared by the identity operator ({@code ==}), not by {@code equals(Object)}. * diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java index 97591f0b24..b938aeb75e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java @@ -185,7 +185,7 @@ public class SQLTranslator implements Function<String,String> { /** * Mapping from words used in the MS-Access database to words used in the ANSI versions of EPSG databases. - * A word may be a table or a column name, or a part of it. A table name may consist in many words separated + * A word may be a table or a column name, or a part of it. A table name may consist of many words separated * by spaces. This map does not list all tables used in EPSG schema, but only the ones that cannot be mapped * by more generic code (e.g. by replacing spaces by '_'). * diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ExtraCRS.txt b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ExtraCRS.txt index 8240374a22..b273a4db35 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ExtraCRS.txt +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ExtraCRS.txt @@ -48,7 +48,7 @@ ProjectedCRS["South_Pole_Stereographic", # -# Dummy CRS using the same code than ESRI::102021 but +# Dummy CRS using the same code as ESRI::102021 but # different code space and versions. Used for testing # resolution of code collisions. # diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/VerticalDatum (GML 3.1).xml b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/VerticalDatum (GML 3.1).xml index e2c3e8ddc8..53ae73e06c 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/VerticalDatum (GML 3.1).xml +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/VerticalDatum (GML 3.1).xml @@ -23,7 +23,7 @@ xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" gml:id = "epsg-datum-5100"> <!-- - Below is the same content than in the "VerticalDatum.xml" file, but using + Below is the same content as in the "VerticalDatum.xml" file, but using the GML 3.1.1 schema instead of 3.2.1. Some elements have different names: ┌───────────────────┬───────────────────┐ │ GML 3.1 │ GML 3.2 │ diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/ConcatenatedOperation.xml b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/ConcatenatedOperation.xml index 7ccb816075..7f1618b918 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/ConcatenatedOperation.xml +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/ConcatenatedOperation.xml @@ -92,7 +92,7 @@ </gml:GeodeticCRS> </gml:sourceCRS> <!-- - Same definition than the above <gml:sourceCRS> except for the prime meridian. + Same definition as the above <gml:sourceCRS> except for the prime meridian. --> <gml:targetCRS> <gml:GeodeticCRS gml:id="test-crs-target"> diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/PassThroughOperation.xml b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/PassThroughOperation.xml index d66a179250..24a59a40f3 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/PassThroughOperation.xml +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/PassThroughOperation.xml @@ -128,7 +128,7 @@ </gml:CompoundCRS> </gml:sourceCRS> <!-- - Same definition than the above <gml:sourceCRS> except for the prime meridian. + Same definition as the above <gml:sourceCRS> except for the prime meridian. --> <gml:targetCRS> <gml:CompoundCRS gml:id="test-crs-target"> diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Strings.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Strings.java index 6cbee48e82..da9f20a4d0 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Strings.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/Strings.java @@ -284,7 +284,7 @@ public final class Strings extends Static { * * @param delimiter the separator to insert between lines. * @param text the multi-lines text to convert to single line, or {@code null}. - * @return the the text on a single line text, or {@code null} if none. + * @return the text on a single line text, or {@code null} if none. */ public static String singleLine(final String delimiter, final CharSequence text) { if (text != null) { diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties index f134a437e3..a8290bea8d 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/Errors.properties @@ -17,7 +17,7 @@ # Argument numbering convention # ----------------------------- -# This resource bundle applies the same convention than JUnit: the first programmatic parameters +# This resource bundle applies the same convention as JUnit: the first programmatic parameters # (those having lowest numbers like {0} or {1}) provide information about the context in which the # error occurred (e.g. the parameter name or the range of valid values), while the last parameters # (those having highest numbers) are the erroneous values that caused the error. Note that last