sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1809816 - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ core/sis-referencing/src/main/java/org/apache/sis/geometry/ core/sis-referencing/src/main/java/org/apache/sis/parameter/ core/sis-referencing/src/main/...
Date Wed, 27 Sep 2017 08:51:07 GMT
Author: desruisseaux
Date: Wed Sep 27 08:51:06 2017
New Revision: 1809816

URL: http://svn.apache.org/viewvc?rev=1809816&view=rev
Log:
Minor grammatical correction: "software" has no plural form.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java
    sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -28,7 +28,7 @@ import org.apache.sis.metadata.iso.citat
  * (also known as “WKT 2”), or whether to use the format previously defined in OGC 01-009
(referenced as “WKT 1”).
  *
  * <div class="section">WKT 1 variants</div>
- * The WKT 2 format should be parsed and formatted consistently by all softwares.
+ * The WKT 2 format should be parsed and formatted consistently by all software products.
  * But the WKT 1 format has been interpreted differently by various implementors.
  * Apache SIS can adapt itself to different WKT variants, sometime automatically. But some
aspects can not be guessed.
  * One noticeable source of confusion is the unit of measurement of {@code PRIMEM[…]} and
{@code PARAMETER[…]} elements:
@@ -37,8 +37,8 @@ import org.apache.sis.metadata.iso.citat
  *   <li>The unit of the Prime Meridian shall be the angular unit of the enclosing
Geographic CRS
  *       according the OGC 01-009 (<cite>Coordinate transformation services</cite>)
specification.</li>
  *   <li>An older specification — <cite>Simple Features</cite> — was
unclear on this matter and has been
- *       interpreted by many softwares as fixing the unit to decimal degrees.</li>
- *   <li>Some softwares support only (<var>longitude</var>, <var>latitude</var>)
axis order
+ *       interpreted by many software products as fixing the unit to decimal degrees.</li>
+ *   <li>Some software products support only (<var>longitude</var>, <var>latitude</var>)
axis order
  *       and ignore completely all {@code AXIS[…]} elements in the WKT.</li>
  * </ul>
  *
@@ -172,7 +172,7 @@ public enum Convention {
      * <p>Note that {@code AXIS[…]} elements still need to be well formed even when
parsing a text with this convention.
      * Malformed axis elements will continue to cause a {@link java.text.ParseException}
despite their content being ignored.</p>
      *
-     * <p>This convention may be useful for compatibility with some other softwares
that do not handle axis order correctly.
+     * <p>This convention may be useful for compatibility with some other software
products that do not handle axis order correctly.
      * But except when imposed by such compatibility reasons, this convention should be avoided
as much as possible.</p>
      *
      * @since 0.6

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8]
Wed Sep 27 08:51:06 2017
@@ -605,7 +605,7 @@ public class Symbols implements Localize
      * of confusion when processing geographic data. Some applications just ignore any declared
axis order
      * in favor of their own hard-coded (<var>longitude</var>, <var>latitude</var>)
axis order.
      * Consequently, the presence of {@code AXIS[…]} elements in a WKT is an indication
that the encoded
-     * object may not be understood as intended by some external softwares.
+     * object may not be understood as intended by some external software products.
      *
      * @param  wkt  the WKT to inspect.
      * @return {@code true} if the given WKT contains at least one instance of the {@code
AXIS[…]} element.

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -39,7 +39,7 @@
  *   <li>Apply syntactic coloring on terminal supporting <cite>ANSI escape codes</cite>
  *       (a.k.a. ECMA-48, ISO/IEC 6429 and X3.64).</li>
  *   <li>Alter the parsing in a way compatible with non-standard (but commonly used)
WKT.
- *       For example some others softwares ignore the {@code AXIS[…]} elements at parsing
time.</li>
+ *       For example some others software products ignore the {@code AXIS[…]} elements
at parsing time.</li>
  *   <li>Report warnings that occurred during parsing or formatting.</li>
  * </ul>
  *
@@ -56,9 +56,9 @@
  * The WKT 1 format has been interpreted differently by various implementors.
  * One noticeable difference is the unit of measurement of prime meridians and projection
parameters.
  * The WKT 2 format aims to solve the inter-operability problem caused by such mismatches,
