Author: desruisseaux
Date: Sat Feb 24 15:36:52 2018
New Revision: 1825249
URL: http://svn.apache.org/viewvc?rev=1825249&view=rev
Log:
Merge from JDK8 branch.
Added:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceOnFileSystem.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceOnFileSystem.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceTransaction.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ResourceTransaction.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreMetadata.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreMetadata.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
- copied, changed from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreUtilities.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TransactionalResource.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TransactionalResource.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableAggregate.java
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableAggregate.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableFeatureSet.java
- copied, changed from r1825247,
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableFeatureSet.java
sis/trunk/storage/sis-storage/src/test/resources/org/apache/sis/internal/storage/folder/test-data/crs.prj
- copied unchanged from r1825247,
sis/branches/JDK8/storage/sis-storage/src/test/resources/org/apache/sis/internal/storage/folder/test-data/crs.prj
Removed:
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Capabilities.java
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeographicOffsetsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AbstractUnit.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
sis/trunk/ide-project/NetBeans/build.xml
sis/trunk/pom.xml
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStoreProvider.java
sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Capability.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/DocumentedStoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.properties
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources_fr.properties
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/URIDataStore.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/StoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/FolderStoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/package-info.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/StoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/StoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/ReadOnlyStorageException.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/folder/StoreTest.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/GroupAsPolylineOperation.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Link.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/StoreProvider.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 24 15:36:52 2018
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394364-1758914
/sis/branches/JDK7:1394913-1822221
-/sis/branches/JDK8:1584960-1822277
+/sis/branches/JDK8:1584960-1825247
/sis/branches/JDK9:1773327-1803064
Modified:
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -36,7 +36,7 @@ import java.io.Writer;
* <li>Between any Java identifiers separated by a {@code '.'} character,
insert a zero-width space before the dot.</li>
* </ul>
*
- * The intend is to avoid large amount of white spaces in Javadoc when a line
content long code.
+ * The intent is to avoid large amount of white spaces in Javadoc when a line
content long code.
*
* <p>Current version does not try to extends the standard doclet because the
later is under revision in JDK 9.
* We may revisit when JDK 9 become available, if their new standard doclet
API is public.</p>
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -410,7 +410,7 @@ public abstract class AbstractAttribute<
* {@linkplain
org.apache.sis.metadata.iso.quality.DefaultConformanceResult#getExplanation()
explanation}
* set to the error message.</p>
*
- * <div class="warning"><b>Note:</b> this is a departure from ISO
intend, since {@code explanation}
+ * <div class="warning"><b>Note:</b> this is a departure from ISO
intent, since {@code explanation}
* should be a statement about what a successful conformance
means. This point may be reformulated
* in a future SIS version.</div>
* </li>
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -57,7 +57,7 @@ final class DenseFeature extends Abstrac
*
* Conceptually, values in this array are {@link Property} instances.
However at first we will store only
* the property <em>values</em>, and convert to an array of type {@code
Property[]} only when at least one
- * property is requested. The intend is to reduce the amount of allocated
objects as much as possible,
+ * property is requested. The intent is to reduce the amount of allocated
objects as much as possible,
* because typical SIS applications may create a very large amount of
features.
*/
private Object[] properties;
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -122,7 +122,7 @@ final class EnvelopeOperation extends Ab
/*
* Get all property names without duplicated values. If a property is
a link to an attribute,
* then the key will be the name of the referenced attribute instead
than the operation name.
- * The intend is to avoid querying the same geometry twice if the
attribute is also specified
+ * The intent is to avoid querying the same geometry twice if the
attribute is also specified
* explicitely in the array of properties.
*
* The map values will be the default Coordinate Reference System, or
null if none.
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -79,7 +79,7 @@ final class SparseFeature extends Abstra
*
* Conceptually, values in this map are {@link Property} instances.
However at first we will store
* only the property <em>values</em>, and build the full {@code Property}
objects only if they are
- * requested. The intend is to reduce the amount of allocated objects as
much as possible, because
+ * requested. The intent is to reduce the amount of allocated objects as
much as possible, because
* typical SIS applications may create a very large amount of features.
*
* @see #valuesKind
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -366,7 +366,7 @@ final class StringJoinOperation extends
/*
* Empty strings are considered as null values for consistency
with StringJoinOperation.format(…).
* If we have more values than expected, continue the parsing
but without storing the values.
- * The intend is to get the correct count of values for error
reporting.
+ * The intent is to get the correct count of values for error
reporting.
*/
if (!element.isEmpty() && count < values.length) try {
values[count] = converters[count].apply(element);
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -65,7 +65,7 @@ final class Validator {
* a new {@link DefaultDomainConsistency} instance with the measure
identification set to the property name.
*
* <div class="note"><b>Note:</b>
- * setting {@code measureIdentification} to the property name may look
like a departure from ISO intend,
+ * setting {@code measureIdentification} to the property name may look
like a departure from ISO intent,
* since the former should be an identification of the <em>quality
measurement</em> rather then the measure itself.
* (setting {@code measureDescription} to {@code type.getDescription()}
would probably be wrong for that reason).
* However {@code measureIdentification} is only an identifier, not a full
description of the quality measurement
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -223,7 +223,7 @@ distribute: while (it.ha
case MERGE: {
/*
* If enabled, copy(…, true) call
verified that the merge can be done, including
- * by recursive checks in all
children. The intend is to have a "all or nothing"
+ * by recursive checks in all
children. The intent is to have a "all or nothing"
* behavior, before the copy(…, false)
call below starts to modify the values.
*/
if (!copy(value, (ModifiableMetadata)
element, false)) break;
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -175,7 +175,7 @@ public class ReferencingServices extends
if (c == null) {
/*
* Double-checked locking: okay since Java 5 provided that
the 'instance' field is volatile.
- * In the particular case of this class, the intend is to
ensure that SystemListener.add(…)
+ * In the particular case of this class, the intent is to
ensure that SystemListener.add(…)
* is invoked only once.
*/
c = getInstance(ReferencingServices.class,
Modules.METADATA, "sis-referencing",
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -86,7 +86,7 @@ public final class SensorType extends Co
}
/**
- * Returns the axis direction that matches the given string, or returns a
+ * Returns the sensor type that matches the given string, or returns a
* new one if none match it. More specifically, this methods returns the
first instance for
* which <code>{@linkplain #name() name()}.{@linkplain String#equals
equals}(code)</code>
* returns {@code true}. If no existing instance is found, then a new one
is created for
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -286,7 +286,7 @@ public abstract class Initializer {
if (home != null) try {
/*
* If a "derby.system.home" property is set, we may be
able to get a shorter path by making it
- * relative to Derby home. The intend is to have a
nicer URL like "jdbc:derby:SpatialMetadata"
+ * relative to Derby home. The intent is to have a
nicer URL like "jdbc:derby:SpatialMetadata"
* instead than
"jdbc:derby:/a/long/path/to/SIS/Data/Databases/SpatialMetadata". In addition
* to making loggings and
EPSGDataAccess.getAuthority() output nicer, it also reduces the risk
* of encoding issues if the path contains spaces or
non-ASCII characters.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -214,7 +214,7 @@ public class SQLBuilder {
* Appends a string as an escaped {@code LIKE} argument.
* This method does not put any {@code '} character, and does not accept
null argument.
*
- * <p>This method does not double the simple quotes of the given string on
intend, because
+ * <p>This method does not double the simple quotes of the given string on
intent, because
* it may be used in a {@code PreparedStatement}. If the simple quotes
need to be doubled,
* then {@link #doubleQuotes(Object)} should be invoked explicitly.</p>
*
@@ -274,7 +274,7 @@ public class SQLBuilder {
* REFERENCES "schema"."target" (primaryKey) ON UPDATE CASCADE ON DELETE
RESTRICT
* }
*
- * Note that the primary key is <strong>not</strong> quoted on intend.
+ * Note that the primary key is <strong>not</strong> quoted on intent.
* If quoted are desired, then they must be added explicitly before to
call this method.
*
* @param schema the schema for both tables.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -420,7 +420,7 @@ public class Formatter implements Locali
/**
* Returns a mapper between Java character sequences and the characters to
write in WKT.
- * The intend is to specify how to write characters that are not allowed
in WKT strings
+ * The intent is to specify how to write characters that are not allowed
in WKT strings
* according ISO 19162 specification. Return values can be:
*
* <ul>
@@ -1165,7 +1165,7 @@ public class Formatter implements Locali
} else {
/*
* The 2 below is for using two less fraction digits than the
expected number accuracy.
- * The intend is to give to DecimalFormat a chance to hide
rounding errors, keeping in
+ * The intent is to give to DecimalFormat a chance to hide
rounding errors, keeping in
* mind that the number value is not necessarily the original one
(we may have applied
* a unit conversion). In the case of WGS84 semi-major axis in
metres, we still have a
* maximum of 8 fraction digits, which is more than enough.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -312,7 +312,7 @@ public class WKTFormat extends CompoundF
/**
* Returns a mapper between Java character sequences and the characters to
write in WKT.
- * The intend is to specify how to write characters that are not allowed
in WKT strings
+ * The intent is to specify how to write characters that are not allowed
in WKT strings
* according ISO 19162 specification. Return values can be:
*
* <ul>
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -130,7 +130,7 @@ public abstract class AbstractMetadata i
* returned by {@link MetadataStandard#asValueMap(Object, Class,
KeyNamePolicy, ValueExistencePolicy)}.
* Subclasses that override this method should usually not invoke {@code
super.isEmpty()},
* because the Java reflection will discover and process the properties
defined in the
- * subclasses - which is usually not the intend when overriding a method.
+ * subclasses - which is usually not the intent when overriding a method.
*
* @return {@code true} if this metadata is empty.
*
@@ -140,7 +140,7 @@ public abstract class AbstractMetadata i
public boolean isEmpty() {
/*
* The NULL_COLLECTION semaphore prevents creation of new empty
collections by getter methods
- * (a consequence of lazy instantiation). The intend is to avoid
creation of unnecessary objects
+ * (a consequence of lazy instantiation). The intent is to avoid
creation of unnecessary objects
* for all unused properties. Users should not see behavioral
difference, except if they override
* some getters with an implementation invoking other getters. However
in such cases, users would
* have been exposed to null values at XML marshalling time anyway.
@@ -196,7 +196,7 @@ public abstract class AbstractMetadata i
* property associated to the given key is a {@link java.util.Collection}
but the given value is a single
* element (not a collection), then the given value is {@linkplain
java.util.Collection#add(Object) added}
* to the existing collection. In other words, the returned map behaves as
a <cite>multi-values map</cite>
- * for the properties that allow multiple values. If the intend is to
unconditionally discard all previous
+ * for the properties that allow multiple values. If the intent is to
unconditionally discard all previous
* values, then make sure that the given value is a collection when the
associated metadata property expects
* such collection.
*
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -803,7 +803,7 @@ public class MetadataStandard implements
* property associated to the given key is a {@link java.util.Collection}
but the given value is a single
* element (not a collection), then the given value is {@linkplain
java.util.Collection#add(Object) added}
* to the existing collection. In other words, the returned map behaves as
a <cite>multi-values map</cite>
- * for the properties that allow multiple values. If the intend is to
unconditionally discard all previous
+ * for the properties that allow multiple values. If the intent is to
unconditionally discard all previous
* values, then make sure that the given value is a collection when the
associated metadata property expects
* such collection.
*
@@ -987,7 +987,7 @@ public class MetadataStandard implements
if (inProgress.add(pair)) {
/*
* The NULL_COLLECTION semaphore prevents creation of new empty
collections by getter methods
- * (a consequence of lazy instantiation). The intend is to avoid
creation of unnecessary objects
+ * (a consequence of lazy instantiation). The intent is to avoid
creation of unnecessary objects
* for all unused properties. Users should not see behavioral
difference, except if they override
* some getters with an implementation invoking other getters.
However in such cases, users would
* have been exposed to null values at XML marshalling time anyway.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -219,7 +219,7 @@ public abstract class ModifiableMetadata
ModifiableMetadata success = null;
/*
* The NULL_COLLECTION semaphore prevents creation of new empty
collections by getter methods
- * (a consequence of lazy instantiation). The intend is to avoid
creation of unnecessary objects
+ * (a consequence of lazy instantiation). The intent is to avoid
creation of unnecessary objects
* for all unused properties. Users should not see behavioral
difference, except if they override
* some getters with an implementation invoking other getters.
However in such cases, users would
* have been exposed to null values at XML marshalling time anyway.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -349,7 +349,7 @@ class PropertyAccessor {
/*
* Get the type of elements returned by the getter. We perform
this step last because
* the search for a setter above may have replaced the getter
declared in the interface
- * by the getter declared in the implementation with a covariant
return type. Our intend
+ * by the getter declared in the implementation with a covariant
return type. Our intent
* is to get a type which can be accepted by the setter.
*/
Class<?> elementType = getter.getReturnType();
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -142,7 +142,7 @@ final class TreeNodeChildren extends Abs
this.children = new TreeNode[accessor.count()];
/*
* Search for something that looks like the main property, to be
associated with the parent node
- * instead than provided as a child. The intend is to have more
compact and easy to read trees.
+ * instead than provided as a child. The intent is to have more
compact and easy to read trees.
* That property shall be a singleton for a simple value (not another
metadata object).
*/
if (parent.table.valuePolicy == ValueExistencePolicy.COMPACT) {
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -144,7 +144,7 @@ final class TreeTableView implements Tre
}
/*
* The NULL_COLLECTION semaphore prevents creation of new empty
collections by getter methods
- * (a consequence of lazy instantiation). The intend is to avoid
creation of unnecessary objects
+ * (a consequence of lazy instantiation). The intent is to avoid
creation of unnecessary objects
* for all unused properties. Users should not see behavioral
difference, except if they override
* some getters with an implementation invoking other getters.
However in such cases, users would
* have been exposed to null values at XML marshalling time anyway.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -398,7 +398,7 @@ public class DefaultMetadata extends ISO
* the deprecated getter methods invoke only the non-deprecated getter
replacement, and the deprecated
* setter methods invoke only the non-deprecated setter replacement
(unless the invoked methods are final).
* This means that if a deprecated setter methods need the old value, it
will read the field directly.
- * The intend is to avoid surprising code paths for user who override some
methods.
+ * The intent is to avoid surprising code paths for user who override some
methods.
*/
/**
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -500,7 +500,7 @@ public class ImmutableIdentifier extends
/*
* The code, codeSpace, authority and version local variables in this
method usually have the exact same
* value than the fields of the same name in this class. But we get
those values by invoking the public
- * methods in order to give to users a chance to override those
properties. The intend is also to use a
+ * methods in order to give to users a chance to override those
properties. The intent is also to use a
* consistent approach for all 'formatTo' implementations, since some
other classes have no choice other
* than using the public methods.
*/
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -212,7 +212,7 @@ public class DefaultAggregateInformation
}
/*
* If there is more than one value, replace only the first one and
keep all other ones unchanged.
- * The intend is to be consistent with the getter method, which
returns the first element.
+ * The intent is to be consistent with the getter method, which
returns the first element.
*/
final ArrayList<Identifier> identifiers = new
ArrayList<>(name.getIdentifiers());
if (identifiers.isEmpty()) {
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -86,7 +86,7 @@ final class Dispatcher implements Invoca
/**
* The metadata instance where to store the property (column) values, or
{@code null} if not yet created.
* For ISO 19115, this is an instance of one of the classes defined in
{@link org.apache.sis.metadata.iso}
- * package or sub-packages. The intend is not only to cache the property
values, but also to leverage
+ * package or sub-packages. The intent is not only to cache the property
values, but also to leverage
* implementations that compute automatically some property values from
other properties.
* The main usage is computing the value of a deprecated property from the
values of non-deprecated ones,
* e.g. for transition from ISO 19115:2003 to ISO 19115:2014.
@@ -208,7 +208,7 @@ final class Dispatcher implements Invoca
final long nullBit = 1L <<
info.asIndexMap(source.standard).get(method.getName()); // Okay even if
overflow.
/*
* The NULL_COLLECTION semaphore prevents creation of new empty
collections by getter methods
- * (a consequence of lazy instantiation). The intend is to avoid
creation of unnecessary objects
+ * (a consequence of lazy instantiation). The intent is to avoid
creation of unnecessary objects
* for all unused properties. Users should not see behavioral
difference.
*/
if ((nullValues & nullBit) == 0) {
Modified:
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/WKTKeywordsTest.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
public final strictfp class WKTKeywordsTest extends TestCase {
/**
* Ensures that all constants are equal to the name of the field that
declare it.
- * The intend is to avoid misleading constant names when reading code.
+ * The intent is to avoid misleading constant names when reading code.
*
* <p>This test is not strictly necessary. We are just checking an
arbitrary convention here, not a requirement.
* If a developer change the constant values without changing the constant
names (for example in order to use the
Modified:
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
* Verifies the API changes caused by the ISO 19115:2003 to ISO 19115:2014
upgrade.
* This class compares the presence of {@link Deprecated} and {@link UML}
annotations against the content of an
* {@linkplain #listAPIChanges(File, File, File, Appendable) automatically
generated} {@code api-changes.properties} file.
- * The intend is to ensure that we did not forgot an annotation or put the
wrong one.
+ * The intent is to ensure that we did not forgot an annotation or put the
wrong one.
*
* <p>The content of the {@code api-changes.properties} files is typically
empty on Apache SIS
* branches that use a snapshot version of GeoAPI, thus making this test a
no-op. However the
Modified:
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -1055,7 +1055,7 @@ public class MilitaryGridReferenceSystem
xEnd = (((int) Math.ceil(bounds.getMaxX() / step))) * step;
// Exclusive
yEnd = (((int) Math.ceil(bounds.getMaxY() / step))) * step;
/*
- * Determine if we should iterate on rows upward or downward. The
intend is to iterate from equator to pole
+ * Determine if we should iterate on rows upward or downward. The
intent is to iterate from equator to pole
* in UTM zones, or from projection center to projection border in
UPS cases. Those directions enable some
* optimizations.
*/
Modified:
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -114,7 +114,7 @@ import org.apache.sis.metadata.iso.citat
* @since 0.8
* @module
*/
-public class ModifiableLocationType extends AbstractLocationType { // Not
Serializable on intend.
+public class ModifiableLocationType extends AbstractLocationType { // Not
Serializable on intent.
/**
* Name of the location type.
*/
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -446,7 +446,7 @@ public final class CC_GeneralOperationPa
/**
* Given an {@link Identifier} or {@link GenericName} instance, returns
that instance as a {@link NamedIdentifier}
- * implementation. The intend is to allow {@code Object.equals(Object)}
and hash code to correctly recognize two
+ * implementation. The intent is to allow {@code Object.equals(Object)}
and hash code to correctly recognize two
* name or identifier as equal even if they are of different
implementations.
*
* <p>Note that {@link NamedIdentifier} is the type of unmarshalled names,
aliases and identifiers.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -204,7 +204,7 @@ public final class ReferencingUtilities
* use an instance of {@link GeographicCRS}. Otherwise (i.e. if the two
first dimensions are not geographic),
* returns {@code null}.
*
- * <p>This method excludes geocentric CRS on intend. Some callers needs
this exclusion as a way to identify
+ * <p>This method excludes geocentric CRS on intent. Some callers needs
this exclusion as a way to identify
* which CRS in a Geographic/Geocentric conversion is the geographic one.
An other point of view is to said
* that if this method returns a non-null value, then the coordinates are
expected to be either two-dimensional
* or three-dimensional with an ellipsoidal height.</p>
@@ -286,7 +286,7 @@ public final class ReferencingUtilities
*
* <ul>
* <li>If the character is {@code '('} and the content until the closing
{@code ')'} is a valid
- * Unicode identifier, then that part is included. The intend is to
keep the prime meridian
+ * Unicode identifier, then that part is included. The intent is to
keep the prime meridian
* name in names like <cite>"NTF (Paris)"</cite>.</li>
* </ul>
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/LinearTransform2D.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.operat
/**
* A two dimensional, linear transform.
- * The intend of this interface is to resolve type conflict in the {@link
#inverse()} method.
+ * The intent of this interface is to resolve type conflict in the {@link
#inverse()} method.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.7
@@ -35,6 +35,7 @@ public interface LinearTransform2D exten
* Returns the inverse transform, which shall be linear and
two-dimensional.
*
* @return the inverse transform.
+ * @throws NoninvertibleTransformException if the transform can not be
inverted.
*/
@Override
LinearTransform2D inverse() throws NoninvertibleTransformException;
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -234,7 +234,7 @@ public class FranceGeocentricInterpolati
* @param semiMajor the descriptor for locating the semi-major axis
parameter.
* @param semiMinor the descriptor for locating the semi-minor axis
parameter.
* @param candidate an ellipsoid to return if the axis lengths match the
lengths found in the parameters,
- * or {@code null} if none. The intend is to use the
pre-defined "GRS 1980" ellipsoid if
+ * or {@code null} if none. The intent is to use the
pre-defined "GRS 1980" ellipsoid if
* we can, because that ellipsoid is defined by inverse
flattening factor instead than by
* semi-minor axis length.
* @return a temporary ellipsoid encapsulating the axis lengths found in
the parameters.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -256,7 +256,7 @@ public final class Molodensky extends Ge
/**
* A temporary ellipsoid used only for passing arguments to the {@link
MolodenskyTransform} constructor.
- * The intend is to use the Δa and Δf values explicitely specified in the
EPSG parameters if available,
+ * The intent is to use the Δa and Δf values explicitely specified in the
EPSG parameters if available,
* or to compute them only if no Δa or Δf values where specified.
*/
@SuppressWarnings("serial")
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -711,7 +711,7 @@ public class ParameterFormat extends Tab
}
/*
* Format the value followed by the unit of measure,
or followed by spaces if there is no unit
- * for this value. The intend is the right align the
numerical value rather than the numerical
+ * for this value. The intent is the right align the
numerical value rather than the numerical
* + unit tupple.
*/
final Format format = getFormat(value.getClass());
@@ -768,7 +768,7 @@ public class ParameterFormat extends Tab
}
/**
- * Configures the number pattern to use for the given value. The main
intend of this method is to ensure that
+ * Configures the number pattern to use for the given value. The main
intent of this method is to ensure that
* the map projection scale factor (a value close to 1) is formatted with
a sufficient number of fraction digits.
* A common default NumberFormat precision is 3 digits, which is not
sufficient. For example the scale factor of
* Transverse Mercator projections is 0.9996 (4 digits), and the scale
factor of "NTF (Paris) / Lambert zone II"
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -193,7 +193,7 @@ final class ParameterValueList extends A
/*
* If we had an uninitialized parameter (a parameter created by the
DefaultParameterValueGroup constructor
* and never been queried or set by the user), then the given
parameter will replace the uninitialized.
- * The intend is to allow users to set its own parameters by a call to
group.values().addAll(myParam).
+ * The intent is to allow users to set its own parameters by a call to
group.values().addAll(myParam).
* Otherwise the given parameter will be added, in which case we need
to check the cardinality.
*/
final Identifier name = desc.getName();
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -474,7 +474,7 @@ public class DefaultProjectedCRS extends
* May happen if the 'conversionFromBase'
parameter group does not provide values
* for "semi_major" or "semi_minor" axis length.
This should not happen with SIS
* implementation, but may happen with
user-defined map projection implementations.
- * Since the intend of this check was to skip
those parameters anyway, it is okay
+ * Since the intent of this check was to skip
those parameters anyway, it is okay
* for the purpose of WKT formatting if there is
no parameter for axis lengths.
*/
Logging.recoverableException(Logging.getLogger(Loggers.WKT),
DefaultProjectedCRS.class, "formatTo", e);
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -795,7 +795,7 @@ public abstract class ConcurrentAuthorit
/**
* Returns {@code true} if the Data Access Object (DAO) does not provide a
{@code create} method for the
- * given type of object. The intend is to decide if the caller should
delegate to the DAO or delegate to
+ * given type of object. The intent is to decide if the caller should
delegate to the DAO or delegate to
* a more generic method of this class (e.g. {@code
createCoordinateReferenceSystem(String)} instead of
* {@code createGeographicCRS(String)}) in order to give to {@code
ConcurrentAuthorityFactory} a chance
* to reuse a value presents in the cache.
@@ -1809,7 +1809,7 @@ public abstract class ConcurrentAuthorit
final GeodeticAuthorityFactory delegate =
((ConcurrentAuthorityFactory<?>) factory).getDataAccess();
/*
* Set 'acquireCount' only after we succeed in fetching the
factory, and before any operation on it.
- * The intend is to get ConcurrentAuthorityFactory.release()
invoked if and only if the getDataAccess()
+ * The intent is to get ConcurrentAuthorityFactory.release()
invoked if and only if the getDataAccess()
* method succeed, no matter what happen after this point.
*/
acquireCount = 1;
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -75,7 +75,7 @@ import org.apache.sis.util.Classes;
* <div class="section">Thread safety</div>
* This class is thread-safe is the underlying {@linkplain #factory} is also
thread-safe.
* However, implementors are encouraged to wrap in {@linkplain
java.util.Collections#unmodifiableSet unmodifiable set}
- * if they intend to cache {@code IdentifiedObjectSet} instances.
+ * if they intent to cache {@code IdentifiedObjectSet} instances.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 0.7
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -3187,7 +3187,7 @@ next: while (r.next()) {
? " ORDER BY ABS(DEPRECATED), "
: " AND DEPRECATED=0 ORDER BY "); // Do not put
spaces around "=" - SQLTranslator searches for this exact match.
if (isFloat) {
- buffer.append("ABS(").append(select).append("-?), ");
+ buffer.append("ABS(").append(where).append("-?), ");
}
buffer.append(select); // Only for making order
determinist.
/*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -186,7 +186,7 @@ final class EPSGInstaller extends Script
/**
* Invoked for each text found in a SQL statement. This method replaces
{@code ''} by {@code Null}.
- * The intend is to consistently use the null value for meaning "no
information", which is not the
+ * The intent is to consistently use the null value for meaning "no
information", which is not the
* same than "information is an empty string". This replacement is okay in
this particular case
* since there is no field in the EPSG database for which we really want
an empty string.
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -173,7 +173,7 @@ class AbstractSingleOperation extends Ab
* In the particular case of a {@linkplain PassThroughTransform pass
through transform} with more dimensions
* than what we would expect from the given method, the check will rather
be performed against the
* {@linkplain PassThroughTransform#getSubTransform() sub transform}.
- * The intend is to allow creation of a three-dimensional {@code
ProjectedCRS} with a two-dimensional
+ * The intent is to allow creation of a three-dimensional {@code
ProjectedCRS} with a two-dimensional
* {@code OperationMethod}, where the third-dimension just pass through.
*
* <p>This method tries to locates what seems to be the "core" of the
given math transform. The definition
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -542,7 +542,7 @@ public class CoordinateOperationFinder e
/*
* TODO: instead than creating parameters for an identity
operation, we should create the
* CoordinateOperation directly from the MathTransform
created by mtFactory below.
- * The intend if to get the correct OperationMethod,
which should not be "Affine"
+ * The intent if to get the correct OperationMethod,
which should not be "Affine"
* if there is a CS type change.
*/
parameters = Affine.identity(targetDim);
@@ -957,7 +957,7 @@ public class CoordinateOperationFinder e
/*
* If one of the transform performs nothing more than a change of axis
order or units, do
* not expose that conversion in a ConcatenatedTransform. Instead,
merge that conversion
- * with the "main" operation. The intend is to simplify the operation
chain by hidding
+ * with the "main" operation. The intent is to simplify the operation
chain by hidding
* trivial operations.
*/
CoordinateOperation main = null;
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -546,7 +546,7 @@ next: for (int i=components.size(); --
transform =
getMathTransformFactory().createBaseToDerived(sourceCRS, parameters,
targetCRS.getCoordinateSystem());
}
/*
- * The "operationType" property is currently undocumented. The intend
is to help this factory method in
+ * The "operationType" property is currently undocumented. The intent
is to help this factory method in
* situations where the given operation method is not an Apache SIS
implementation or does not override
* getOperationType(), or the method is ambiguous (e.g. "Affine" can
be used for both a transformation
* or a conversion).
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -175,7 +175,7 @@ class GeneralMatrix extends MatrixSIS im
/**
* Infers all {@link DoubleDouble#error} with a default values inferred
from {@link DoubleDouble#value}.
* For example if a matrix element is exactly 3.141592653589793, there is
good chances that the user's
- * intend was to specify the {@link Math#PI} value, in which case this
method will infer that we would
+ * intent was to specify the {@link Math#PI} value, in which case this
method will infer that we would
* need to add 1.2246467991473532E-16 in order to get a value closer to π.
*/
static void inferErrors(final double[] elements) {
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -138,7 +138,7 @@ public class AlbersEqualArea extends Equ
/*
* Compute rn = (1-ℯ²)/nm, which is the reciprocal of the "real" n
used in Snyder and EPSG guidance note.
* We opportunistically use double-double arithmetic since the
MatrixSIS operations use them anyway, but
- * we do not really have that accuracy because of the limited
precision of 'nm'. The intend is rather to
+ * we do not really have that accuracy because of the limited
precision of 'nm'. The intent is rather to
* increase the chances term cancellations happen during concatenation
of coordinate operations.
*/
final DoubleDouble rn = DoubleDouble.verbatim(1);
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -37,7 +37,7 @@ import static org.apache.sis.internal.ut
/**
* Helper class for map projection constructions, providing formulas normally
needed only at construction time.
* Since map projection constructions should not happen very often, we afford
using some double-double arithmetic.
- * The main intend is not to provide more accurate coordinate conversions
(while it may be a nice side-effect),
+ * The main intent is not to provide more accurate coordinate conversions
(while it may be a nice side-effect),
* but to improve the result of matrix multiplications when the map projection
is part of a more complex chain
* of transformations. More specifically we want to be able:
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -251,7 +251,7 @@ public class Mercator extends ConformalP
if (λ0 != 0) {
/*
* Use double-double arithmetic here for consistency with the work
done in the normalization matrix.
- * The intend is to have exact value at 'double' precision when
computing Matrix.invert(). Note that
+ * The intent is to have exact value at 'double' precision when
computing Matrix.invert(). Note that
* there is no such goal for other parameters computed from sine
or consine functions.
*/
final DoubleDouble offset = DoubleDouble.createDegreesToRadians();
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -106,7 +106,7 @@ import org.opengis.referencing.Reference
* higher level}.</div>
*
* {@code NormalizedProjection} does not store the above cited parameters
(central meridian, scale factor, <i>etc.</i>)
- * on intend (except indirectly), in order to make clear that those parameters
are not used by subclasses.
+ * on intent (except indirectly), in order to make clear that those parameters
are not used by subclasses.
* The ability to recognize two {@code NormalizedProjection}s as {@linkplain
#equals(Object, ComparisonMode) equivalent}
* without consideration for the scale factor (among other) allow more
efficient concatenation in some cases
* (typically some combinations of inverse projection followed by a direct
projection).
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -294,7 +294,7 @@ abstract class AbstractLinearTransform e
/*
* If the 'inverse' matrix was not computed in any of the
transforms being compared
* (i.e. if 'this.inverse' and 'object.inverse' are both null),
then assume that the
- * two transforms will compute their inverse in the same way. The
intend is to avoid
+ * two transforms will compute their inverse in the same way. The
intent is to avoid
* to trig the inverse transform computation.
*
* Note that this code requires the 'inverse' fields to be volatile
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -26,7 +26,7 @@ import org.apache.sis.parameter.DefaultP
* This temporary {@code ParameterValue} bypasses the validity check normally
performed by {@link DefaultParameterValue}.
*
* <div class="note"><b>Rational:</b>
- * The intend is to skip the parameter value verification done by {@link
DefaultParameterValue#setValue(Object, Unit)}
+ * The intent is to skip the parameter value verification done by {@link
DefaultParameterValue#setValue(Object, Unit)}
* on the assumption that the value has already been verified when the user
created his {@code ParameterValueGroup}.
* Even if the user's {@code ParameterValue} implementation did not performed
any verification, there is chances that
* {@link DefaultMathTransformFactory} {@linkplain
org.apache.sis.parameter.Parameters#copy copied} the parameters in
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1825249&r1=1825248&r2=1825249&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] Sat Feb 24 15:36:52 2018
@@ -686,7 +686,7 @@ public class DefaultMathTransformFactory
/**
* If the parameters given by the user were not created by {@code
getDefaultParameters(String)}
* or something equivalent, copies those parameters into the structure
expected by the provider.
- * The intend is to make sure that we have room for the parameters
that {@code setEllipsoids(…)}
+ * The intent is to make sure that we have room for the parameters
that {@code setEllipsoids(…)}
* may write.
*
* <p>A side effect of this method is that the copy operation may
perform a check of
