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/01/14 15:01:47 UTC
svn commit: r1651674 [1/5] - in /sis/trunk: ./
application/sis-webapp/src/main/java/org/apache/sis/index/tree/
core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/
core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ core/s...
Author: desruisseaux
Date: Wed Jan 14 14:01:44 2015
New Revision: 1651674
URL: http://svn.apache.org/r1651674
Log:
Merge from the JDK6 branch.
Added:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/NameMeaningTest.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/CurveExtremum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/doc-files/ConicArea.png
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/doc-files/ConicArea.png
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/doc-files/GeographicArea.png
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/doc-files/GeographicArea.png
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
- copied unchanged from r1651615, sis/branches/JDK6/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
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/geometry/CurveExtremumTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
- copied unchanged from r1651615, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/
- copied from r1651615, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
- copied, changed from r1651615, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/AutoChecker.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/AutoChecker.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/InvalidShapefileFormatException.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/InvalidShapefileFormatException.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileByteReader.java
- copied, changed from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileByteReader.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileDescriptor.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileDescriptor.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileNotFoundException.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileNotFoundException.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBaseDataType.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
- copied, changed from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DbaseFileNotFoundException.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DbaseFileNotFoundException.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/InvalidDbaseFileFormatException.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/InvalidDbaseFileFormatException.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
- copied, changed from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/SQLConnectionClosedException.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/package-info.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/package-info.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
- copied, changed from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
sis/trunk/storage/sis-shapefile/src/main/resources/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/main/resources/
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt
- copied unchanged from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/
- copied from r1651615, sis/branches/JDK6/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/
Removed:
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/FilteredRootDoc.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingUtilities.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ReferencingUtilitiesTest.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractConnection.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractResultSet.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractStatement.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBFConnection.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSet.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBFStatement.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Resources.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Resources.properties
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Resources_fr.properties
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/CodePage.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataType.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Database.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/FieldDescriptor.java
Modified:
sis/trunk/ (props changed)
sis/trunk/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java (contents, props changed)
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/metadata/iso/DefaultMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.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/DefaultBand.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.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/content/package-info.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/DefaultSpatialTemporalExtent.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/DefaultAggregateInformation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.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/test/suite/MetadataTestSuite.java
sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
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/GeneralEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.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/Formulas.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.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/referencing/AbstractIdentifiedObject.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/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/DefaultGeographicCRS.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/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/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/DefaultGeodeticDatum.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 (contents, props changed)
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/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MatrixSIS.java (props changed)
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java (props changed)
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NoninvertibleMatrixException.java (props changed)
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java (props changed)
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/provider/Affine.java (props changed)
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/LogarithmicTransform1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
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/referencing/CRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRS.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.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/operation/transform/ExponentialTransform1DTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/integration/DefaultMetadataTest.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/mock/PrimeMeridianMock.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/jaxb/IdentifierMapAdapter.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/measure/Units.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
sis/trunk/ide-project/NetBeans/build.xml
sis/trunk/pom.xml
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.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/VariableInfo.java
sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.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/storage/netcdf/MetadataReaderTest.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/package-info.java
sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFResultSetTest.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 14:01:44 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1641529
-/sis/branches/JDK7:1394913-1641528
-/sis/branches/JDK8:1584960-1641527
+/sis/branches/JDK6:1394364-1651615
+/sis/branches/JDK7:1394913-1651598
+/sis/branches/JDK8:1584960-1651592
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=1651674&r1=1651673&r2=1651674&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 Jan 14 14:01:44 2015
@@ -41,138 +41,138 @@ import com.sun.syndication.feed.rss.Item
*/
public class GeoRSSData implements QuadTreeData {
- private String filename;
- private DirectPosition2D latLon;
+ private String filename;
+ private DirectPosition2D latLon;
- /**
- * Creates a GeoRSSData object that stores the name of the file that the
- * entry's information is written to and the geo location of the entry.
- *
- * @param filename
- * filename where rss entry's info is stored
- * @param latLon
- * geo location of the entry
- */
- public GeoRSSData(String filename, DirectPosition2D latLon) {
- this.filename = filename;
- this.latLon = latLon;
- }
-
- /**
- * Returns the Java 2D x-coordinate for the longitude.
- *
- * @return the Java 2D x-coordinate
- */
- public double getX() {
- return latLon.x + 180.0;
- }
-
- /**
- * Returns the Java 2D y-coordinate for the latitude.
- *
- * @return the Java 2D y-coordinate
- */
- public double getY() {
- return latLon.y + 90.0;
- }
-
-
- /* (non-Javadoc)
- * @see org.apache.sis.storage.QuadTreeData#getLatLon()
- */
- @Override
- public DirectPosition2D getLatLon() {
+ /**
+ * Creates a GeoRSSData object that stores the name of the file that the
+ * entry's information is written to and the geo location of the entry.
+ *
+ * @param filename
+ * filename where rss entry's info is stored
+ * @param latLon
+ * geo location of the entry
+ */
+ public GeoRSSData(String filename, DirectPosition2D latLon) {
+ this.filename = filename;
+ this.latLon = latLon;
+ }
+
+ /**
+ * Returns the Java 2D x-coordinate for the longitude.
+ *
+ * @return the Java 2D x-coordinate
+ */
+ public double getX() {
+ return latLon.x + 180.0;
+ }
+
+ /**
+ * Returns the Java 2D y-coordinate for the latitude.
+ *
+ * @return the Java 2D y-coordinate
+ */
+ public double getY() {
+ return latLon.y + 90.0;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.apache.sis.storage.QuadTreeData#getLatLon()
+ */
+ @Override
+ public DirectPosition2D getLatLon() {
return this.latLon;
- }
+ }
- /**
- * Returns the name of the file where the entry's info is saved.
- *
- * @return the name of the file where the entry's info is saved
- */
- public String getFileName() {
- return this.filename;
- }
-
- /**
- * Saves the GeoRSS entry to file.
- *
- * @param item
- * the Item object from Java ROME API containing the GeoRSS entry
- * @param geoRSSModule
- * the Java ROME API GeoRSSModule to parse geo location
- * @param directory
- * the path of the directory in which to save the file
- */
- public void saveToFile(Item item, GeoRSSModule geoRSSModule,
- String directory) {
- if(!new File(directory).exists()) new File(directory).mkdirs();
- try {
- BufferedWriter writer = new BufferedWriter(new FileWriter(directory
- + filename));
- if (item.getTitle() != null) {
- writer.write("title;" + item.getTitle().replace('\n', ' '));
- writer.newLine();
- }
- if (item.getLink() != null) {
- writer.write("link;" + item.getLink().replace('\n', ' '));
- writer.newLine();
- }
- if (item.getSource() != null) {
- writer.write("source;"
- + item.getSource().getValue().replace('\n', ' '));
- writer.newLine();
- }
- if (item.getAuthor() != null) {
- writer.write("author;" + item.getAuthor().replace('\n', ' '));
- writer.newLine();
- }
- if (item.getDescription() != null) {
- writer.write("description;"
- + item.getDescription().getValue().replace('\n', ' '));
- writer.newLine();
- }
- writer.write("pubDate;" + item.getPubDate().toString());
- writer.newLine();
- writer.write("lat;" + geoRSSModule.getPosition().getLatitude());
- writer.newLine();
- writer.write("lon;" + geoRSSModule.getPosition().getLongitude());
- writer.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Reads the file that contains the GeoRSS entry's information and returns a
- * HashMap of key, value pairs where the key is the name of the element e.g.
- * title, author.
- *
- * @param fullFileName
- * the full path to the file
- * @return HashMap where the key is the name of the element and the value is
- * the data inside the element's tag
- */
- public static HashMap<String, String> loadFromFile(String fullFileName) {
- HashMap<String, String> map = new HashMap<String, String>();
- try {
- BufferedReader reader = new BufferedReader(new FileReader(
- fullFileName));
- String line = "";
- while ((line = reader.readLine()) != null) {
- int delimIndex = line.indexOf(';');
- if (delimIndex != -1)
- map.put(line.substring(0, delimIndex), line.substring(
- delimIndex + 1, line.length()));
- }
- reader.close();
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return map;
+ /**
+ * Returns the name of the file where the entry's info is saved.
+ *
+ * @return the name of the file where the entry's info is saved
+ */
+ public String getFileName() {
+ return this.filename;
+ }
+
+ /**
+ * Saves the GeoRSS entry to file.
+ *
+ * @param item
+ * the Item object from Java ROME API containing the GeoRSS entry
+ * @param geoRSSModule
+ * the Java ROME API GeoRSSModule to parse geo location
+ * @param directory
+ * the path of the directory in which to save the file
+ */
+ public void saveToFile(Item item, GeoRSSModule geoRSSModule,
+ String directory) {
+ if(!new File(directory).exists()) new File(directory).mkdirs();
+ try {
+ BufferedWriter writer = new BufferedWriter(new FileWriter(directory
+ + filename));
+ if (item.getTitle() != null) {
+ writer.write("title;" + item.getTitle().replace('\n', ' '));
+ writer.newLine();
+ }
+ if (item.getLink() != null) {
+ writer.write("link;" + item.getLink().replace('\n', ' '));
+ writer.newLine();
+ }
+ if (item.getSource() != null) {
+ writer.write("source;"
+ + item.getSource().getValue().replace('\n', ' '));
+ writer.newLine();
+ }
+ if (item.getAuthor() != null) {
+ writer.write("author;" + item.getAuthor().replace('\n', ' '));
+ writer.newLine();
+ }
+ if (item.getDescription() != null) {
+ writer.write("description;"
+ + item.getDescription().getValue().replace('\n', ' '));
+ writer.newLine();
+ }
+ writer.write("pubDate;" + item.getPubDate().toString());
+ writer.newLine();
+ writer.write("lat;" + geoRSSModule.getPosition().getLatitude());
+ writer.newLine();
+ writer.write("lon;" + geoRSSModule.getPosition().getLongitude());
+ writer.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Reads the file that contains the GeoRSS entry's information and returns a
+ * HashMap of key, value pairs where the key is the name of the element e.g.
+ * title, author.
+ *
+ * @param fullFileName
+ * the full path to the file
+ * @return HashMap where the key is the name of the element and the value is
+ * the data inside the element's tag
+ */
+ public static HashMap<String, String> loadFromFile(String fullFileName) {
+ HashMap<String, String> map = new HashMap<String, String>();
+ try {
+ BufferedReader reader = new BufferedReader(new FileReader(
+ fullFileName));
+ String line = "";
+ while ((line = reader.readLine()) != null) {
+ int delimIndex = line.indexOf(';');
+ if (delimIndex != -1)
+ map.put(line.substring(0, delimIndex), line.substring(
+ delimIndex + 1, line.length()));
+ }
+ reader.close();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return map;
- }
+ }
}
Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -16,16 +16,16 @@
*/
package org.apache.sis.internal.doclet;
-import java.util.Arrays;
import java.io.File;
+import java.io.FilenameFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.BufferedReader;
import java.io.BufferedWriter;
-import java.io.FilenameFilter;
import java.io.PrintWriter;
import java.io.StringWriter;
import com.sun.javadoc.RootDoc;
@@ -33,10 +33,18 @@ import com.sun.tools.doclets.formats.htm
/**
- * A doclet which delegates the work to the standard doclet, except for the {@code -stylesheet} option.
- * Rather than overwriting the standard stylesheet with the given one, this keep both the standard and
- * the specified stylesheets as separated files. The standard stylesheet will be renamed {@code standard.css}.
- * The stylesheet provided by the user shall contains an import statement for the standard stylesheet.
+ * A doclet which delegates the work to the standard doclet, then performs additional actions.
+ * The post-javadoc actions are:
+ *
+ * <ul>
+ * <li>Rename {@code "stylesheet.css"} as {@code "standarc.css"}.</li>
+ * <li>Copy {@code "src/main/javadoc/stylesheet.css"} (from the project root) to {@code "stylesheet.css"}.</li>
+ * <li>Copy additional resources.</li>
+ * </ul>
+ *
+ * We do not use the standard {@code "-stylesheet"} Javadoc option because it replaces the standard
+ * CSS by the specified one. Instead, we want to keep both the standard CSS and our customized one.
+ * Our customized CSS shall contain an import statement for the standard stylesheet.
*
* <p>This class presumes that all CSS files are encoded in UTF-8.</p>
*
@@ -47,6 +55,21 @@ import com.sun.tools.doclets.formats.htm
*/
public final class Doclet extends HtmlDoclet {
/**
+ * The name of the standard stylesheet file generated by Javadoc.
+ */
+ private static final String STYLESHEET = "stylesheet.css";
+
+ /**
+ * The name of the standard stylesheet after renaming by this doclet.
+ */
+ private static final String RENAMED_CSS = "standard.css";
+
+ /**
+ * Path to the custom CSS (relative to the project home).
+ */
+ private static final String CUSTOM_CSS = "src/main/javadoc/" + STYLESHEET;
+
+ /**
* The encoding to use for reading and writing CSS files.
*/
private static final String ENCODING = "UTF-8";
@@ -58,32 +81,20 @@ public final class Doclet extends HtmlDo
* @return {@code true} on success, or {@code false} on failure.
*/
public static boolean start(final RootDoc root) {
- String stylesheetFile = null;
String outputDirectory = null;
- final String[][] options = root.options();
- final String[][] filteredOptions = new String[options.length][];
- int n = 0;
- for (final String[] option : options) {
+ for (final String[] option : root.options()) {
if (option.length == 2) {
- final String f = option[0];
- /*switch (option[0])*/ {
- if (f.equals("-d")) {
- outputDirectory = option[1];
- }
- else if (f.equals("-stylesheet") || f.equals("-stylesheetfile")) {
- stylesheetFile = option[1];
- continue; // Do not copy this option.
- }
+ if ("-d".equals(option[0])) {
+ outputDirectory = option[1];
}
}
- filteredOptions[n++] = option;
}
- final boolean status = HtmlDoclet.start(new FilteredRootDoc(root, Arrays.copyOf(filteredOptions, n)));
- if (stylesheetFile != null && outputDirectory != null) try {
- final File input = new File(stylesheetFile);
+ final boolean status = HtmlDoclet.start(root);
+ if (outputDirectory != null) try {
final File output = new File(outputDirectory);
- copyStylesheet(input, output);
- copyResources(input.getParentFile(), output);
+ final File customCSS = customCSS(output);
+ copyStylesheet(customCSS, output);
+ copyResources(customCSS.getParentFile(), output);
} catch (IOException e) {
final StringWriter buffer = new StringWriter();
final PrintWriter p = new PrintWriter(buffer);
@@ -95,6 +106,27 @@ public final class Doclet extends HtmlDo
}
/**
+ * Scans parents of the given directory until we find the root of the Maven project and the custom CSS file.
+ */
+ private static File customCSS(File directory) throws FileNotFoundException {
+ boolean isModuleDirectory = false;
+ while ((directory = directory.getParentFile()) != null && directory.canRead()) {
+ if (new File(directory, "pom.xml").isFile()) {
+ isModuleDirectory = true;
+ final File candidate = new File(directory, CUSTOM_CSS);
+ if (candidate.exists()) {
+ return candidate;
+ }
+ } else if (isModuleDirectory) {
+ // If we were in a Maven module and the parent directory does not
+ // have a pom.xml file, then we are no longer in the Maven project.
+ break;
+ }
+ }
+ throw new FileNotFoundException("Can not locate " + CUSTOM_CSS + " from the root of this Maven project.");
+ }
+
+ /**
* Opens a CSS file for reading.
*/
private static BufferedReader openReader(final File file) throws IOException {
@@ -111,13 +143,13 @@ public final class Doclet extends HtmlDo
/**
* Copies the standard CSS file, then copies the custom CSS file.
*
- * @param inputFile The standard CSS file generated by the standard doclet.
+ * @param inputFile The custom CSS file to copy in the destination directory.
* @param outputDirectory The directory where to copy the CSS file.
* @throws IOException If an error occurred while reading or writing.
*/
private static void copyStylesheet(final File inputFile, final File outputDirectory) throws IOException {
- final File stylesheetFile = new File(outputDirectory, "stylesheet.css");
- final File standardFile = new File(outputDirectory, "standard.css");
+ final File stylesheetFile = new File(outputDirectory, STYLESHEET);
+ final File standardFile = new File(outputDirectory, RENAMED_CSS);
/*
* Copy the standard CSS file, skipping the import of DejaVu font
* since our custom CSS file does not use it.
@@ -170,7 +202,7 @@ public final class Doclet extends HtmlDo
@Override public boolean accept(final File dir, final String name) {
return !name.startsWith(".") &&
!name.equals("overview.html") &&
- !name.equals("stylesheet.css");
+ !name.equals(STYLESHEET);
}
});
final byte[] buffer = new byte[4096];
Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -17,7 +17,7 @@
/**
- * Doclet that modify the behavior of some standard options.
+ * Doclet performing post-processing after Javadoc generation.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -113,7 +113,7 @@ public class ResourceCompilerMojo extend
@Override
public void execute() throws MojoExecutionException {
final boolean isIncremental = buildContext.isIncremental();
- declareOutputDirectory();
+ declareOutputDirectory();
int errors = 0;
for (final String sourceDirectory : compileSourceRoots) {
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=1651674&r1=1651673&r2=1651674&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 Jan 14 14:01:44 2015
@@ -237,11 +237,11 @@ 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 AssociationRole}</td> <td>0 or 1</td> <td>{@link FeatureAssociation#getValue()}</td> <td>{@link Feature}</td></tr>
- * <tr><td>{@code AssociationRole}</td> <td>2 or more</td> <td>{@link FeatureAssociation#getValues()}</td> <td>{@code Collection<Feature>}</td></tr>
+ * <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>
* </table>
*
* <div class="note"><b>Note:</b> “max. occurs” is the {@linkplain DefaultAttributeType#getMaximumOccurs() maximum
Propchange: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 14:01:44 2015
@@ -1,8 +1,8 @@
/sis/branches/Android/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1430670-1480699
/sis/branches/Android/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1430670-1480699
-/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1394364-1595039,1596667-1640672
+/sis/branches/JDK6/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1394364-1595039,1596667-1651615
/sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1394364-1493762
-/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1394913-1596664,1596666-1640394
+/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1394913-1596664,1596666-1651598
/sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1394913-1493760
-/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1584960-1595943,1596664-1640393
+/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1584960-1595943,1596664-1651177
/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java:1394364-1508466,1519089-1519674
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -141,9 +141,10 @@ public abstract class ReferencingService
public abstract FormattableObject toFormattableObject(IdentifiedObject object);
/**
- * Sets a geographic bounding box from the specified envelope. If the envelope contains
- * a CRS, then the bounding box will be projected to a geographic CRS. Otherwise, the envelope
- * is assumed already in appropriate CRS.
+ * Sets a geographic bounding box from the specified envelope.
+ * If the envelope contains a CRS which is not geographic, then the bounding box will be transformed
+ * to a geographic CRS (without datum shift if possible). Otherwise, the envelope is assumed already
+ * in a geographic CRS using (<var>longitude</var>, <var>latitude</var>) axis order.
*
* @param envelope The source envelope.
* @param target The target bounding box.
@@ -175,8 +176,18 @@ public abstract class ReferencingService
throws TransformException;
/**
- * Sets a temporal extent with the value inferred from the given envelope,
- * and optionally sets a geographic bounding box if a spatial component if found.
+ * Sets the geographic, vertical and temporal extents with the values inferred from the given envelope.
+ * If the given {@code target} has more geographic or vertical extents than needed (0 or 1), then the
+ * extraneous extents are removed.
+ *
+ * <p>Behavior regarding missing dimensions:</p>
+ * <ul>
+ * <li>If the given envelope has no horizontal component, then all geographic extents are removed
+ * from the given {@code target}. Non-geographic extents (e.g. descriptions and polygons) are
+ * left unchanged.</li>
+ * <li>If the given envelope has no vertical component, then the vertical extent is set to {@code null}.</li>
+ * <li>If the given envelope has no temporal component, then the temporal extent is set to {@code null}.</li>
+ * </ul>
*
* @param envelope The source envelope.
* @param target The target spatio-temporal extent.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -168,7 +168,7 @@ public class DefaultMetadata extends ISO
/**
* Date(s) associated with the metadata.
*/
- private Collection<CitationDate> dates;
+ private Collection<CitationDate> dateInfo;
/**
* Citation(s) for the standard(s) to which the metadata conform.
@@ -276,7 +276,7 @@ public class DefaultMetadata extends ISO
this.contacts = singleton(contact, ResponsibleParty.class);
this.identificationInfo = singleton(identificationInfo, Identification.class);
if (dateStamp != null) {
- dates = singleton(new DefaultCitationDate(dateStamp, DateType.CREATION), CitationDate.class);
+ dateInfo = singleton(new DefaultCitationDate(dateStamp, DateType.CREATION), CitationDate.class);
}
}
@@ -312,7 +312,7 @@ public class DefaultMetadata extends ISO
languages = copyCollection(c.getLanguages(), Locale.class);
characterSets = copyCollection(c.getCharacterSets(), Charset.class);
metadataScopes = copyCollection(c.getMetadataScopes(), DefaultMetadataScope.class);
- dates = copyCollection(c.getDates(), CitationDate.class);
+ dateInfo = copyCollection(c.getDateInfo(), CitationDate.class);
metadataStandards = copyCollection(c.getMetadataStandards(), Citation.class);
metadataProfiles = copyCollection(c.getMetadataProfiles(), Citation.class);
alternativeMetadataReferences = copyCollection(c.getAlternativeMetadataReferences(), Citation.class);
@@ -832,8 +832,8 @@ public class DefaultMetadata extends ISO
* @since 0.5
*/
@UML(identifier="dateInfo", obligation=MANDATORY, specification=ISO_19115)
- public Collection<CitationDate> getDates() {
- return dates = nonNullCollection(dates, CitationDate.class);
+ public Collection<CitationDate> getDateInfo() {
+ return dateInfo = nonNullCollection(dateInfo, CitationDate.class);
}
/**
@@ -844,8 +844,8 @@ public class DefaultMetadata extends ISO
*
* @since 0.5
*/
- public void setDates(final Collection<? extends CitationDate> newValues) {
- dates = writeCollection(newValues, dates, CitationDate.class);
+ public void setDateInfo(final Collection<? extends CitationDate> newValues) {
+ dateInfo = writeCollection(newValues, dateInfo, CitationDate.class);
}
/**
@@ -859,7 +859,7 @@ public class DefaultMetadata extends ISO
@Deprecated
@XmlElement(name = "dateStamp", required = true)
public Date getDateStamp() {
- final Collection<CitationDate> dates = getDates();
+ final Collection<CitationDate> dates = getDateInfo();
if (dates != null) {
for (final CitationDate date : dates) {
if (DateType.CREATION.equals(date.getDateType())) {
@@ -880,7 +880,7 @@ public class DefaultMetadata extends ISO
@Deprecated
public void setDateStamp(final Date newValue) {
checkWritePermission();
- Collection<CitationDate> newValues = dates; // See "Note about deprecated methods implementation"
+ Collection<CitationDate> newValues = dateInfo; // See "Note about deprecated methods implementation"
if (newValues == null) {
if (newValue == null) {
return;
@@ -905,7 +905,7 @@ public class DefaultMetadata extends ISO
}
}
newValues.add(new DefaultCitationDate(newValue, DateType.CREATION));
- setDates(newValues);
+ setDateInfo(newValues);
}
/**
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -29,8 +29,8 @@ import org.apache.sis.util.Deprecable;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.metadata.ReferencingUtilities;
import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.internal.metadata.NameMeaning;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
@@ -627,8 +627,8 @@ public class ImmutableIdentifier extends
*/
if (convention != Convention.INTERNAL && formatter.getEnclosingElement(2) == null) {
final FormattableObject parent = formatter.getEnclosingElement(1);
- if (parent != null && ReferencingUtilities.usesURN(cs)) {
- final String type = ReferencingUtilities.toURNType(parent.getClass());
+ if (parent != null && NameMeaning.usesURN(cs)) {
+ final String type = NameMeaning.toObjectType(parent.getClass());
if (type != null) {
formatter.append(new URI(type, cs, version, code));
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -386,6 +386,11 @@ public class DefaultContact extends ISOM
/**
* Returns the time period (including time zone) when individuals can contact the organization or individual.
*
+ * <div class="warning"><b>Upcoming API change — multiplicity</b><br>
+ * As of ISO 19115:2014, this singleton has been replaced by a collection.
+ * This change will tentatively be applied in GeoAPI 4.0.
+ * </div>
+ *
* @return Time period when individuals can contact the organization or individual, or {@code null}.
*/
@Override
@@ -397,6 +402,11 @@ public class DefaultContact extends ISOM
/**
* Sets time period (including time zone) when individuals can contact the organization or individual.
*
+ * <div class="warning"><b>Upcoming API change — multiplicity</b><br>
+ * As of ISO 19115:2014, this singleton has been replaced by a collection.
+ * This change will tentatively be applied in GeoAPI 4.0.
+ * </div>
+ *
* @param newValue The new hours of service, or {@code null} if none.
*/
public void setHoursOfService(final InternationalString newValue) {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -97,7 +97,7 @@ public class DefaultReleasability extend
*
* @param object The metadata to copy values from, or {@code null} if none.
*
- * @see #castOrCopy(SecurityConstraints)
+ * @see #castOrCopy(Releasability)
*/
public DefaultReleasability(final DefaultReleasability object) {
super(object);
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -183,7 +183,7 @@ public class DefaultBand extends Default
/**
* Returns the shortest wavelength that the sensor is capable of collecting within a designated band.
- * The units of measurement is given by {@link #getBoundUnit()}.
+ * The units of measurement is given by {@link #getBoundUnits()}.
*
* @return Shortest wavelength that the sensor is capable of collecting within a designated band,
* or {@code null} if unspecified.
@@ -424,6 +424,7 @@ public class DefaultBand extends Default
* {@inheritDoc}
*/
@Override
+ @ValueRange(minimum = 0, isMinIncluded = false)
@XmlElement(name = "nominalSpatialResolution", namespace = Namespaces.GMI)
public Double getNominalSpatialResolution() {
return super.getNominalSpatialResolution();
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -298,7 +298,7 @@ public class DefaultCoverageDescription
*
* @return Dimensions of the cell measurement value.
*
- * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getGroupAttributes()}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getAttributes()}.
*/
@Override
@Deprecated
@@ -335,7 +335,7 @@ public class DefaultCoverageDescription
*
* @param newValues The new dimensions.
*
- * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setGroupAttributes(Collection)}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setAttributes(Collection)}.
*/
@Deprecated
public void setDimensions(final Collection<? extends RangeDimension> newValues) {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
+import org.opengis.metadata.content.CoverageContentType;
import org.opengis.metadata.content.TransferFunctionType;
import org.opengis.util.Record;
import org.opengis.util.RecordType;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -63,15 +63,6 @@
* {@code └─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition} «code list»<br>
* </td></tr></table>
*
- * {@section Bands in gridded data}
- * ISO 19115 defines a {@link org.opengis.metadata.content.Band} interface
- * which expresses the range of wavelengths in the electromagnetic spectrum.
- * For the needs of Image I/O, an additional interface has been defined with a subset
- * of the {@code Band} API and the restriction to electromagnetic spectrum removed.
- * That interface is named {@link org.apache.sis.image.io.metadata.SampleDimension}.
- * Both {@code Band} and {@code SampleDimension} interfaces extend the same parent,
- * {@link org.opengis.metadata.content.RangeDimension}.
- *
* {@section Null values, nil objects and collections}
* All constructors and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -29,6 +29,7 @@ import org.apache.sis.math.MathFunctions
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.internal.metadata.ReferencingServices;
@@ -381,8 +382,9 @@ public class DefaultGeographicBoundingBo
throws IllegalArgumentException
{
if (southBoundLatitude > northBoundLatitude) { // Accept NaN.
- throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalRange_2,
- new Latitude(southBoundLatitude), new Latitude(northBoundLatitude)));
+ throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalOrdinateRange_3,
+ new Latitude(southBoundLatitude), new Latitude(northBoundLatitude),
+ Vocabulary.format(Vocabulary.Keys.Latitude)));
}
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -188,15 +188,29 @@ public class DefaultSpatialTemporalExten
/**
* Sets this spatio-temporal extent to values inferred from the specified envelope.
- * The envelope shall have at least a temporal component. If a spatial component is
- * also found, then:
+ * The given envelope shall have at least a spatial, vertical or temporal component.
*
+ * <p>The spatial component is handled as below:</p>
* <ul>
- * <li>If the collection of {@link #getSpatialExtent() spatial extents} contains a
- * {@link GeographicBoundingBox}, then that bounding box will be updated or replaced
- * by a bounding box containing the spatial component of the given envelope.</li>
- * <li>Otherwise a new {@link DefaultGeographicBoundingBox} with the spatial component
- * of the given envelope is added to the list of spatial extents.</li>
+ * <li>If the given envelope has an horizontal component, then:
+ * <ul>
+ * <li>If the collection of {@linkplain #getSpatialExtent() spatial extents} contains a
+ * {@link GeographicBoundingBox}, then that bounding box will be updated or replaced
+ * by a bounding box containing the spatial component of the given envelope.</li>
+ * <li>Otherwise a new {@link DefaultGeographicBoundingBox} with the spatial component
+ * of the given envelope is added to the list of spatial extents.</li>
+ * </ul>
+ * </li>
+ * <li>All extraneous geographic extents are removed.
+ * Non-geographic extents (e.g. descriptions and polygons) are left unchanged.</li>
+ * </ul>
+ *
+ * <p>Other dimensions are handled in a more straightforward way:</p>
+ * <ul>
+ * <li>The {@linkplain #getVerticalExtent() vertical extent} is set to the vertical component
+ * of the given envelope, or {@code null} if none.</li>
+ * <li>The {@linkplain #getExtent() temporal extent} is set to the temporal component
+ * of the given envelope, or {@code null} if none.</li>
* </ul>
*
* <b>Note:</b> This method is available only if the {@code sis-referencing} module is
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -218,15 +218,15 @@ public class DefaultTemporalExtent exten
}
/**
- * Sets this temporal extent to values inferred from the specified envelope. The envelope can
- * be multi-dimensional, in which case the {@linkplain Envelope#getCoordinateReferenceSystem()
- * envelope CRS} must have a temporal component.
+ * Sets this temporal extent to values inferred from the specified envelope.
+ * The given envelope must have a {@linkplain Envelope#getCoordinateReferenceSystem() CRS},
+ * and at least one dimension of that CRS shall be assignable to a property of this extent.
*
* <p><b>Note:</b> This method is available only if the {@code sis-referencing} module is
* available on the classpath.</p>
*
* @param envelope The envelope to use for setting this temporal extent.
- * @throws UnsupportedOperationException if the referencing module is not on the classpath.
+ * @throws UnsupportedOperationException if the referencing module or the temporal module is not on the classpath.
* @throws TransformException if the envelope can not be transformed to a temporal extent.
*
* @see DefaultExtent#addElements(Envelope)
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -93,7 +93,7 @@ public class DefaultAggregateInformation
*
* @param object The metadata to copy values from, or {@code null} if none.
*
- * @see #castOrCopy(AggregateInformation)
+ * @see #castOrCopy(AssociatedResource)
*/
public DefaultAggregateInformation(final AggregateInformation object) {
super(object);
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -266,7 +266,7 @@ public class DefaultSource extends ISOMe
/**
* Sets the denominator of the representative fraction on a source map.
* This method stores the value in the
- * {@linkplain #setSourceSpatialResolution(RepresentativeFraction) source spatial resolution}.
+ * {@linkplain #setSourceSpatialResolution(Resolution) source spatial resolution}.
*
* @param newValue The new scale denominator.
*
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -283,7 +283,7 @@ public final strictfp class DefaultMetad
new DefaultCitationDate(date("2014-10-09 00:00:00"), DateType.valueOf("LAST_UPDATE")),
new DefaultCitationDate(creation, DateType.CREATION)
};
- metadata.setDates(Arrays.asList(dates));
+ metadata.setDateInfo(Arrays.asList(dates));
assertEquals("dateStamp", creation, metadata.getDateStamp());
/*
* Invoking the deprecated setters shall modify the CitationDate object
@@ -292,7 +292,7 @@ public final strictfp class DefaultMetad
creation = date("2014-10-06 00:00:00");
metadata.setDateStamp(creation);
assertEquals("citationDates[1].date", creation, dates[1].getDate());
- assertArrayEquals("dates", dates, metadata.getDates().toArray());
+ assertArrayEquals("dates", dates, metadata.getDateInfo().toArray());
}
/**
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Wed Jan 14 14:01:44 2015
@@ -30,8 +30,8 @@ import org.junit.BeforeClass;
* @module
*/
@Suite.SuiteClasses({
+ org.apache.sis.internal.metadata.NameMeaningTest.class,
org.apache.sis.internal.metadata.MetadataUtilitiesTest.class,
- org.apache.sis.internal.metadata.ReferencingUtilitiesTest.class,
org.apache.sis.internal.metadata.OtherLocalesTest.class,
// Classes using Java reflection.
Modified: sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties?rev=1651674&r1=1651673&r2=1651674&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties [ISO-8859-1] (original)
+++ sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties [ISO-8859-1] Wed Jan 14 14:01:44 2015
@@ -51,6 +51,6 @@ org.opengis.metadata.lineage.Lineage=+ge
org.opengis.metadata.lineage.ProcessStep=+getReferences:reference +getScope:scope
org.opengis.metadata.lineage.Source=-getScaleDenominator +getScope:scope -getSourceExtents +getSourceMetadata:sourceMetadata +getSourceSpatialResolution:sourceSpatialResolution
org.opengis.metadata.maintenance.MaintenanceInformation=-getDateOfNextUpdate +getMaintenanceDates:maintenanceDate +getMaintenanceScopes:maintenanceScope -getUpdateScopeDescriptions -getUpdateScopes
-org.opengis.metadata.Metadata=+getAlternativeMetadataReferences:alternativeMetadataReference -getCharacterSet +getCharacterSets:characterSet -getDataSetUri -getDateStamp +getDates:dateInfo -getFileIdentifier -getHierarchyLevelNames -getHierarchyLevels -getLanguage +getLanguages:defaultLocale+otherLocale -getLocales +getMetadataIdentifier:metadataIdentifier +getMetadataLinkages:metadataLinkage +getMetadataProfiles:metadataProfile +getMetadataScopes:metadataScope -getMetadataStandardName -getMetadataStandardVersion +getMetadataStandards:metadataStandard -getParentIdentifier +getParentMetadata:parentMetadata +getResourceLineages:resourceLineage
+org.opengis.metadata.Metadata=+getAlternativeMetadataReferences:alternativeMetadataReference -getCharacterSet +getCharacterSets:characterSet -getDataSetUri -getDateStamp +getDateInfo:dateInfo -getFileIdentifier -getHierarchyLevelNames -getHierarchyLevels -getLanguage +getLanguages:defaultLocale+otherLocale -getLocales +getMetadataIdentifier:metadataIdentifier +getMetadataLinkages:metadataLinkage +getMetadataProfiles:metadataProfile +getMetadataScopes:metadataScope -getMetadataStandardName -getMetadataStandardVersion +getMetadataStandards:metadataStandard -getParentIdentifier +getParentMetadata:parentMetadata +getResourceLineages:resourceLineage
org.opengis.metadata.quality.Scope=-getExtent +getExtents:extent
org.opengis.metadata.spatial.Dimension=+getDimensionDescription:dimensionDescription +getDimensionTitle:dimensionTitle