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 2015/04/01 00:38:56 UTC
svn commit: r1670505 [1/12] - in /sis/trunk: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/src/main/java/org/apache/sis/services/
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
core/sis-fea...
Author: desruisseaux
Date: Tue Mar 31 22:38:52 2015
New Revision: 1670505
URL: http://svn.apache.org/r1670505
Log:
Merge from the JDK6 branch: added support of the Mercator projection.
This is a large merge because of the general framework needed for map projection support (any of them).
Added:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Pending.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Pending.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/UnmodifiableMatrix.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/UnmodifiableMatrix.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Assertions.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Assertions.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
- copied unchanged from r1670490, sis/branches/JDK6/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
- copied unchanged from r1670490, sis/branches/JDK6/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/ProjectionException.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
sis/trunk/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.MathTransformFactory
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.MathTransformFactory
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/parameter/UnmodifiableParameterValueTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/
- copied from r1670490, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/mock/MathTransformFactoryMock.java
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/test/mock/MathTransformFactoryMock.java
sis/trunk/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory
- copied unchanged from r1670490, sis/branches/JDK6/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory
Removed:
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Section.java
Modified:
sis/trunk/ (props changed)
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/Command.java
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/SubCommand.java
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.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/AbstractAssociation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.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/DefaultAttributeType.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/MultiValuedAssociation.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.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/SingletonAttribute.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java
sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.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/Symbols.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.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/ValueExistencePolicy.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.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/ImmutableIdentifier.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.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/DefaultTelephone.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.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/extent/DefaultVerticalExtent.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.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/DefaultAssociatedResource.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.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/DefaultLineage.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.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/iso/maintenance/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.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/CustomMetadataTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.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/ArrayEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelopes.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/AxisDirections.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ExtendedPrecisionMatrix.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.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/provider/AbstractProvider.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/LongitudeRotation.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.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/DefaultParameterValue.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.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/ParameterTableRow.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameterized.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/package-info.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/AbstractReferenceSystem.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/CRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.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/crs/AbstractCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.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/CoordinateSystems.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.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/DefaultCylindricalCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.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/DefaultEllipsoid.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.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/datum/DefaultTemporalDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.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/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/Matrix1.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix3.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix4.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.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/matrix/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.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/AbstractMathTransform1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.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/ConcatenatedTransformDirect2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CopyTransform.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/ExponentialTransform1D.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/IterationStrategy.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.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/LogarithmicTransform1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.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/PassThroughTransform.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/ProjectiveTransform.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/formulas.html
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/package-info.java
sis/trunk/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/FormulasTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/OperationMethodsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.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/BuilderTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.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/DefaultGeocentricCRSTest.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/operation/builder/LinearTransformBuilderTest.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/SolverTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.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/NormalizedProjectionTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomain.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateDomainTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.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/test/ReferencingAssert.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/mock/GeodeticDatumMock.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ArrayConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.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/DateConverter.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/IdentityConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.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/SystemConverter.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/Context.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/PrimitiveTypeProperties.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedRunnable.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Threads.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Cloner.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.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/LocalizedParseException.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/UnmodifiableArrayList.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Utilities.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/package-info.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/io/Appender.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/IO.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.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/math/Statistics.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Angle.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.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/Latitude.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Longitude.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.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/RangeFormat.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Debug.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.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/ObjectConverters.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.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/TableColumn.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.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/collection/TreeTables.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.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/util/logging/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredNamespaces.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/MarshalContext.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
sis/trunk/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/package-info.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
sis/trunk/ide-project/NetBeans/build.xml
sis/trunk/ide-project/NetBeans/nbproject/project.properties
sis/trunk/pom.xml
sis/trunk/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java
sis/trunk/src/main/javadoc/stylesheet.css
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.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/GridGeometry.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/package-info.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/storage/netcdf/MetadataReader.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 22:38:52 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1667400
-/sis/branches/JDK7:1394913-1667398
-/sis/branches/JDK8:1584960-1667393
+/sis/branches/JDK6:1394364-1670490
+/sis/branches/JDK7:1394913-1670488
+/sis/branches/JDK8:1584960-1670486
Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/AboutSC.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -43,7 +43,7 @@ import org.apache.sis.internal.system.Su
* <li>{@code --verbose}: prints all information including the libraries.</li>
* </ul>
*
- * {@section About SIS installation on a remote machine}
+ * <div class="section">About SIS installation on a remote machine</div>
* This sub-command can provide information about SIS installation on a remote machine,
* provided that remote access has been enabled at the Java Virtual Machine startup time.
* See {@link org.apache.sis.console} package javadoc for more information.
Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/Command.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/Command.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -58,7 +58,7 @@ import org.apache.sis.util.logging.Monol
* to the {@linkplain System#err standard error stream}. The reason is that command output may be targeted to
* a client, while the error messages are usually for the operator.
*
- * {@section SIS installation on remote machines}
+ * <div class="section">SIS installation on remote machines</div>
* Some sub-commands can operate on SIS installation on remote machines, provided that remote access has been enabled
* at the Java Virtual Machine startup time. See {@link org.apache.sis.console} package javadoc for more information.
*
Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/SubCommand.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/SubCommand.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/SubCommand.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/SubCommand.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -280,7 +280,7 @@ abstract class SubCommand {
}
/**
- * Prints the "<cite>Can not open …</cite>" error message followed by the message in the given exception.
+ * Prints the <cite>"Can not open …"</cite> error message followed by the message in the given exception.
*
* @param fileIndex Index in the {@link #files} list of the file that can not be opened.
* @param e The exception which occurred.
Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -19,7 +19,7 @@
* Command line interface for Apache SIS.
* See {@link org.apache.sis.console.Command} for the list of supported commands.
*
- * {@section SIS installation on remote machines}
+ * <div class="section">SIS installation on remote machines</div>
* Some sub-commands can operate on SIS installation on remote machines, provided
* that the remote Java Virtual Machine has been started with the following options:
*
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -467,7 +467,6 @@ public class LocationServlet extends Htt
/**
* Replace all non-alphanumeric characters with empty strings.
*
- * @param id
* @return String without any non-alphanumeric characters
*/
private static String cleanStr(String id) {
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -30,7 +30,7 @@ import org.apache.sis.util.resources.Err
* An instance of an {@linkplain DefaultAssociationRole feature association role} containing the associated feature.
* {@code AbstractAssociation} can be instantiated by calls to {@link DefaultAssociationRole#newInstance()}.
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code AbstractAssociation} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
@@ -157,7 +157,7 @@ public abstract class AbstractAssociatio
* <div class="warning"><b>Warning:</b> In a future SIS version, the argument type may be changed
* to {@code org.opengis.feature.Feature}. This change is pending GeoAPI revision.</div>
*
- * {@section Validation}
+ * <div class="section">Validation</div>
* The amount of validation performed by this method is implementation dependent.
* Usually, only the most basic constraints are verified. This is so for performance reasons
* and also because some rules may be temporarily broken while constructing a feature.
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -50,7 +50,7 @@ import org.apache.sis.internal.jdk7.JDK7
*
* {@code AbstractAttribute} can be instantiated by calls to {@link DefaultAttributeType#newInstance()}.
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code AbstractAttribute} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
@@ -230,7 +230,7 @@ public abstract class AbstractAttribute<
/**
* Sets the attribute value. All previous values are replaced by the given singleton.
*
- * {@section Validation}
+ * <div class="section">Validation</div>
* The amount of validation performed by this method is implementation dependent.
* Usually, only the most basic constraints are verified. This is so for performance reasons
* and also because some rules may be temporarily broken while constructing a feature.
@@ -260,7 +260,7 @@ public abstract class AbstractAttribute<
/**
* Other attributes that describes this attribute. For example if this attribute carries a measurement,
* then a characteristic of this attribute could be the measurement accuracy.
- * See "<cite>Attribute characterization</cite>" in {@link DefaultAttributeType} Javadoc for more information.
+ * See <cite>"Attribute characterization"</cite> in {@link DefaultAttributeType} Javadoc for more information.
*
* <p>The map returned by this method contains only the characteristics explicitely defined for this attribute.
* If the map contains no characteristic for a given name, a {@linkplain DefaultAttributeType#getDefaultValue()
@@ -275,7 +275,7 @@ public abstract class AbstractAttribute<
* Consequently, {@code characteristics.isEmpty()} is a convenient way to check that an attribute have
* all the "standard" characteristics and need no special processing.</div>
*
- * {@section Reading a characteristic}
+ * <div class="section">Reading a characteristic</div>
* The characteristic values are enumerated in the {@linkplain Map#values() map values}.
* The {@linkplain Map#keySet() map keys} are the {@code String} representations of characteristics
* {@linkplain DefaultAttributeType#getName() name}, for more convenient lookups.
@@ -295,7 +295,7 @@ public abstract class AbstractAttribute<
* }
* }
*
- * {@section Adding a characteristic}
+ * <div class="section">Adding a characteristic</div>
* A new characteristic can be added in the map in three different ways:
* <ol>
* <li>Putting the (<var>name</var>, <var>characteristic</var>) pair explicitely.
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -41,14 +41,14 @@ import org.apache.sis.internal.util.Chec
*
* {@code AbstractFeature} can be instantiated by calls to {@link DefaultFeatureType#newInstance()}.
*
- * {@section Simple features}
+ * <div class="section">Simple features</div>
* A feature is said “simple” if it complies to the following conditions:
* <ul>
* <li>the feature allows only attributes and operations (no associations),</li>
* <li>the cardinality of all attributes is constrained to [1 … 1].</li>
* </ul>
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code AbstractFeature} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
@@ -260,7 +260,7 @@ public abstract class AbstractFeature im
/**
* Sets the value for the property of the given name.
*
- * {@section Validation}
+ * <div class="section">Validation</div>
* The amount of validation performed by this method is implementation dependent.
* Usually, only the most basic constraints are verified. This is so for performance reasons
* and also because some rules may be temporarily broken while constructing a feature.
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -156,7 +156,7 @@ public class AbstractIdentifiedType impl
* </tr>
* </table>
*
- * {@section Localization}
+ * <div class="section">Localization</div>
* All localizable attributes like {@code "definition"} may have a language and country code suffix.
* For example the {@code "definition_fr"} property stands for remarks in {@linkplain Locale#FRENCH French} and
* the {@code "definition_fr_CA"} property stands for remarks in {@linkplain Locale#CANADA_FRENCH French Canadian}.
@@ -178,7 +178,7 @@ public class AbstractIdentifiedType impl
throw new IllegalArgumentException(Errors.getResources(identification)
.getString(Errors.Keys.MissingValueForProperty_1, NAME_KEY));
} else if (value instanceof String) {
- name = createName(DefaultFactories.NAMES, (String) value);
+ name = createName(DefaultFactories.forBuildin(NameFactory.class), (String) value);
} else if (value instanceof GenericName) {
name = (GenericName) value;
} else {
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -31,14 +31,14 @@ import static org.apache.sis.util.Argume
* Implementation of the map returned by {@link DefaultAttributeType#characteristics()}.
* Information provided by this implementation are also used by {@link CharacteristicMap}.
*
- * <p><b>Comparison with standard hash map:</b>
+ * <div class="section">Comparison with standard hash map</div>
* The straightforward approach would be to store the attributes directly as values in a standard {@code HashMap}.
* 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()}),
* since it allows a more efficient storage. We do this effort because some applications may create a very large
- * amount of attribute instances.</p>
+ * amount of attribute instances.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -40,7 +40,7 @@ import static org.apache.sis.util.Argume
* feature instances by other feature instances.</li>
* </ul>
*
- * {@section Immutability and thread safety}
+ * <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 (e.g. {@code valueType}) given to the constructor are also immutable.
* Such immutable instances can be shared by many objects and passed between threads without synchronization.
@@ -144,7 +144,7 @@ public class DefaultAssociationRole exte
* );
* }
*
- * After the above code completed, the {@linkplain #getValueType() value type} of "<cite>association to B</cite>"
+ * After the above code completed, the {@linkplain #getValueType() value type} of <cite>"association to B"</cite>
* has been automatically set to the {@code typeB} instance.
* </div>
*
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -51,7 +51,7 @@ import org.apache.sis.internal.jdk7.Obje
* When such interface will be available, most references to {@code DefaultAttributeType} in current
* API will be replaced by references to the {@code AttributeType} interface.</div>
*
- * {@section Value type}
+ * <div class="section">Value type</div>
* Attributes can be used for both spatial and non-spatial properties.
* Some examples are:
*
@@ -63,7 +63,7 @@ import org.apache.sis.internal.jdk7.Obje
* <tr><td>Horizontal accuracy</td> <td>{@link org.opengis.metadata.quality.PositionalAccuracy}</td></tr>
* </table>
*
- * {@section Attribute characterization}
+ * <div class="section">Attribute characterization</div>
* An {@code Attribute} can be characterized by other attributes. For example an attribute that carries a measurement
* (e.g. air temperature) may have another attribute that holds the measurement accuracy (e.g. ±0.1°C).
* The accuracy value is often constant for all instances of that attribute
@@ -88,7 +88,7 @@ import org.apache.sis.internal.jdk7.Obje
* It is still possible for any specific {@code Attribute} instance to specify their own value,
* but {@linkplain DefaultFeatureType#isSimple() simple feature} usually don't do that.
*
- * {@section Immutability and thread safety}
+ * <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 (e.g. {@code defaultValue}) given to the constructor are also immutable.
* Such immutable instances can be shared by many objects and passed between threads without synchronization.
@@ -178,7 +178,7 @@ public class DefaultAttributeType<V> ext
* @param characterizedBy Other attribute types that describes this attribute type (can be {@code null} for none).
* For example if this new {@code DefaultAttributeType} describes a measurement,
* then {@code characterizedBy} could holds the measurement accuracy.
- * See "<cite>Attribute characterization</cite>" in class Javadoc for more information.
+ * See <cite>"Attribute characterization"</cite> in class Javadoc for more information.
*/
public DefaultAttributeType(final Map<String,?> identification, final Class<V> valueClass,
final int minimumOccurs, final int maximumOccurs, final V defaultValue,
@@ -286,7 +286,7 @@ public class DefaultAttributeType<V> ext
/**
* Other attribute types that describes this attribute type.
- * See "<cite>Attribute characterization</cite>" in class Javadoc for more information.
+ * See <cite>"Attribute characterization"</cite> in class Javadoc for more information.
*
* <div class="note"><b>Example:</b>
* An attribute that carries a measurement (e.g. air temperature) may have another attribute that holds the
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -51,12 +51,12 @@ import org.apache.sis.internal.util.Unmo
* When such interface will be available, most references to {@code DefaultFeatureType} in the API
* will be replaced by references to the {@code FeatureType} interface.</div>
*
- * {@section Naming}
+ * <div class="section">Naming</div>
* The feature type {@linkplain #getName() name} is mandatory and should be unique. Those names are the main
* criterion used for deciding if a feature type {@linkplain #isAssignableFrom is assignable from} another type.
* Names can be {@linkplain org.apache.sis.util.iso.DefaultScopedName scoped} for avoiding name collision.
*
- * {@section Properties and inheritance}
+ * <div class="section">Properties and inheritance</div>
* Each feature type can provide descriptions for the following {@linkplain #getProperties(boolean) properties}:
*
* <ul>
@@ -75,7 +75,7 @@ import org.apache.sis.internal.util.Unmo
* which are implicitly <cite>covariant</cite> (i.e. {@code String[]} can be casted to {@code CharSequence[]}, which
* is safe for read operations but not for write operations — the later may throw {@link ArrayStoreException}).</div>
*
- * {@section Immutability and thread safety}
+ * <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.
* Such immutable instances can be shared by many objects and passed between threads without synchronization.
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -28,7 +28,7 @@ import org.apache.sis.util.resources.Err
* <div class="note"><b>Note:</b> in the common case where the {@linkplain DefaultAssociationRole association role}
* restricts the cardinality to [0 … 1], the {@link SingletonAssociation} implementation consumes less memory.</div>
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code MultiValuedAssociation} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -28,7 +28,7 @@ import org.apache.sis.util.resources.Err
* <div class="note"><b>Note:</b> in the common case where the {@linkplain DefaultAttributeType attribute type}
* restricts the cardinality to [0 … 1], the {@link SingletonAttribute} implementation consumes less memory.</div>
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code MultiValuedAttribute} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
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=1670505&r1=1670504&r2=1670505&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] Tue Mar 31 22:38:52 2015
@@ -26,7 +26,7 @@ import org.apache.sis.internal.jdk7.Obje
* While {@link MultiValuedAssociation} would be suitable to all cases, this {@code SingletonAssociation}
* consumes less memory.
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code SingletonAssociation} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -26,7 +26,7 @@ import org.apache.sis.internal.jdk7.Obje
* While {@link MultiValuedAttribute} would be suitable to all cases, this {@code SingletonAttribute}
* consumes less memory.
*
- * {@section Limitations}
+ * <div class="section">Limitations</div>
* <ul>
* <li><b>Multi-threading:</b> {@code SingletonAttribute} instances are <strong>not</strong> thread-safe.
* Synchronization, if needed, shall be done externally by the caller.</li>
Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/package-info.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -20,28 +20,28 @@
* The phenomenon to represent (or a fundamental unit of information) is called <cite>a feature</cite>.
* The term “feature” may be used in different contexts:
*
- * <ul>
- * <li><p><b>{@linkplain org.apache.sis.feature.DefaultFeatureType Feature types}</b><br>
+ * <ul class="verbose">
+ * <li><b>{@linkplain org.apache.sis.feature.DefaultFeatureType Feature types}</b><br>
* Define the <em>structure</em> of real-world representations. A feature type lists the
* {@linkplain org.apache.sis.feature.DefaultAttributeType attributes},
* {@linkplain org.apache.sis.feature.DefaultOperation operations} or
* {@linkplain org.apache.sis.feature.DefaultAssociationRole associations to other features}
* (collectively called “{@linkplain org.apache.sis.feature.DefaultFeatureType#getProperties(boolean) properties}”
- * or “characteristics”) that a feature can have.</p>
+ * or “characteristics”) that a feature can have.
*
* <div class="note"><b>Analogy:</b> a {@code FeatureType} in a Spatial Information System is equivalent to a
* {@link java.lang.Class} in the Java language. By extension, {@code AttributeType} and {@code Operation} are
* equivalent to {@link java.lang.reflect.Field} and {@link java.lang.reflect.Method} respectively.</div></li>
*
- * <li><p><b>{@linkplain org.apache.sis.feature.AbstractFeature Feature instances}</b> (often called only Features)<br>
- * Hold the <em>content</em> (or values) that describe one specific real-world object.</p>
+ * <li><b>{@linkplain org.apache.sis.feature.AbstractFeature Feature instances}</b> (often called only Features)<br>
+ * Hold the <em>content</em> (or values) that describe one specific real-world object.
*
* <div class="note"><b>Example:</b> the “Eiffel tower” is a <em>feature instance</em> belonging
* to the “Tower” <em>feature type</em>.</div></li>
*
- * <li><p><b>{@linkplain org.apache.sis.feature.DefaultFeatureType#isSimple() Simple features}</b><br>
+ * <li><b>{@linkplain org.apache.sis.feature.DefaultFeatureType#isSimple() Simple features}</b><br>
* Are instances of a feature type with no association to other features, and where all attributes
- * are constrained to the [1 … 1] cardinality. Such simple features are very common.</p></li>
+ * are constrained to the [1 … 1] cardinality. Such simple features are very common.</li>
* </ul>
*
* In addition, a feature type can inherit the properties of one or more other feature types.
@@ -49,13 +49,13 @@
* {@linkplain org.apache.sis.feature.DefaultFeatureType#getSuperTypes() super-types}, provided
* that values of the sub-type property are assignable to the super-type property.
*
- * {@section Naming}
+ * <div class="section">Naming</div>
* Each feature type has a {@linkplain org.apache.sis.feature.DefaultFeatureType#getName() name},
* which should be unique. Those names are the main criterion used for checking if a feature type
* {@linkplain org.apache.sis.feature.DefaultFeatureType#isAssignableFrom is assignable from} another type.
* Names can be {@linkplain org.apache.sis.util.iso.DefaultScopedName scoped} for avoiding name collision.
*
- * {@section Class hierarchy}
+ * <div class="section">Class hierarchy</div>
* The class hierarchy for feature <cite>types</cite> is derived from ISO 19109 specification.
* The class hierarchy for feature <cite>instances</cite> is closely related:
*
Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -18,6 +18,7 @@ package org.apache.sis.feature;
import java.util.Map;
import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
@@ -51,7 +52,8 @@ public final strictfp class DefaultAssoc
static DefaultAssociationRole twinTown(final boolean cyclic) {
final Map<String,?> properties = singletonMap(NAME_KEY, "twin town");
if (cyclic) {
- final GenericName valueType = DefaultFactories.SIS_NAMES.createTypeName(null, "Twin town");
+ final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+ final GenericName valueType = factory.createTypeName(null, "Twin town");
return new DefaultAssociationRole(properties, valueType, 0, 1);
} else {
final DefaultFeatureType valueType = DefaultFeatureTypeTest.city();
@@ -142,10 +144,11 @@ public final strictfp class DefaultAssoc
@Test
@DependsOnMethod("testBidirectionalAssociation")
public void testCyclicAssociation() {
- final GenericName nameOfA = DefaultFactories.SIS_NAMES.createTypeName(null, "A");
- final GenericName nameOfB = DefaultFactories.SIS_NAMES.createTypeName(null, "B");
- final GenericName nameOfC = DefaultFactories.SIS_NAMES.createTypeName(null, "C");
- final GenericName nameOfD = DefaultFactories.SIS_NAMES.createTypeName(null, "D");
+ final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+ final GenericName nameOfA = factory.createTypeName(null, "A");
+ final GenericName nameOfB = factory.createTypeName(null, "B");
+ final GenericName nameOfC = factory.createTypeName(null, "C");
+ final GenericName nameOfD = factory.createTypeName(null, "D");
/*
* Associations defined only by the FeatureType name.
*/
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -55,7 +55,7 @@ import org.apache.sis.internal.jdk7.Obje
* parsing and formatting. For real parameter framework, consider using {@link org.apache.sis.parameter}
* package instead.</p>
*
- * {@section Note about raw-type usage}
+ * <div class="section">Note about raw-type usage</div>
* We use raw type (i.e. we implement {@code ParameterDescriptor} instead of {@code ParameterDescriptor<T>})
* because there is no way we can know {@code <T>} for sure at unmarshalling time. This is not a recommended
* practice, so <strong>this class shall not be in public API</strong>. However it should be okay to create
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.citat
* This enumeration specifies whether to use the <cite>Well Known Text</cite> format defined by ISO 19162
* (also known as “WKT 2”), or whether to use the format previously defined in OGC 01-009 (referenced as “WKT 1”).
*
- * {@section WKT 1 variants}
+ * <div class="section">WKT 1 variants</div>
* The WKT 2 format should be parsed and formatted consistently by all softwares.
* But the WKT 1 format has been interpreted differently by various implementors.
* Apache SIS can adapt itself to different WKT variants, sometime automatically. But some aspects can not be guessed.
@@ -104,7 +104,7 @@ public enum Convention {
* and parameters formatted with this convention will use the {@linkplain Citations#OGC OGC}
* names when available.</p>
*
- * {@section Differences compared to WKT 2}
+ * <div class="section">Differences compared to WKT 2</div>
* WKT 1 and WKT 2 differ in their keywords and syntax, but also in more subtle ways regarding parameter
* and code list values. For {@link GeocentricCRS}, WKT 1 uses a legacy set of Cartesian axes which were
* defined in OGC 01-009. Those axes use the <var>Other</var>, <var>Easting</var> and <var>Northing</var>
@@ -133,7 +133,7 @@ public enum Convention {
* <li>The angular units of {@code PRIMEM} and {@code PARAMETER} elements are always degrees,
* no matter the units of the enclosing {@code GEOGCS} element.</li>
* <li>Unit names use American spelling instead than the international ones
- * (e.g. "<cite>meter</cite>" instead than "<cite>metre</cite>").</li>
+ * (e.g. <cite>"meter"</cite> instead than <cite>"metre"</cite>).</li>
* </ul>
*/
WKT1_COMMON_UNITS(true),
@@ -163,6 +163,8 @@ public enum Convention {
* </ul>
*
* This convention is used only for debugging purpose.
+ *
+ * @see org.apache.sis.referencing.operation.projection.NormalizedProjection#getParameterValues()
*/
@Debug
INTERNAL(false);
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -42,12 +42,12 @@ import org.apache.sis.internal.util.X364
* it will rather use non-standard representation if necessary.</li>
* </ul>
*
- * {@section Syntax coloring}
+ * <div class="section">Syntax coloring</div>
* A convenience {@link #print()} method is provided, which is roughly equivalent to
* {@code System.out.println(this)} except that syntax coloring is automatically applied
* if the terminal seems to support the ANSI escape codes.
*
- * {@section Non-standard WKT}
+ * <div class="section">Non-standard WKT</div>
* If this object can not be formatted without violating some WKT constraints,
* then the behavior depends on the method invoked:
*
@@ -199,7 +199,7 @@ public abstract class FormattableObject
* (insertion point)
* }
*
- * {@section Formatting non-standard WKT}
+ * <div class="section">Formatting non-standard WKT</div>
* If the implementation can not represent this object without violating some WKT constraints,
* it can uses its own (non-standard) keywords but shall declare that it did so by invoking one
* of the {@link Formatter#setInvalidWKT(IdentifiedObject, Exception) Formatter.setInvalidWKT(…)}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -408,9 +408,9 @@ public class Formatter implements Locali
* This is not necessarily the authority who created the object to format.</p>
*
* <div class="note"><b>Example:</b>
- * The EPSG name of the {@code EPSG:6326} datum is "<cite>World Geodetic System 1984</cite>".
+ * The EPSG name of the {@code EPSG:6326} datum is <cite>"World Geodetic System 1984"</cite>.
* However if the preferred authority is OGC, then the formatted datum name will rather look like
- * "<cite>WGS84</cite>" (the exact string depends on the object aliases).</div>
+ * <cite>"WGS84"</cite> (the exact string depends on the object aliases).</div>
*
* @return The authority for projection and parameter names.
*
@@ -757,7 +757,7 @@ public class Formatter implements Locali
* Longitudes are relative to the Greenwich meridian, with values increasing toward East.
* Latitudes values are increasing toward North.
*
- * {@section Numerical precision}
+ * <div class="section">Numerical precision</div>
* The ISO 19162 standards recommends to format those values with only 2 decimal digits.
* This is because {@code GeographicBoundingBox} does not specify the datum, so this box
* is an approximative information only.
@@ -1325,7 +1325,7 @@ public class Formatter implements Locali
*
* <p>If the given unit is null, then this method does nothing and returns {@code null}.</p>
*
- * {@section Special case}
+ * <div class="section">Special case</div>
* If the WKT conventions are {@code WKT1_COMMON_UNITS}, then this method ignores the given unit
* and returns {@code null}. See {@link Convention#WKT1_COMMON_UNITS} javadoc for more information.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1670505&r1=1670504&r2=1670505&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Tue Mar 31 22:38:52 2015
@@ -225,7 +225,7 @@ public class Symbols implements Localize
* Returns the locale for formatting dates and numbers.
* The default value is {@link Locale#ROOT}.
*
- * {@section Relationship between <code>Symbols</code> locale and <code>WKTFormat</code> locale}
+ * <div class="section">Relationship between {@code Symbols} locale and {@code WKTFormat} locale</div>
* The {@code WKTFormat.getLocale(Locale.DISPLAY)} property specifies the language to use when
* formatting {@link org.opengis.util.InternationalString} instances and can be set to any value.
* On the contrary, the {@code Locale} property of this {@code Symbols} class controls
@@ -494,7 +494,7 @@ public class Symbols implements Localize
* Creates a new number format to use for parsing and formatting. Each {@link WKTFormat} will
* create its own instance, since {@link NumberFormat}s are not guaranteed to be thread-safe.
*
- * {@section Scientific notation}
+ * <div class="section">Scientific notation</div>
* The {@link NumberFormat} created here does not use scientific notation. This is okay for many
* WKT formatting purpose since Earth ellipsoid axis lengths in metres are large enough for trigging
* scientific notation, while we want to express them as normal numbers with centimetre precision.
@@ -543,7 +543,7 @@ public class Symbols implements Localize
* Invoking this method is equivalent to invoking
* <code>{@linkplain #containsElement(CharSequence, String) containsElement}(wkt, "AXIS")</code>.
*
- * {@section Use case}
+ * <div class="section">Use case</div>
* The check for axis elements is of particular interest because the axis order is a frequent cause
* of confusion when processing geographic data. Some applications just ignore any declared axis order
* in favor of their own hard-coded (<var>longitude</var>, <var>latitude</var>) axis order.