- * but not all softwares support this new format. Consequently importing or exporting data
from/to a software with
- * the WKT syntax require knowledge of the WKT variant used by that software. This variant
can be specified by the
- * {@link org.apache.sis.io.wkt.Convention} enumeration.
+ * but not all software products support this new format. Consequently importing or exporting
data from/to a software
+ * with the WKT syntax require knowledge of the WKT variant used by that software. This variant
can be specified by
+ * the {@link org.apache.sis.io.wkt.Convention} enumeration.
  *
  * <div class="section">Geometry WKT</div>
  * The {@link org.apache.sis.geometry.GeneralEnvelope} and {@link org.apache.sis.geometry.GeneralDirectPosition}
classes

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -1120,7 +1120,7 @@ public abstract class AbstractEnvelope i
      *
      * <div class="note"><b>Note:</b>
      * The {@code BOX} element is not part of the standard <cite>Well Known Text</cite>
(WKT) format.
-     * However it is understood by many softwares, for example GDAL and PostGIS.</div>
+     * However it is understood by many software libraries, for example GDAL and PostGIS.</div>
      *
      * The string returned by this method can be {@linkplain GeneralEnvelope#GeneralEnvelope(CharSequence)
parsed}
      * by the {@code GeneralEnvelope} constructor.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -736,7 +736,7 @@ public final class Envelopes extends Sta
      *
      * <p>Example:</p>
      * <ul>
-     *   <li>{@code BOX(-180 -90, 180 90)} (not really a geometry, but understood by
many softwares)</li>
+     *   <li>{@code BOX(-180 -90, 180 90)} (not really a geometry, but understood by
many software products)</li>
      *   <li>{@code POINT(6 10)}</li>
      *   <li>{@code MULTIPOLYGON(((1 1, 5 1, 1 5, 1 1),(2 2, 3 2, 3 3, 2 2)))}</li>
      *   <li>{@code GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(3 8,7 10))}</li>
@@ -773,7 +773,7 @@ public final class Envelopes extends Sta
      *
      * <div class="note"><b>Note:</b>
      * The {@code BOX} element is not part of the standard <cite>Well Known Text</cite>
(WKT) format.
-     * However it is understood by many softwares, for example GDAL and PostGIS.</div>
+     * However it is understood by many software libraries, for example GDAL and PostGIS.</div>
      *
      * The string returned by this method can be {@linkplain GeneralEnvelope#GeneralEnvelope(CharSequence)
      * parsed} by the {@code GeneralEnvelope} constructor.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -63,7 +63,7 @@ import static org.apache.sis.util.Argume
  * centered by default on (0°,0°) with no scale factor and no false easting/northing.
  * The projection is valid from 80°S to 84°N and on all the longitude range (±180°).
  * In this example, the <cite>"Longitude of natural origin"</cite> parameter
