You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/04/04 14:18:30 UTC
svn commit: r1790127 [1/3] - in /sis/branches/JDK8:
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-feature/src/main/java/org/apache/sis/feature/
core/sis-feature/src/main/java/org/apache/sis/feature/builder/
core/sis-metadata/sr...
Author: desruisseaux
Date: Tue Apr 4 14:18:28 2017
New Revision: 1790127
URL: http://svn.apache.org/viewvc?rev=1790127&view=rev
Log:
More fixes in {@link} and @see javadoc annotations.
Modified:
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.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/AuthorityFactoryIdentifier.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.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/BursaWolfInfo.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.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/CoordinateOperationFinder.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/DefaultConcatenatedOperation.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameter.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/OperationMethodSet.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
sis/branches/JDK8/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Compression.java
sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelFactory.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/GroupPointsAsPolylineOperation.java
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/OutputType.java
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
Modified: sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] (original)
+++ sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -262,8 +262,6 @@ final class TransformCommand extends For
/**
* Prints the character for commented lines.
- *
- * @param after the color to apply after the comment character, if colors are enabled.
*/
private void printCommentLinePrefix() {
if (colors) {
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -59,8 +59,8 @@ final class CharacteristicMap extends Ab
/**
* Creates an initially empty map of attribute characteristics.
*
- * @param source the attribute which is characterized by {@code characterizedBy}.
- * @param characterizedBy description of the characteristics of {@code source}.
+ * @param source the attribute which is characterized by {@code characterizedBy}.
+ * @param types description of the characteristics of {@code source}.
*/
CharacteristicMap(final Attribute<?> source, final CharacteristicTypeMap types) {
this.source = source;
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -41,7 +41,7 @@ import org.opengis.feature.AttributeType
* But instead of that, we store attributes in an array and the array indices in a {@code HashMap}. This level of
* indirection is useless if we consider only the {@link DefaultAttributeType#characteristics()} method, since a
* standard {@code HashMap<String,AttributeType>} would work as well or better. However this level of indirection
- * become useful for {@link CharacteristicMap} (the map returned by {@link DefaultAttribute#characteristics()}),
+ * become useful for {@link CharacteristicMap} (the map returned by {@link AbstractAttribute#characteristics()}),
* since it allows a more efficient storage. We do this effort because some applications may create a very large
* amount of attribute instances.
*
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -79,7 +79,7 @@ public class DefaultAssociationRole exte
* This field is initially null, then computed when first needed.
* This information is used only by {@link AbstractAssociation#toString()} implementation.
*
- * @see #getTitleProperty()
+ * @see #getTitleProperty(FeatureAssociationRole)
*/
private transient volatile String titleProperty;
@@ -315,9 +315,8 @@ public class DefaultAssociationRole exte
* later. We rather put a warning in {@link #DefaultAssociationRole(Map, GenericName, int, int)}
* javadoc.</p>
*
- * @param feature the feature in which to search.
- * @param name the name of the feature to search.
- * @param done the feature types collected by {@link #search(FeatureType, GenericName, List)}.
+ * @param deferred the feature types collected by {@link #search(FeatureType, GenericName, List)}.
+ * @param name the name of the feature to search.
* @return the feature of the given name, or {@code null} if none.
*/
private static FeatureType deepSearch(final List<FeatureType> deferred, final GenericName name) {
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -140,7 +140,7 @@ public class DefaultFeatureType extends
* any unresolved name (i.e. a {@link DefaultAssociationRole#valueType} specified only be the
* feature type name instead than its actual instance). A value of {@code true} means that all
* names have been resolved. However a value of {@code false} only means that we are not sure,
- * and that {@link #resolve(FeatureType)} should check again.
+ * and that {@link #resolve(FeatureType, Map)} should check again.
*
* <div class="note"><b>Note:</b>
* Strictly speaking, this field should be declared {@code volatile} since the names could
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -482,7 +482,7 @@ header: for (int i=0; ; i++) {
/**
* Formats the given object using a shared instance of {@code ParameterFormat}.
- * This is used for {@link DefaultParameterDescriptorGroup#toString()} implementation.
+ * This is used for {@link DefaultFeatureType#toString()} implementation.
*/
static String sharedFormat(final Object object) {
FeatureFormat f = INSTANCE.getAndSet(null);
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -60,8 +60,8 @@ final class Validator {
/**
* Creates a new validator.
*
- * @param feature {@code FEATURE} if the object to validate is a feature, or
- * {@code ATTRIBUTE} for an attribute, or {@code null} otherwise.
+ * @param scope {@code FEATURE} if the object to validate is a feature, or
+ * {@code ATTRIBUTE} for an attribute, or {@code null} otherwise.
*/
Validator(final ScopeCode scope) {
quality = new DefaultDataQuality();
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -56,7 +56,7 @@ public abstract class PropertyTypeBuilde
/**
* The minimum number of property values.
- * The default value is 1, unless otherwise specified by {@link #setDefaultCardinality(int, int)}.
+ * The default value is 1, unless otherwise specified by {@link #setMinimumOccurs(int)}.
*
* @see #getMinimumOccurs()
*/
@@ -64,7 +64,7 @@ public abstract class PropertyTypeBuilde
/**
* The maximum number of property values.
- * The default value is 1, unless otherwise specified by {@link #setDefaultCardinality(int, int)}.
+ * The default value is 1, unless otherwise specified by {@link #setMaximumOccurs(int)}.
*
* @see #getMaximumOccurs()
*/
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -439,8 +439,8 @@ public abstract class TypeBuilder implem
* Same as {@link org.apache.sis.util.ArgumentChecks#ensureNonNull(String, Object)},
* but uses the current locale in case of error.
*
- * @param name the name of the argument to be checked. Used only if an exception is thrown.
- * @param object the user argument to check against null value.
+ * @param name the name of the argument to be checked. Used only if an exception is thrown.
+ * @param value the user argument to check against null value.
* @throws NullArgumentException if {@code object} is null.
*/
final void ensureNonNull(final String name, final Object value) {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -39,7 +39,7 @@ import org.apache.sis.internal.jaxb.gmd.
*/
public final class MD_CharacterSetCode extends XmlAdapter<MD_CharacterSetCode, Charset> {
/**
- * The value of the {@link CodeList}.
+ * The value of the {@link org.opengis.util.CodeList}.
*/
private CodeListUID identifier;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.adapter
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gmd.Country;
import org.apache.sis.internal.jaxb.gmd.LanguageCode;
+import org.apache.sis.internal.jaxb.gmd.PT_FreeText;
/**
@@ -94,9 +95,9 @@ public final class PT_Locale extends Xml
*
* <blockquote>Indeed, an XML file can only support data expressed in a single character set, which is generally
* declared in the XML file header. Having all the localized strings stored in a single XML file would limit the
- * use of a single character set such as UTF-8. In order to avoid this, the {@link LocalisedCharacterString}
+ * use of a single character set such as UTF-8. In order to avoid this, the {@code LocalisedCharacterString}
* class is implemented specifically to allow a by-reference containment of the {@link PT_FreeText#textGroup}
- * property, and the {@link PT_LocaleContainer} is the recommended root element to be instantiated in a
+ * property, and the {@code PT_LocaleContainer} is the recommended root element to be instantiated in a
* dedicated XML file. The localized string related to a given locale can be stored in a corresponding locale
* container (i.e. XML file) and referenced from the {@link PT_FreeText#textGroup} property instances.
* </blockquote>
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -601,8 +601,8 @@ public final class AxisDirections extend
/**
* Returns {@code true} if the given name starts or ends with the given keyword, ignoring case.
*
- * @param start {@code false} if the given keyword is expected at the beggining of the name,
- * or {@code end} if expected at the end.
+ * @param end {@code false} if the given keyword is expected at the beginning of the name,
+ * or {@code true} if expected at the end.
*/
private static boolean contains(final String name, final String keyword, final boolean end) {
final int length = keyword.length();
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -57,7 +57,7 @@ final class RecordSchemaSIS extends Defa
/**
* The object to serialize instead of {@link DefaultRecordSchema}.
- * This proxy is itself replaced by {@link SerializableRecordSchema#INSTANCE} on deserialization.
+ * This proxy is itself replaced by {@link RecordSchemaSIS#INSTANCE} on deserialization.
*/
private static final class Proxy implements Serializable {
private static final long serialVersionUID = -4381124182735566127L;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -132,7 +132,7 @@ public class ReferencingServices extends
/**
* The separator character between an identifier and its namespace in the argument given to
- * {@link #getOperationMethod(String)}. For example this is the separator in {@code "EPSG:9807"}.
+ * {@link #getOperationMethod(Iterable, String)}. For example this is the separator in {@code "EPSG:9807"}.
*
* This is defined as a constant for now, but we may make it configurable in a future version.
*/
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -83,8 +83,7 @@ final class Element implements Serializa
final int offset;
/**
- * Index of the keyword in the array given to the {@link #pullElement(String...)}
- * or {@link #pullOptionalElement(String...)} method.
+ * Index of the keyword in the array given to the {@link #pullElement(int, String...)} method.
*
* @see #getKeywordIndex()
*/
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -155,7 +155,7 @@ public class Formatter implements Locali
* If non-null, the terminal must be ANSI X3.64 compatible.
* The default value is {@code null}.
*
- * @see #configure(Convention, Citation, Colors, boolean, byte)
+ * @see #configure(Convention, Citation, Colors, byte, byte, byte)
*/
private Colors colors;
@@ -163,14 +163,14 @@ public class Formatter implements Locali
* The preferred convention for objects or parameter names.
* This field should never be {@code null}.
*
- * @see #configure(Convention, Citation, Colors, boolean, byte)
+ * @see #configure(Convention, Citation, Colors, byte, byte, byte)
*/
private Convention convention;
/**
* The preferred authority for objects or parameter names.
*
- * @see #configure(Convention, Citation, Colors, boolean, byte)
+ * @see #configure(Convention, Citation, Colors, byte, byte, byte)
*/
private Citation authority;
@@ -256,7 +256,7 @@ public class Formatter implements Locali
/**
* {@code 1} if keywords shall be converted to upper cases, or {@code -1} for lower cases.
*
- * @see #configure(Convention, Citation, Colors, boolean, byte)
+ * @see #configure(Convention, Citation, Colors, byte, byte, byte)
*/
private byte toUpperCase;
@@ -275,7 +275,7 @@ public class Formatter implements Locali
* The amount of spaces to use in indentation, or {@value org.apache.sis.io.wkt.WKTFormat#SINGLE_LINE}
* if indentation is disabled.
*
- * @see #configure(Convention, Citation, Colors, boolean, byte)
+ * @see #configure(Convention, Citation, Colors, byte, byte, byte)
*/
private byte indentation;
@@ -298,7 +298,7 @@ public class Formatter implements Locali
* {@code ID} (previously known as {@code AUTHORITY}) and {@code REMARKS}, and have a special treatment: they
* are written by {@link #append(FormattableObject)} after the {@code formatTo(Formatter)} method returned.
*
- * @see #appendComplement(IdentifiedObject, FormattableObject)
+ * @see #appendComplement(IdentifiedObject, FormattableObject, FormattableObject)
*/
private boolean isComplement;
@@ -306,7 +306,7 @@ public class Formatter implements Locali
* {@code true} if the last formatted element was invalid WKT and shall be highlighted with syntactic coloration.
* This field has no effect if {@link #colors} is null. This field is reset to {@code false} after the invalid
* part has been processed by {@link #append(FormattableObject)}, in order to highlight only the first erroneous
- * element without clearing the {@link #invalidElement} value.
+ * element without clearing the {@link #warnings} value.
*/
private boolean highlightError;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -402,7 +402,8 @@ class GeodeticObjectParser extends MathT
/**
* Returns the value associated to {@link IdentifiedObject#IDENTIFIERS_KEY} as an {@code Identifier} object.
- * This method shall accept all value types that {@link #parseMetadataAndClose(Element, Object)} may store.
+ * This method shall accept all value types that {@link #parseMetadataAndClose(Element, String, IdentifiedObject)}
+ * may store.
*
* @param identifier the {@link #properties} value, or {@code null}.
* @return the identifier, or {@code null} if the given value was null.
@@ -589,8 +590,8 @@ class GeodeticObjectParser extends MathT
}
/**
- * Parses the datum {@code ANCHOR[]} element and invoke {@link #parseMetadataAndClose(Element, Object)}.
- * If an anchor has been found, its value is stored in the returned map.
+ * Parses the datum {@code ANCHOR[]} element and pass the values to the {@link #parseMetadataAndClose(Element,
+ * String, IdentifiedObject)} method. If an anchor has been found, its value is stored in the returned map.
*/
private Map<String,Object> parseAnchorAndClose(final Element element, final String name) throws ParseException {
final Element anchor = element.pullElement(OPTIONAL, WKTKeywords.Anchor);
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -419,7 +419,6 @@ class MathTransformParser extends Abstra
* CONCAT_MT[<math transform> {,<math transform>}*]
* }
*
- * @param mode {@link #FIRST}, {@link #OPTIONAL} or {@link #MANDATORY}.
* @param parent the parent element.
* @return the {@code "CONCAT_MT"} element as an {@link MathTransform} object.
* @throws ParseException if the {@code "CONCAT_MT"} element can not be parsed.
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -150,7 +150,7 @@ public final class Warnings implements L
*
* @param locale the locale for reporting warning messages.
* @param isParsing {@code false} if formatting, or {@code true} if parsing.
- * @param ignoredElements the {@link Parser#ignoredElements} map, or an empty map (can not be null).
+ * @param ignoredElements the {@link AbstractParser#ignoredElements} map, or an empty map (can not be null).
*/
Warnings(final Locale locale, final boolean isParsing, final Map<String, List<String>> ignoredElements) {
this.errorLocale = locale;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -302,7 +302,7 @@ public class MetadataStandard implements
* <li>The value of {@link #getImplementation(Class)} after check for non-null value.</li>
* </ul>
*
- * @param implementation the implementation class.
+ * @param key the implementation class together type declared by the property.
* @param mandatory whether this method shall throw an exception or return {@code null}
* if no accessor is found for the given implementation class.
* @return the accessor for the given implementation, or {@code null} if the given class does not
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -1207,7 +1207,7 @@ class PropertyAccessor {
* Returns a potentially deep copy of the given metadata object.
*
* @param metadata the metadata object to copy.
- * @param copies a map of metadata objects already copied.
+ * @param copier contains a map of metadata objects already copied.
* @return a copy of the given metadata object, or {@code metadata} itself if there is
* no known implementation class or that implementation has no setter method.
* @throws Exception if an error occurred while creating the copy. This include any
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -273,7 +273,8 @@ final class PropertyInformation<E> exten
/**
* Returns valid values that can be assigned to the extended element, or {@code null} if none.
- * In the particular case of SIS implementation, this method may return a subclass of {@link NumberRange}.
+ * In the particular case of SIS implementation, this method may return a subclass of
+ * {@link org.apache.sis.measure.NumberRange}.
*/
@Override
@SuppressWarnings({"unchecked","rawtypes"})
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -110,9 +110,9 @@ final class Pruner {
}
/**
- * {@link #isEmpty(boolean)} implementation, potentially invoked recursively for inspecting
- * child metadata and optionally removing empty ones. The map given in argument is a safety
- * guard against infinite recursivity.
+ * {@link #isEmpty(AbstractMetadata, Class, boolean, boolean)} implementation, potentially
+ * invoked recursively for inspecting child metadata and optionally removing empty ones.
+ * The map given in argument is a safety guard against infinite recursivity.
*
* @param accessor the accessor that provided the metadata {@code properties}.
* @param properties the metadata properties.
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -45,7 +45,7 @@ final class SpecialCases extends Propert
*
* @param standard the standard which define the {@code type} interface.
* @param type the interface implemented by the metadata, which must be
- * the value returned by {@link #getStandardType(Class, String)}.
+ * the value returned by {@link MetadataStandard#findInterface(CacheKey)}.
* @param implementation the class of metadata implementations, or {@code type} if none.
* @param standardImpl the implementation specified by the {@link MetadataStandard}, or {@code null} if none.
* This is the same than {@code implementation} unless a custom implementation is used.
@@ -70,8 +70,8 @@ final class SpecialCases extends Propert
}
/**
- * Delegates to {@link PropertyAccessor#type(int)}, then substitutes the type for the properties
- * handled in a special way.
+ * Delegates to {@link PropertyAccessor#type(int, TypeValuePolicy)},
+ * then substitutes the type for the properties handled in a special way.
*/
@Override
Class<?> type(final int index, final TypeValuePolicy policy) {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -52,11 +52,12 @@ import org.apache.sis.util.resources.Voc
* See {@code newChild()} javadoc for an example.</p>
*
* <div class="note"><b>API note:</b>
- * This class is not serializable because the values of the {@link #indexInData} and {@link #indexInList} fields
- * may not be stable. The former may be invalid if the node is serialized and deserialized by two different versions
- * of Apache SIS having properties in different order. The second may be invalid if the collection is not guaranteed
- * to preserve order on serialization (e.g. {@code CodeListSet} with user-supplied elements, in which case the elements
- * order depends on the instantiation order).</div>
+ * This class is not serializable because the values of the {@link Element#indexInData}
+ * and {@link CollectionElement#indexInList} fields may not be stable.
+ * The former may be invalid if the node is serialized and deserialized by two different versions of Apache SIS
+ * having properties in different order. The second may be invalid if the collection is not guaranteed to preserve
+ * order on serialization (e.g. {@code CodeListSet} with user-supplied elements, in which case the elements order
+ * depends on the instantiation order).</div>
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
@@ -167,7 +168,6 @@ class TreeNode implements Node {
/**
* Creates a new child for an element of the given metadata.
* This constructor is for the {@link Element} subclass only.
- * Callers must invoke {@link #init()} after construction.
*
* @param parent the parent of this node.
* @param metadata the metadata object for which this node will be a value.
@@ -308,7 +308,6 @@ class TreeNode implements Node {
/**
* Creates a new child for a property of the given metadata at the given index.
- * Callers must invoke {@link #init()} after construction.
*
* @param parent the parent of this node.
* @param metadata the metadata object for which this node will be a value.
@@ -407,7 +406,6 @@ class TreeNode implements Node {
/**
* Creates a new node for the given collection element.
- * Callers must invoke {@link #init()} after construction.
*
* @param parent the parent of this node.
* @param metadata the metadata object for which this node will be a value.
@@ -739,8 +737,8 @@ class TreeNode implements Node {
/**
* Returns the value of this node in the given column, or {@code null} if none. This method verifies
- * the {@code column} argument, then delegates to {@link #getName()}, {@link #getElementType()} or
- * {@link #getUserObject()}.
+ * the {@code column} argument, then delegates to {@link #getName()}, {@link #getUserObject()} or
+ * other properties.
*/
@Override
public final <V> V getValue(final TableColumn<V> column) {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.AbstractCollection;
import java.util.NoSuchElementException;
import java.util.ConcurrentModificationException;
+import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.resources.Errors;
@@ -59,7 +60,7 @@ final class TreeNodeChildren extends Abs
* <li>{@link ValueExistencePolicy}: {@code parent.table.valuePolicy}</li>
* </ul>
*
- * @see #childAt(int)
+ * @see #childAt(int, int)
*/
private final TreeNode parent;
@@ -89,7 +90,7 @@ final class TreeNodeChildren extends Abs
/**
* The children to be returned by this collection. All elements in this collection are
- * initially {@code null}, then created by {@link #childAt(int)} when first needed.
+ * initially {@code null}, then created by {@link #childAt(int, int)} when first needed.
*
* <p>Not all elements in this array will be returned by the iterator.
* The value needs to be verified for the {@link ValueExistencePolicy}.</p>
@@ -184,7 +185,7 @@ final class TreeNodeChildren extends Abs
* It is caller responsibility to do such verification before this method call.</p>
*
* @param index the index in the accessor (<em>not</em> the index in this collection).
- * @param subIndex if the property at {@link #index} is a collection, the index in that
+ * @param subIndex if the property at {@code index} is a collection, the index in that
* collection (<em>not</em> the index in <em>this</em> collection). Otherwise -1.
* @return the node to be returned by public API.
*/
@@ -503,7 +504,7 @@ final class TreeNodeChildren extends Abs
}
/**
- * Implementation of {@link #add(TreeTable.Node)}, also invoked by {@link TreeNode.NewChild}.
+ * Implementation of {@link #add(TreeTable.Node)}, also invoked by {@code TreeNode.NewChild}.
* This method will attempt to convert the given {@code value} to the expected type.
*
* @param index the index in the accessor (<em>not</em> the index in this collection).
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -230,8 +230,8 @@ public class DefaultScopeDescription ext
* Sets the properties identified by the {@code code} argument, if non-null and non-empty.
* This discards any other properties.
*
- * @param caller the caller method, for logging purpose.
- * @param code the property which is going to be set.
+ * @param newValue the value to set.
+ * @param code the property which is going to be set.
*/
private void setProperty(final Set<? extends CharSequence> newValue, final byte code) {
Set<CharSequence> c = null;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -41,7 +41,7 @@ import org.apache.sis.internal.system.Lo
* <div class="section"><b>Closing</b>:
* While this class implements {@link java.lang.AutoCloseable}, it should not be used in a try-finally block.
* This is because {@code CachedStatement} is typically closed by a different thread than the one that created
- * the {@code CachedStatement} instance. This object is closed by a background thread of {@link Tables}.</div>
+ * the {@code CachedStatement} instance. This object is closed by a background thread of {@link MetadataSource}.</div>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 0.8
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -882,8 +882,8 @@ public class MetadataSource implements A
/**
* Converts the specified non-metadata value into an object of the expected type.
- * The expected value is an instance of a class outside the metadata package, for
- * example {@link String}, {@link InternationalString}, {@link URI}, <i>etc.</i>
+ * The expected value is an instance of a class outside the metadata package, for example
+ * {@link String}, {@link org.opengis.util.InternationalString}, {@link java.net.URI}, <i>etc.</i>
*
* @throws UnconvertibleObjectException if the value can not be converter.
*/
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -76,7 +76,7 @@ abstract class AbstractLocationType impl
}
/**
- * Implementation of {@link #verifyCycle()} to be invoked recursively for each children.
+ * Implementation of {@link #checkForCycles()} to be invoked recursively for each children.
*
* @throws IllegalArgumentException if an infinite recursivity is detected.
*/
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -129,7 +129,7 @@ public class GeohashReferenceSystem exte
final Format format;
/**
- * The {@link #crs}�with (<var>longitude</var>, <var>latitude</var>) axis order in degrees.
+ * The user-supplied CRS�with (<var>longitude</var>, <var>latitude</var>) axis order in degrees.
*/
final DefaultGeographicCRS normalizedCRS;
@@ -366,8 +366,6 @@ public class GeohashReferenceSystem exte
private final class Decoder extends SimpleLocation {
/**
* Decodes the given geohash.
- *
- * @param owner the {@code Coder} which is creating this {@code Decoder}.
*/
Decoder(final CharSequence geohash, final double[] coordinates) throws TransformException {
super(rootType(), geohash);
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -1435,10 +1435,10 @@ public class MilitaryGridReferenceSystem
}
/**
- * Returns the band letter for the given latitude. It is caller responsibility to ensure that the
- * given latitude is between {@value #UTM_SOUTH_BOUNDS} and {@value #UTM_NORTH_BOUNDS} inclusive.
- * The returned letter will be one of {@code "CDEFGHJKLMNPQRSTUVWX"} (note that I and O letters
- * are excluded). All bands are 8� height except the X band which is 12� height.
+ * Returns the band letter for the given latitude. It is caller responsibility to ensure that the given latitude
+ * is between {@value TransverseMercator.Zoner#SOUTH_BOUNDS} and {@value TransverseMercator.Zoner#NORTH_BOUNDS}
+ * inclusive. The returned letter will be one of {@code "CDEFGHJKLMNPQRSTUVWX"} (note that I and O letters are
+ * excluded). All bands are 8� height except the X band which is 12� height.
*
* @param \u03c6 the latitude in degrees for which to get the band letter.
* @return the band letter for the given latitude.
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -299,8 +299,8 @@ class SimpleLocation extends AbstractLoc
/**
* A {@code SimpleLocation} for non-geographic CRS.
- * Subclasses should invoke {@link #computeGeographicBoundingBox(MathTransform, DirectPosition2D)}
- * after the {@link #minX}, {@link #minY}, {@link #maxX} and {@link #maxY} fields have been set.
+ * Subclasses should invoke {@link #computeGeographicBoundingBox(MathTransform)} after the
+ * {@link #minX}, {@link #minY}, {@link #maxX} and {@link #maxY} fields have been set.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -69,7 +69,6 @@ final class CurveExtremum {
* @param x2 the <var>x</var> ordinate of the second point.
* @param y2 the <var>y</var> ordinate of the second point.
* @param dy2 the \u2202<var>x</var>/\u2202<var>y</var> value at the second point.
- * @return the two points located on the extremum of the fitted cubic curve.
*/
void resolve(double x1, double y1, final double dy1,
double x2, double y2, final double dy2)
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operat
*/
public final class CC_Conversion extends PropertyType<CC_Conversion, Conversion> {
/**
- * Temporary storage for the {@code baseCRS} during {@link org.apache.sis.referencing.crs.AbstractDerivedCRS}
+ * Temporary storage for the {@code baseCRS} during {@code org.apache.sis.referencing.crs.AbstractDerivedCRS}
* unmarshalling. A temporary location is needed because {@code AbstractDerivedCRS} does not have any explicit
* field for {@code baseCRS}.
*
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -218,7 +218,7 @@ public final class ServicesForMetadata e
* @param envelope the source envelope.
* @param target the target temporal extent.
* @param crs the envelope CRS (mandatory, can not be {@code null}).
- * @param verticalCRS the temporal component of the given CRS (mandatory).
+ * @param temporalCRS the temporal component of the given CRS (mandatory).
* @throws UnsupportedOperationException if no implementation of {@code TemporalFactory} has been found
* on the classpath.
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -86,8 +86,8 @@ public final class AbridgedMolodensky ex
* @param targetDimensions number of dimensions in the target CRS of this operation method.
* @param redimensioned providers for all combinations between 2D and 3D cases, or {@code null}.
*/
- private AbridgedMolodensky(int sourceDimension, int targetDimension, GeodeticOperation[] redimensioned) {
- super(sourceDimension, targetDimension, PARAMETERS, redimensioned);
+ private AbridgedMolodensky(int sourceDimensions, int targetDimensions, GeodeticOperation[] redimensioned) {
+ super(sourceDimensions, targetDimensions, PARAMETERS, redimensioned);
}
/**
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -137,9 +137,9 @@ public final class Affine extends Abstra
/**
* Creates a provider for affine transform with the specified dimensions.
- * This is created when first needed by {@link #getProvider(int, int)}.
+ * This is created when first needed by {@link #getProvider(int, int, boolean)}.
*
- * @see #getProvider(int, int)
+ * @see #getProvider(int, int, boolean)
*/
private Affine(final int sourceDimensions, final int targetDimensions) {
super(IDENTIFICATION_OGC, sourceDimensions, targetDimensions, new Descriptor(IDENTIFICATION_OGC,
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -414,7 +414,7 @@ public abstract class DatumShiftGridFile
*
* @param dim the dimension for which to get an average value.
* @param gridX the grid index along the <var>x</var> axis, from 0 inclusive to {@link #nx} exclusive.
- * @param gridY the grid index along the <var>y</var> axis, from 0 inclusive to {@link #ny} exclusive.
+ * @param gridY the grid index along the <var>y</var> axis, from 0 inclusive to {@code ny} exclusive.
* @return the offset at the given dimension in the grid cell at the given index.
*/
@Override
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -99,21 +99,21 @@ public abstract class GeocentricAffine e
/**
* The operation parameter descriptor for the <cite>X-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rX rX}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RX;
/**
* The operation parameter descriptor for the <cite>Y-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rY rY}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RY;
/**
* The operation parameter descriptor for the <cite>Z-axis rotation</cite>
* ({@linkplain BursaWolfParameters#rZ rZ}) parameter value.
- * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
+ * Units are {@linkplain Units#ARC_SECOND arc-seconds}.
*/
static final ParameterDescriptor<Double> RZ;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -251,7 +251,7 @@ public final class NADCON extends Abstra
private final StringBuilder ascii;
/**
- * The grid created by {@link #readGrid(Loader)}.
+ * The grid created by {@link #readGrid(FloatBuffer, Loader, Path)}.
*/
DatumShiftGridFile.Float<Angle,Angle> grid;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -61,7 +61,7 @@ final class MapProjectionDescriptor exte
private static final long serialVersionUID = -9142116135803309453L;
/**
- * {@code true} if the {@link #STANDARD_PARALLEL} parameter can be added.
+ * {@code true} if the {@value Constants#STANDARD_PARALLEL} parameter can be added.
*/
final boolean hasStandardParallels;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -433,8 +433,8 @@ final class MapProjectionParameters exte
/**
* All names known to Apache SIS for the standard parallels parameter, as an array of 1 or 2 elements.
- * This is used in some NetCDF files instead of {@link #STANDARD_PARALLEL_1} and
- * {@link #STANDARD_PARALLEL_2}. This is not a standard parameter.
+ * This is used in some NetCDF files instead of {@value Constants#STANDARD_PARALLEL_1} and
+ * {@value Constants#STANDARD_PARALLEL_2}. This is not a standard parameter.
*/
static final ParameterDescriptor<double[]> DESCRIPTOR = new DefaultParameterDescriptor<>(
InverseFlattening.toMap(Constants.STANDARD_PARALLEL),
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -443,9 +443,9 @@ public class ParameterFormat extends Tab
/**
* Implementation of public {@code format(\u2026)} methods for all content levels except {@code NAME_SUMMARY}.
*
- * @param name the group name, usually {@code descriptor.getName().getCode()}.
- * @param descriptor the parameter descriptor, usually {@code values.getDescriptor()}.
- * @param values the parameter values, or {@code null} if none.
+ * @param name the group name, usually {@code descriptor.getName().getCode()}.
+ * @param group the parameter descriptor, usually {@code values.getDescriptor()}.
+ * @param values the parameter values, or {@code null} if none.
* @throws IOException if an error occurred while writing to the given appendable.
*/
private void format(final String name, final ParameterDescriptorGroup group,
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -526,7 +526,7 @@ public abstract class Parameters impleme
/**
* Returns the default value of the given descriptor, or throws an exception if the
* descriptor does not define a default value. This check should be kept consistent
- * with the {@link DefaultParameterValue#incompatibleValue(Object)} check.
+ * with the {@link DefaultParameterValue#missingOrIncompatibleValue(Object)} check.
*/
private static <T> T defaultValue(final ParameterDescriptor<T> parameter) throws IllegalStateException {
final T value = parameter.getDefaultValue();
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -283,7 +283,7 @@ public class TensorParameters<E> impleme
/**
* The cached descriptors for each elements in a tensor. Descriptors do not depend on tensor element values.
- * Consequently, the same descriptors can be reused for all {@link MatrixParameterValues} instances.
+ * Consequently, the same descriptors can be reused for all {@link TensorValues} instances.
*/
private final transient ParameterDescriptor<E>[] parameters;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -373,7 +373,7 @@ final class TensorValues<E> extends Abst
/**
* Creates a matrix from this group of parameters.
- * This operation is allowed only for tensors of {@linkplain #rank() rank} 2.
+ * This operation is allowed only for tensors of {@linkplain TensorParameters#rank() rank} 2.
*
* @return a matrix created from this group of parameters.
*/
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -52,9 +52,8 @@ final class Properties extends AbstractM
private static final long serialVersionUID = 6391635771714311314L;
/**
- * The keys to search for. The index of each element in this array must matches the index searched
- * by {@link #getAt(IdentifiedObject, int)}. In other words, this array performs the reverse mapping
- * of {@link #INDICES}.
+ * The keys to search for. The index of each element in this array must matches the index searched by
+ * {@link #getAt(int)}. In other words, this array performs the reverse mapping of {@link #INDICES}.
*/
private static final String[] KEYS = {
/*[0]*/ IdentifiedObject .NAME_KEY,
@@ -76,7 +75,7 @@ final class Properties extends AbstractM
};
/**
- * The mapping from key names to the index expected by the {@link #getAt(IdentifiedObject, int)} method.
+ * The mapping from key names to the index expected by the {@link #getAt(int)} method.
* This map shall not be modified after construction (for multi-thread safety without synchronization).
*/
private static final Map<String,Integer> INDICES = new HashMap<>(16);
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -270,7 +270,8 @@ public class AbstractCS extends Abstract
* or an {@code INVALID_*} error code otherwise. This method is invoked at construction time for checking
* argument validity. The default implementation returns {@code VALID} in all cases. Subclasses override
* this method in order to put more restrictions on allowed axis directions and check for compatibility
- * with {@linkplain Units#METRE metre} or {@linkplain Units#DEGREE degree} units.
+ * with {@linkplain org.apache.sis.measure.Units#METRE metre} or
+ * {@linkplain org.apache.sis.measure.Units#DEGREE degree} units.
*
* <p><b>Note for implementors:</b> since this method is invoked at construction time, it shall not depend
* on this object's state. This method is not in public API for that reason.</p>
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -29,7 +29,8 @@ import static org.apache.sis.internal.ut
/**
- * Map units of measurement and axis directions to {@link CoordinateSystem} objects defined in the EPSG database.
+ * Map units of measurement and axis directions to {@link org.opengis.referencing.cs.CoordinateSystem}
+ * objects defined in the EPSG database.
* Current version uses hard-coded mapping.
*
* @author R�mi Marechal (Geomatys)
@@ -106,7 +107,7 @@ final class Codes {
/**
* Returns the hash code value for this {@code Codes} instance.
- * Note that {@link #lookup(AxisDirection[], Unit)} needs that the hash code excludes the EPSG code.
+ * Note that {@link #lookup(Unit, AxisDirection[])} needs that the hash code excludes the EPSG code.
*/
@Override
public int hashCode() {
@@ -115,7 +116,7 @@ final class Codes {
/**
* Compares this {@code Codes} instance with the given object for equality.
- * Note that {@link #lookup(AxisDirection[], Unit)} needs that the comparison excludes the EPSG code.
+ * Note that {@link #lookup(Unit, AxisDirection[])} needs that the comparison excludes the EPSG code.
*/
@Override
public boolean equals(final Object obj) {
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -142,7 +142,7 @@ final class Normalizer implements Compar
private final int unitOrder;
/**
- * For internal usage by {@link #sort(CoordinateSystemAxis[])} only.
+ * For internal usage by {@link #sort(CoordinateSystemAxis[], int)} only.
*/
private Normalizer(final CoordinateSystemAxis axis, final int angularUnitOrder) {
this.axis = axis;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -142,7 +142,7 @@ public abstract class DatumShiftGrid<C e
/**
* The unit of measurements of input values, before conversion to grid indices by {@link #coordinateToGrid}.
- * The coordinate unit is typically {@link javax.measure.Units#DEGREE}.
+ * The coordinate unit is typically {@link org.apache.sis.measure.Units#DEGREE}.
*
* @see #getCoordinateUnit()
*/
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=1790127&r1=1790126&r2=1790127&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] Tue Apr 4 14:18:28 2017
@@ -309,7 +309,7 @@ public class DefaultPrimeMeridian extend
/**
* Returns {@code true} if the given formatter is in the process of formatting the prime meridian of a base CRS
- * of an {@link AbstractDerivedCRS}. In such case, base CRS coordinate system axes shall not be formatted, which
+ * of an {@code AbstractDerivedCRS}. In such case, base CRS coordinate system axes shall not be formatted, which
* has the consequence of bringing the {@code UNIT[\u2026]} element right below the {@code PRIMEM[\u2026]} one. Example:
*
* {@preformat wkt
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java?rev=1790127&r1=1790126&r2=1790127&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] Tue Apr 4 14:18:28 2017
@@ -108,7 +108,6 @@ final class AuthorityFactoryIdentifier {
* <div class="note"><b>Example:</b>
* In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "EPSG"}.</div>
*
- * @see #getAuthority()
* @see org.apache.sis.internal.util.DefinitionURI
* @see org.apache.sis.internal.metadata.NameMeaning
*/