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/05 09:26:15 UTC
svn commit: r1790195 [1/7] - in /sis/trunk: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/src/main/java/org/apache/sis/index/tree/
application/sis-webapp/src/main/java/org/apache/sis/services/
core/sis-feature/...
Author: desruisseaux
Date: Wed Apr 5 09:26:10 2017
New Revision: 1790195
URL: http://svn.apache.org/viewvc?rev=1790195&view=rev
Log:
Merge {@link} and @see javadoc fixes from JDK7 branch.
Added:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java
- copied unchanged from r1790136, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
- copied unchanged from r1790136, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/FrequencySortedSetTest.java
Modified:
sis/trunk/ (props changed)
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.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/FeatureFormat.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.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-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeaturesTest.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/internal/feature/AttributeConventionTest.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.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/sql/ScriptRunner.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.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/GeodeticObjectParser.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.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/PropertyAccessor.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.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/iso/DefaultExtendedElementInformation.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/ISOMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/MetadataScopeAdapter.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/LegacyTelephones.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.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/iso/identification/DefaultCoupledResource.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/VerticalDatumTypesTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/sql/ScriptRunnerTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocation.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.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/ReferencingByIdentifiers.java
sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/SimpleLocation.java
sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java
sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/distance/DistanceUtils.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/UnmodifiableGeometryException.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_Conversion.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/ServicesForMetadata.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/AffineTransform2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/IntervalRectangle.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionDescriptor.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.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/Parameters.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Properties.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.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/GeodeticObjectFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/UnavailableFactoryException.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.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/EPSGFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.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/CoordinateOperationRegistry.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.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/DefaultOperationMethod.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MismatchedDatumException.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.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/matrix/Matrices.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Solver.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/projection/ObliqueStereographic.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.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/IdentityTransform.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/OperationMethodSet.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/CoordinateFormatTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/metadata/AxisDirectionsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WKTUtilitiesTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PoleRotationMock.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/SeismicBinGridMock.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TopocentricConversionMock.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/TransverseMercatorTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedAxes.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/HardCodedDatum.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/EPSGDataFormatter.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/AbstractSingleOperationTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix3Test.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.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/projection/MercatorTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.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/converter/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.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/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/DefinitionURI.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/LazySet.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/internal/util/StandardDateFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.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/TestUtilities.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
sis/trunk/ide-project/NetBeans/nbproject/project.properties
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html
sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.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/Compression.java
sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.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/internal/netcdf/ucar/DecoderWrapper.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java
sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/ChannelDecoderTest.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.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/io/ChannelDataOutput.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelFactory.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreException.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreReferencingException.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureNaming.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreProviderTest.java
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/storage/FeatureNamingTest.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Copyright.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/GroupPointsAsPolylineOperation.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Writer.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/OutputType.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java
sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 09:26:10 2017
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1789949
-/sis/branches/JDK8:1584960-1789941
-/sis/branches/JDK9:1773327-1789793
+/sis/branches/JDK7:1394913-1790136
+/sis/branches/JDK8:1584960-1790133
+/sis/branches/JDK9:1773327-1789983
Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] Wed Apr 5 09:26:10 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/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java [UTF-8] (original)
+++ sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.sis.index.tree;
//JDK imports
Modified: sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java [UTF-8] (original)
+++ sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.sis.index.tree;
//JDK imports
Modified: sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java [UTF-8] (original)
+++ sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.sis.services;
//JDK imports
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -31,8 +31,6 @@ import org.apache.sis.util.CorruptedObje
import org.apache.sis.internal.util.CheckedArrayList;
import org.apache.sis.internal.feature.Resources;
-// Branch-dependent imports
-
/**
* An instance of a {@linkplain DefaultFeatureType feature type} containing values for a real-world phenomena.
@@ -329,10 +327,10 @@ public abstract class AbstractFeature im
* <table class="sis">
* <caption>Class of returned value</caption>
* <tr><th>Property type</th> <th>max. occurs</th> <th>Method invoked</th> <th>Return type</th></tr>
- * <tr><td>{@link AttributeType}</td> <td>0 or 1</td> <td>{@link Attribute#getValue()}</td> <td>{@link Object}</td></tr>
- * <tr><td>{@code AttributeType}</td> <td>2 or more</td> <td>{@link Attribute#getValues()}</td> <td>{@code Collection<?>}</td></tr>
- * <tr><td>{@link FeatureAssociationRole}</td> <td>0 or 1</td> <td>{@link FeatureAssociation#getValue()}</td> <td>{@link Feature}</td></tr>
- * <tr><td>{@code FeatureAssociationRole}</td> <td>2 or more</td> <td>{@link FeatureAssociation#getValues()}</td> <td>{@code Collection<Feature>}</td></tr>
+ * <tr><td>{@code AttributeType}</td> <td>0 or 1</td> <td>{@code Attribute.getValue()}</td> <td>{@link Object}</td></tr>
+ * <tr><td>{@code AttributeType}</td> <td>2 or more</td> <td>{@code Attribute.getValues()}</td> <td>{@code Collection<?>}</td></tr>
+ * <tr><td>{@code FeatureAssociationRole}</td> <td>0 or 1</td> <td>{@code FeatureAssociation.getValue()}</td> <td>{@code Feature}</td></tr>
+ * <tr><td>{@code FeatureAssociationRole}</td> <td>2 or more</td> <td>{@code FeatureAssociation.getValues()}</td> <td>{@code Collection<Feature>}</td></tr>
* </table>
*
* <div class="note"><b>Note:</b> \u201cmax. occurs\u201d is the {@linkplain DefaultAttributeType#getMaximumOccurs() maximum
@@ -614,7 +612,7 @@ public abstract class AbstractFeature im
/**
* Returns the exception for a property type which is neither an attribute or an association.
- * This method is invoked after a {@link PropertyType} has been found for the user-supplied name,
+ * This method is invoked after a {@code PropertyType} has been found for the user-supplied name,
* but that property can not be stored in or extracted from a {@link Property} instance.
*/
static IllegalArgumentException unsupportedPropertyType(final GenericName name) {
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -46,8 +46,8 @@ import org.apache.sis.internal.jdk8.Unch
* <div class="note"><b>Example:</b> a mutator operation may raise the height of a dam. This changes
* may affect other properties like the watercourse and the reservoir associated with the dam.</div>
*
- * The value is computed, or the operation is executed, by {@link #apply(Feature, ParameterValueGroup)}.
- * If the value is modifiable, new value can be set by call to {@link Attribute#setValue(Object)}.
+ * The value is computed, or the operation is executed, by {@code apply(Feature, ParameterValueGroup)}.
+ * If the value is modifiable, new value can be set by call to {@code Attribute.setValue(Object)}.
*
* <div class="warning"><b>Warning:</b> this class is experimental and may change after we gained more
* experience on this aspect of ISO 19109.</div>
@@ -91,17 +91,17 @@ public abstract class AbstractOperation
* </tr>
* <tr>
* <td>{@value org.apache.sis.feature.AbstractIdentifiedType#DEFINITION_KEY}</td>
- * <td>{@link InternationalString} or {@link String}</td>
+ * <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDefinition()}</td>
* </tr>
* <tr>
* <td>{@value org.apache.sis.feature.AbstractIdentifiedType#DESIGNATION_KEY}</td>
- * <td>{@link InternationalString} or {@link String}</td>
+ * <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDesignation()}</td>
* </tr>
* <tr>
* <td>{@value org.apache.sis.feature.AbstractIdentifiedType#DESCRIPTION_KEY}</td>
- * <td>{@link InternationalString} or {@link String}</td>
+ * <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDescription()}</td>
* </tr>
* <tr>
@@ -166,17 +166,17 @@ public abstract class AbstractOperation
* <ul>
* <li>If {@code getResult()} returns {@code null},
* then this method should return {@code null}.</li>
- * <li>If {@code getResult()} returns an instance of {@link AttributeType},
- * then this method shall return an instance of {@link Attribute}
+ * <li>If {@code getResult()} returns an instance of {@code AttributeType},
+ * then this method shall return an instance of {@code Attribute}
* and the {@code Attribute.getType() == getResult()} relation should hold.</li>
- * <li>If {@code getResult()} returns an instance of {@link FeatureAssociationRole},
- * then this method shall return an instance of {@link FeatureAssociation}
+ * <li>If {@code getResult()} returns an instance of {@code FeatureAssociationRole},
+ * then this method shall return an instance of {@code FeatureAssociation}
* and the {@code FeatureAssociation.getRole() == getResult()} relation should hold.</li>
* </ul>
*
* <div class="note"><b>Analogy:</b>
- * if we compare {@code Operation} to {@link Method} in the Java language, then this method is equivalent
- * to {@link Method#apply(Object, Object...)}. The {@code Feature} argument is equivalent to {@code this}
+ * if we compare {@code Operation} to {@link java.lang.reflect.Method} in the Java language, then this method is equivalent
+ * to {@link java.lang.reflect.Method#invoke(Object, Object...)}. The {@code Feature} argument is equivalent to {@code this}
* in the Java language, and may be {@code null} if the operation does not need a feature instance
* (like static methods in the Java language).</div>
*
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -50,7 +50,7 @@ class AssociationView extends AbstractAs
/**
* The string representation of the property name. This is the value to be given in calls to
- * {@link Feature#getPropertyValue(String)} and {@link Feature#setPropertyValue(String, Object)}.
+ * {@code Feature.getPropertyValue(String)} and {@code Feature.setPropertyValue(String, Object)}.
*/
final String name;
@@ -134,7 +134,7 @@ class AssociationView extends AbstractAs
/**
* Sets the value of this association. This method assumes that the
- * {@link Feature#setPropertyValue(String, Object)} implementation
+ * {@code Feature.setPropertyValue(String, Object)} implementation
* will verify the argument type.
*/
@Override
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -52,7 +52,7 @@ class AttributeView<V> extends AbstractA
/**
* The string representation of the property name. This is the value to be given in calls to
- * {@link Feature#getPropertyValue(String)} and {@link Feature#setPropertyValue(String, Object)}.
+ * {@code Feature.getPropertyValue(String)} and {@code Feature.setPropertyValue(String, Object)}.
*/
final String name;
@@ -144,7 +144,7 @@ class AttributeView<V> extends AbstractA
/**
* Sets the value of this attribute. This method assumes that the
- * {@link Feature#setPropertyValue(String, Object)} implementation
+ * {@code Feature.setPropertyValue(String, Object)} implementation
* will verify the argument type.
*/
@Override
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -53,8 +53,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 AbstractAttribute<?> source, final CharacteristicTypeMap types) {
this.source = source;
@@ -311,7 +311,7 @@ final class CharacteristicMap extends Ab
/**
* An entry returned by the {@link CharacteristicMap#entrySet()} iterator.
* The key and value are never null, even in case of concurrent modification.
- * This entry supports the {@link #setValue(Attribute)} operation.
+ * This entry supports the {@code setValue(Attribute)} operation.
*/
private final class Entry extends AbstractMapEntry<String, AbstractAttribute<?>> {
/** Index of the attribute characteristics represented by this entry. */
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -39,7 +39,7 @@ import org.apache.sis.internal.jdk8.JDK8
* 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,DefaultAttributeType>} 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/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -71,8 +71,6 @@ public class DefaultAssociationRole exte
* The name of the property to use as a title for the associated feature, or an empty string if none.
* This field is initially null, then computed when first needed.
* This information is used only by {@link AbstractAssociation#toString()} implementation.
- *
- * @see #getTitleProperty()
*/
private transient volatile String titleProperty;
@@ -298,7 +296,7 @@ public class DefaultAssociationRole exte
}
/**
- * Potentially invoked after {@link #search(FeatureType, GenericName, List)} for searching
+ * Potentially invoked after {@code search(FeatureType, GenericName, List)} for searching
* in associations of associations.
*
* <p>Current implementation does not check that there is no duplicated names. Even if we did so,
@@ -306,9 +304,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 {@code 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 DefaultFeatureType deepSearch(final List<DefaultFeatureType> deferred, final GenericName name) {
@@ -331,7 +328,7 @@ public class DefaultAssociationRole exte
* Returns the type of feature values.
*
* <p>This method can not be invoked if {@link #isResolved()} returns {@code false}.
- * However it is still possible to {@linkplain Features#getValueTypeName(PropertyType)
+ * However it is still possible to {@linkplain Features#getValueTypeName
* get the associated feature type name}.</p>
*
* <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
@@ -343,7 +340,6 @@ public class DefaultAssociationRole exte
* and not yet resolved.
*
* @see #isResolved()
- * @see Features#getValueTypeName(PropertyType)
*/
public final DefaultFeatureType getValueType() {
/*
@@ -390,7 +386,7 @@ public class DefaultAssociationRole exte
}
/**
- * Implementation of {@link #getTitleProperty(FeatureAssociationRole)} for first search,
+ * Implementation of {@code getTitleProperty(FeatureAssociationRole)} for first search,
* or for non-SIS {@code FeatureAssociationRole} implementations.
*/
private static String searchTitleProperty(final DefaultAssociationRole role) {
@@ -434,7 +430,7 @@ public class DefaultAssociationRole exte
*
* @return a new association instance.
*
- * @see AbstractAssociation#create(FeatureAssociationRole)
+ * @see AbstractAssociation#create(DefaultAssociationRole)
*/
public AbstractAssociation newInstance() {
return AbstractAssociation.create(this);
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -89,7 +89,7 @@ import org.apache.sis.internal.jdk8.JDK8
*
* <div class="section">Immutability and thread safety</div>
* Instances of this class are immutable if all properties ({@link GenericName} and {@link InternationalString}
- * instances) and all arguments ({@link AttributeType} instances) given to the constructor are also immutable.
+ * instances) and all arguments ({@code AttributeType} instances) given to the constructor are also immutable.
* Such immutable instances can be shared by many objects and passed between threads without synchronization.
*
* @author Johann Sorel (Geomatys)
@@ -137,7 +137,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 {@code 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
@@ -346,7 +346,7 @@ public class DefaultFeatureType extends
*
* @param properties same content as {@link #properties} (may be the reference to the same list), but
* optionally in a temporarily modifiable list if we want to allow removal of duplicated values.
- * See {@link #scanPropertiesFrom(FeatureType, Collection)} javadoc for more explanation.
+ * See {@code scanPropertiesFrom(FeatureType, Collection)} javadoc for more explanation.
* @throws IllegalArgumentException if two properties have the same name.
*/
private void computeTransientFields(final List<AbstractIdentifiedType> properties) {
@@ -454,7 +454,7 @@ public class DefaultFeatureType extends
* <ul>
* <li>Avoid a call to the user-overrideable {@link #getProperties(boolean)} method
* while this {@code DefaultFeatureType} instance is still under constructor.</li>
- * <li>Allow the {@link #DefaultFeatureType(Map, boolean, FeatureType[], PropertyType[])} constructor
+ * <li>Allow the {@code DefaultFeatureType(Map, boolean, FeatureType[], PropertyType[])} constructor
* to pass a temporary modifiable list that allow element removal.</li>
* </ul>
*
@@ -539,7 +539,7 @@ public class DefaultFeatureType extends
}
/**
- * Implementation of {@link #resolve(FeatureType, Map)}, also to be invoked from the constructor.
+ * Implementation of {@code resolve(FeatureType, Map)}, also to be invoked from the constructor.
*
* <p>{@code this} shall be the instance in process of being created, not other instance
* (i.e. recursive method invocations are performed on the same {@code this} instance).</p>
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=1790195&r1=1790194&r2=1790195&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] Wed Apr 5 09:26:10 2017
@@ -260,7 +260,7 @@ final class EnvelopeOperation extends Ab
private static final long serialVersionUID = 926172863066901618L;
/**
- * The feature specified to the {@link StringJoinOperation#apply(Feature, ParameterValueGroup)} method.
+ * The feature specified to the {@code StringJoinOperation.apply(Feature, ParameterValueGroup)} method.
*/
private final AbstractFeature feature;
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -124,7 +124,7 @@ public class FeatureFormat extends Tabul
/**
* Returns the type of objects formatted by this class. This method has to return {@code Object.class}
- * since it is the only common parent to {@link Feature} and {@link FeatureType}.
+ * since it is the only common parent to {@code Feature} and {@link FeatureType}.
*
* @return {@code Object.class}
*/
@@ -162,8 +162,8 @@ public class FeatureFormat extends Tabul
* The object may be an instance of any of the following types:
*
* <ul>
- * <li>{@link Feature}</li>
- * <li>{@link FeatureType}</li>
+ * <li>{@code Feature}</li>
+ * <li>{@code FeatureType}</li>
* </ul>
*
* @throws IOException if an error occurred while writing to the given appendable.
@@ -462,7 +462,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/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -93,7 +93,7 @@ import org.apache.sis.util.resources.Err
* </tr>
* <tr>
* <td>{@value org.apache.sis.referencing.AbstractIdentifiedObject#LOCALE_KEY}</td>
- * <td>{@link Locale}</td>
+ * <td>{@link java.util.Locale}</td>
* <td>(none)</td>
* </tr>
* </table>
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -109,17 +109,17 @@ public final class Features extends Stat
/**
* Returns the name of the type of values that the given property can take.
- * The type of value can be a {@link Class}, a {@link FeatureType} or another {@code PropertyType}
- * depending on given argument:
+ * The type of value can be a {@link Class}, a {@code FeatureType}
+ * or another {@code PropertyType} depending on given argument:
*
* <ul>
- * <li>If {@code property} is an {@link AttributeType}, then this method gets the
+ * <li>If {@code property} is an {@code AttributeType}, then this method gets the
* {@linkplain DefaultAttributeType#getValueClass() value class} and
* {@linkplain DefaultNameFactory#toTypeName(Class) maps that class to a name}.</li>
- * <li>If {@code property} is a {@link FeatureAssociationRole}, then this method gets
+ * <li>If {@code property} is a {@code FeatureAssociationRole}, then this method gets
* the name of the {@linkplain DefaultAssociationRole#getValueType() value type}.
* This methods can work even if the associated {@code FeatureType} is not yet resolved.</li>
- * <li>If {@code property} is an {@link Operation}, then this method returns the name of the
+ * <li>If {@code property} is an {@code Operation}, then this method returns the name of the
* {@linkplain AbstractOperation#getResult() result type}.</li>
* </ul>
*
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/InvalidFeatureException.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -23,14 +23,10 @@ import org.apache.sis.util.LocalizedExce
/**
* Thrown when a feature fails at least one conformance test.
*
- * <div class="note"><b>Note:</b>
- * this exception extends {@link InvalidPropertyValueException} because an Apache SIS feature
- * can be invalid only if a property is invalid.</div>
- *
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
*
- * @see Features#validate(Feature)
+ * @see Features#validate(AbstractFeature)
*
* @since 0.7
* @module
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -63,8 +63,6 @@ final class LinkOperation extends Abstra
*
* @param identification the name of the link, together with optional information.
* @param referent the referenced attribute or feature association.
- *
- * @see FeatureOperations#link(Map, PropertyType)
*/
LinkOperation(final Map<String,?> identification, final AbstractIdentifiedType referent) {
super(identification);
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -75,7 +75,7 @@ final class PropertyView {
* Returns the singleton value. This default implementation assumes that the property is multi-valued
* (single-valued properties shall override this method), but we nevertheless provide a fallback for
* non-{@code Iterable} values as a safety against implementations that are not strictly compliant
- * to our {@link Feature#getPropertyValue(String)} method contract. Then this method verifies that
+ * to our {@code Feature.getPropertyValue(String)} method contract. Then this method verifies that
* the value is a collection containing zero or one element and returns that element or {@code null}.
*/
static Object getValue(final AbstractFeature feature, final String name) {
@@ -96,7 +96,7 @@ final class PropertyView {
/**
* Sets the values of the given attribute. This default implementation assumes that the property
* is multi-valued (single-valued properties shall override this method) and that the
- * {@link Feature#setPropertyValue(String, Object)} implementation will verify the argument type.
+ * {@code Feature.setPropertyValue(String, Object)} implementation will verify the argument type.
*/
static void setValue(final AbstractFeature feature, final String name, final Object value) {
feature.setPropertyValue(name, singletonOrEmpty(value));
@@ -136,7 +136,7 @@ final class PropertyView {
/**
* Sets the values of the given attribute. This method assumes that the
- * {@link Feature#setPropertyValue(String, Object)} implementation will
+ * {@code Feature.setPropertyValue(String, Object)} implementation will
* verify the argument type.
*/
static void setValues(final AbstractFeature feature, final String name, final Collection<?> values) {
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -90,7 +90,7 @@ final class SingletonAssociation extends
* Sets the associated feature.
*
* @param value the new value, or {@code null}.
- * @throws InvalidPropertyValueException if the given feature is not valid for this association.
+ * @throws IllegalArgumentException if the given feature is not valid for this association.
*/
@Override
public void setValue(final AbstractFeature value) throws IllegalArgumentException {
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=1790195&r1=1790194&r2=1790195&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] Wed Apr 5 09:26:10 2017
@@ -117,8 +117,6 @@ final class StringJoinOperation extends
* Creates a new operation for string concatenations using the given prefix, suffix and delimeter.
* It is caller's responsibility to ensure that {@code delimiter} and {@code singleAttributes} are not null.
* This private constructor does not verify that condition on the assumption that the public API did.
- *
- * @see FeatureOperations#compound(Map, String, String, String, PropertyType...)
*/
@SuppressWarnings({"rawtypes", "unchecked"}) // Generic array creation.
StringJoinOperation(final Map<String,?> identification, final String delimiter,
@@ -237,7 +235,7 @@ final class StringJoinOperation extends
private static final long serialVersionUID = -8435975199763452547L;
/**
- * The feature specified to the {@link StringJoinOperation#apply(Feature, ParameterValueGroup)} method.
+ * The feature specified to the {@code StringJoinOperation.apply(Feature, ParameterValueGroup)} method.
*/
private final AbstractFeature feature;
@@ -304,7 +302,7 @@ final class StringJoinOperation extends
* parsed, then this method does not store any property value ("all or nothing" behavior).
*
* @param value the concatenated string.
- * @throws InvalidPropertyValueException if one of the attribute values can not be parsed to the expected type.
+ * @throws IllegalArgumentException if one of the attribute values can not be parsed to the expected type.
*/
@Override
public void setValue(final String value) throws IllegalArgumentException {
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=1790195&r1=1790194&r2=1790195&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] Wed Apr 5 09:26:10 2017
@@ -50,8 +50,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/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -27,15 +27,15 @@ import org.apache.sis.feature.DefaultFea
/**
* Describes one association from the {@code FeatureType} to be built by an {@code FeatureTypeBuilder} to another
* {@code FeatureType}. A different instance of {@code AssociationRoleBuilder} exists for each feature association
- * to describe. Those instances are created preferably by {@link FeatureTypeBuilder#addAssociation(FeatureType)},
- * or in case of cyclic reference by {@link FeatureTypeBuilder#addAssociation(GenericName)}.
+ * to describe. Those instances are created preferably by {@code FeatureTypeBuilder.addAssociation(FeatureType)},
+ * or in case of cyclic reference by {@code FeatureTypeBuilder.addAssociation(GenericName)}.
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
*
* @see org.apache.sis.feature.DefaultAssociationRole
- * @see FeatureTypeBuilder#addAssociation(FeatureType)
+ * @see FeatureTypeBuilder#addAssociation(DefaultFeatureType)
* @see FeatureTypeBuilder#addAssociation(GenericName)
*
* @since 0.8
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -41,7 +41,7 @@ import org.apache.sis.internal.jdk8.BiFu
* @author Martin Desruisseaux (Geomatys)
* @version 0.8
*
- * @see Attribute#addRole(AttributeRole)
+ * @see AttributeTypeBuilder#addRole(AttributeRole)
*
* @since 0.8
* @module
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -500,7 +500,7 @@ public final class AttributeTypeBuilder<
*
* @see #getCharacteristic(String)
* @see #addCharacteristic(Class)
- * @see #addCharacteristic(AttributeType)
+ * @see #addCharacteristic(DefaultAttributeType)
* @see #setValidValues(Object...)
* @see #setCRS(CoordinateReferenceSystem)
*/
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -47,7 +47,7 @@ import org.apache.sis.feature.DefaultAtt
/**
- * Helper class for the creation of {@link FeatureType} instances.
+ * Helper class for the creation of {@code FeatureType} instances.
* This builder can create the arguments to be given to the
* {@linkplain DefaultFeatureType#DefaultFeatureType feature type constructor}
* from simpler parameters given to this builder.
@@ -469,7 +469,6 @@ public class FeatureTypeBuilder extends
* @return {@code this} for allowing method calls chaining.
*
* @see AttributeRole#IDENTIFIER_COMPONENT
- * @see FeatureOperations#compound(Map, String, String, String, PropertyType...)
*/
public FeatureTypeBuilder setIdentifierDelimiters(final String delimiter, final String prefix, final String suffix) {
ensureNonEmpty("delimiter", delimiter);
@@ -493,10 +492,10 @@ public class FeatureTypeBuilder extends
*
* @see #getProperty(String)
* @see #addAttribute(Class)
- * @see #addAttribute(AttributeType)
- * @see #addAssociation(FeatureType)
+ * @see #addAttribute(DefaultAttributeType)
+ * @see #addAssociation(DefaultFeatureType)
* @see #addAssociation(GenericName)
- * @see #addAssociation(FeatureAssociationRole)
+ * @see #addAssociation(DefaultAssociationRole)
*/
public List<PropertyTypeBuilder> properties() {
return new RemoveOnlyList<>(properties);
@@ -510,8 +509,6 @@ public class FeatureTypeBuilder extends
* @param name name of the property to search.
* @return property of the given name, or {@code null} if none.
* @throws IllegalArgumentException if the given name is ambiguous.
- *
- * @see #addProperty(PropertyType)
*/
public PropertyTypeBuilder getProperty(final String name) {
return forName(properties, name);
@@ -528,7 +525,7 @@ public class FeatureTypeBuilder extends
* }
*
* The value class can not be {@code Feature.class} since features shall be handled
- * as {@linkplain #addAssociation(FeatureType) associations} instead than attributes.
+ * as {@linkplain #addAssociation(DefaultFeatureType) associations} instead than attributes.
*
* @param <V> the compile-time value of {@code valueClass} argument.
* @param valueClass the class of attribute values (can not be {@code Feature.class}).
@@ -593,7 +590,7 @@ public class FeatureTypeBuilder extends
/**
* Creates a new {@code FeatureAssociationRole} builder for features of a type of the given name.
- * This method can be invoked as an alternative to {@link #addAssociation(FeatureType)} when the
+ * This method can be invoked as an alternative to {@code addAssociation(FeatureType)} when the
* {@code FeatureType} instance is not yet available because of cyclic dependency.
*
* @param type the name of the type of feature values.
@@ -634,9 +631,9 @@ public class FeatureTypeBuilder extends
* Adds the given property in the feature type properties.
* The given property shall be an instance of one of the following types:
* <ul>
- * <li>{@link AttributeType}, in which case this method delegate to {@link #addAttribute(AttributeType)}.</li>
- * <li>{@link FeatureAssociationRole}, in which case this method delegate to {@link #addAssociation(FeatureAssociationRole)}.</li>
- * <li>{@link Operation}, in which case the given operation object will be added verbatim in the {@code FeatureType};
+ * <li>{@code AttributeType}, in which case this method delegate to {@code addAttribute(AttributeType)}.</li>
+ * <li>{@code FeatureAssociationRole}, in which case this method delegate to {@code addAssociation(FeatureAssociationRole)}.</li>
+ * <li>{@code Operation}, in which case the given operation object will be added verbatim in the {@code FeatureType};
* this builder does not create new operations.</li>
* </ul>
*
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -30,10 +30,10 @@ import org.apache.sis.feature.AbstractId
*
* <ul>
* <li>{@link FeatureTypeBuilder#addAttribute(Class)}</li>
- * <li>{@link FeatureTypeBuilder#addAttribute(AttributeType)} for using an existing attribute as a template</li>
- * <li>{@link FeatureTypeBuilder#addAssociation(FeatureType)}</li>
+ * <li>{@link FeatureTypeBuilder#addAttribute(DefaultAttributeType)} for using an existing attribute as a template</li>
+ * <li>{@link FeatureTypeBuilder#addAssociation(DefaultFeatureType)}</li>
* <li>{@link FeatureTypeBuilder#addAssociation(GenericName)}</li>
- * <li>{@link FeatureTypeBuilder#addAssociation(FeatureAssociationRole)} for using an existing association as a template</li>
+ * <li>{@link FeatureTypeBuilder#addAssociation(DefaultAssociationRole)} for using an existing association as a template</li>
* </ul>
*
* @author Johann Sorel (Geomatys)
@@ -53,7 +53,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()
*/
@@ -61,7 +61,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/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] Wed Apr 5 09:26:10 2017
@@ -437,8 +437,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) {