is giving different aliases
- * for illustrating the case of different softwares or standards using different conventions.
+ * for illustrating the case of different software libraries or standards using different
conventions.
  *
  * {@preformat java
  *   ParameterBuilder builder = new ParameterBuilder();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -88,13 +88,13 @@ import org.apache.sis.measure.Units;
  * and for some polar projections among others.
  *
  * <p>Recent OGC standards mandate the use of axis order as defined by the authority.
Oldest OGC standards used the
- * (<var>x</var>,<var>y</var>) axis order instead, ignoring any authority
specification. Many softwares still use the
- * old (<var>x</var>,<var>y</var>) axis order, because it is easier
to implement. Apache SIS supports both conventions.
+ * (<var>x</var>,<var>y</var>) axis order instead, ignoring any authority
specification. Many software products still use
+ * the old (<var>x</var>,<var>y</var>) axis order, because it is
easier to implement. Apache SIS supports both conventions.
  * By default, SIS creates CRS with axis order as defined by the authority. Those CRS are
created by calls to the
  * {@link org.apache.sis.referencing.CRS#forCode(String)} method. The actual axis order can
be verified after the CRS
  * creation with {@code System.out.println(crs)}. If (<var>x</var>,<var>y</var>)
axis order is wanted for compatibility
- * with older OGC specifications or other softwares, CRS forced to "longitude first" axis
order can be created using the
- * {@link #CONVENTIONALLY_ORIENTED} or {@link #NORMALIZED} enumeration value.</p>
+ * with older OGC specifications or other software products, CRS forced to "longitude first"
axis order can be created
+ * using the {@link #CONVENTIONALLY_ORIENTED} or {@link #NORMALIZED} enumeration value.</p>
  *
  * <div class="section">Range of longitude values</div>
  * Most geographic CRS have a longitude axis defined in the [-180 … +180]° range. All
map projections in Apache SIS are

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -326,8 +326,8 @@ public class DefaultPrimeMeridian extend
      * If we were not formatting a base CRS, we would have many lines between {@code PrimeMeridian[…]}
and
      * {@code AngleUnit[…]} in the above example, which would make less obvious that the
angle unit applies
      * also to the prime meridian. It does not bring any ambiguity from an ISO 19162 standard
point of view,
-     * but historically some other softwares interpreted the {@code PRIMEM[…]} units wrongly,
which is why
-     * we try to find a compromise between keeping the WKT simple and avoiding an historical
ambiguity.
+     * but historically some other software products interpreted the {@code PRIMEM[…]}
units wrongly, which
+     * is why we try to find a compromise between keeping the WKT simple and avoiding an
historical ambiguity.
      *
      * @see org.apache.sis.referencing.crs.AbstractCRS#isBaseCRS(Formatter)
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -771,7 +771,7 @@ public class MultiAuthoritiesFactory ext
              * Separate the version from the rest of the code. The version is optional. The
code may have no room
              * for version (e.g. "EPSG:4326"), or specify an empty version (e.g. "EPSG::4326").
If the version is
              * equals to an empty string or to the "0" string, it will be considered as no
version. Usage of 0 as
-             * a pseudo-version is a practice commonly found in other softwares.
+             * a pseudo-version is a practice commonly found in other software products.
              */
             int afterVersion = code.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR, ++afterAuthority);
             start = CharSequences.skipLeadingWhitespaces(code, afterAuthority, afterVersion);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -151,8 +151,8 @@ import org.apache.sis.internal.util.Stan
  *
  * <div class="section">SQL dialects</div>
  * Because the primary distribution format for the EPSG dataset is MS-Access, this class
uses SQL statements formatted
- * for the MS-Access dialect. For usage with other database softwares like PostgreSQL or
Derby, a {@link SQLTranslator}
- * instance is provided to the constructor.
+ * for the MS-Access dialect. For usage with other database software products like PostgreSQL
or Derby,
+ * a {@link SQLTranslator} instance is provided to the constructor.
  *
  * @author  Yann Cézard (IRD)
  * @author  Martin Desruisseaux (IRD, Geomatys)

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -384,11 +384,11 @@ class CoordinateOperationRegistry {
                     /*
                      * Above check is necessary because this method may be invoked in some
situations where the code
                      * are equal while the CRS are not. Such situation should be illegal,
but unfortunately it still
-                     * happen because many softwares are not compliant with EPSG definition
of axis order.   In such
-                     * cases we will need to compute a transform from sourceCRS to targetCRS
ignoring the source and
-                     * target codes. The CoordinateOperationFinder class can do that, providing
that we prevent this
-                     * CoordinateOperationRegistry to (legitimately) claims that the operation
from sourceCode to
-                     * targetCode is the identity transform.
+                     * happen because many software products are not compliant with EPSG
definition of axis order.
+                     * In such cases we will need to compute a transform from sourceCRS to
targetCRS ignoring the
+                     * source and target codes. The CoordinateOperationFinder class can do
that, providing that we
+                     * prevent this CoordinateOperationRegistry to (legitimately) claims
that the operation from
+                     * sourceCode to targetCode is the identity transform.
                      */
                     return null;
                 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -41,7 +41,7 @@
  *
  * <div class="section">Apache SIS specific behavior</div>
  * The following operations have a behavior in Apache SIS which may be different
- * than the behavior found in other softwares. Those particularities apply only when the
math transform is
+ * than the behavior found in other software products. Those particularities apply only when
the math transform is
  * {@linkplain org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory#createParameterizedTransform
  * created directly}. Users do not need to care about them when the coordinate operation
is
  * {@linkplain org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory#createOperation

Modified: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java?rev=1809816&r1=1809815&r2=1809816&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
[UTF-8] Wed Sep 27 08:51:06 2017
@@ -400,7 +400,7 @@ public final class Person implements Res
 
     /**
      * Returns a string representation of this person statement.
-     * The statement is formatted in a way similar to the email address in client softwares.
+     * The statement is formatted in a way similar to the email address in client software
applications.
      * Example:
      *
      * <blockquote>



Mime
View raw message