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 2013/12/07 03:00:45 UTC
svn commit: r1548777 [1/6] - in /sis/trunk: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/sis-me...
Author: desruisseaux
Date: Sat Dec 7 02:00:42 2013
New Revision: 1548777
URL: http://svn.apache.org/r1548777
Log:
Merge from the JDK6 branch.
Added:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
- copied unchanged from r1548776, sis/branches/JDK6/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/jaxb/referencing/RS_IdentifierCode.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_IdentifierCode.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_IdentifierSingleton.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_IdentifierSingleton.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/NilReferencingObject.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/NilReferencingObject.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
- copied unchanged from r1548776, sis/branches/JDK6/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/CoordinateSystems.java
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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/DefaultCompoundCS.java
- copied unchanged from r1548776, sis/branches/JDK6/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/DefaultCylindricalCS.java
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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
- copied unchanged from r1548776, sis/branches/JDK6/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/package-info.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
sis/trunk/core/sis-referencing/src/main/resources/META-INF/
- copied from r1548776, sis/branches/JDK6/core/sis-referencing/src/main/resources/META-INF/
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/AxisDirectionsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/
- copied from r1548776, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java
sis/trunk/core/sis-referencing/src/test/resources/
- copied from r1548776, sis/branches/JDK6/core/sis-referencing/src/test/resources/
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/XMLInputFactory.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/XMLInputFactory.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/XMLOutputFactory.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/system/XMLOutputFactory.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/URIParser.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/URIParser.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitsMap.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/UnitsMap.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredNamespaces.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredNamespaces.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamReader.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamReader.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamWriter.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamWriter.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/URIParserTest.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/URIParserTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/SexagesimalConverterTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
- copied unchanged from r1548776, sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/ArgumentChecksTest.java
Removed:
sis/trunk/core/sis-referencing/src/test/testdata/
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.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/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/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/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/package-info.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/package-info.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/package-info.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/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/DefaultGeoreferenceable.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java
sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml
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/io/wkt/Convention.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/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/GeodeticObjects.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/StandardDefinitions.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/DefaultCoordinateSystemAxis.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/operation/matrix/Matrices.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/package-info.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectsTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.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/Context.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.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/util/Citations.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/util/ArgumentChecks.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/Static.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/Version.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/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/xml/Namespaces.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/MeasureTest.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/measure/UnitsTest.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharSequencesTest.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/logging/MonolineFormatterTest.java
sis/trunk/ide-project/NetBeans/build.xml
sis/trunk/src/main/docbook/book.entities
sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/IOUtilitiesTest.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1542819-1548774
Merged /sis/branches/JDK6:r1542821-1548776
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/GM_Object.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -24,9 +24,8 @@ import org.apache.sis.xml.Namespaces;
/**
- * JAXB adapter for {@link Geometry}, in order to integrate the value in an element
- * complying with OGC/ISO standard. The geometry values are covered by a {@code gml:**}
- * element
+ * JAXB adapter for {@link Geometry}, in order to integrate the value in an element complying with OGC/ISO standard.
+ * The geometry element names are usually prefixed by {@code gml:}.
*
* <p>The default implementation does almost nothing. The geometry objects will <strong>not</strong>
* create the expected {@link JAXBElement} type. This class is only a hook to be extended by more
@@ -59,7 +58,13 @@ public class GM_Object extends XmlAdapte
*/
@Override
public final Geometry unmarshal(final GM_Object value) {
- return (value != null) ? value.geometry.getValue() : null;
+ if (value != null) {
+ final JAXBElement<? extends Geometry> g = value.geometry;
+ if (g != null) {
+ return g.getValue();
+ }
+ }
+ return null;
}
/**
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ObjectFactory.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -31,7 +31,7 @@ import org.apache.sis.util.Workaround;
*
* @author Guilhem Legal (Geomatys)
* @since 0.3 (derived from geotk-3.15)
- * @version 0.3
+ * @version 0.4
* @module
*/
@XmlRegistry
@@ -39,17 +39,17 @@ public class ObjectFactory {
/**
* The qualified name of {@code <AbstractGeometry>}.
*/
- protected static final QName AbstractGeometry_QNAME = new QName(Namespaces.GML, "AbstractGeometry");
+ protected static final QName AbstractGeometry_QNAME = new QName(Namespaces.GML, "AbstractGeometry");
/**
* The qualified name of {@code <AbstractGML>}.
*/
- protected static final QName AbstractGML_QNAME = new QName(Namespaces.GML, "AbstractGML");
+ protected static final QName AbstractGML_QNAME = new QName(Namespaces.GML, "AbstractGML");
/**
* The qualified name of {@code <AbstractObject>}.
*/
- protected static final QName AbstractObject_QNAME = new QName(Namespaces.GML, "AbstractObject");
+ protected static final QName AbstractObject_QNAME = new QName(Namespaces.GML, "AbstractObject");
/**
* Creates an instance of {@code JAXBElement<Object>}}.
@@ -57,7 +57,7 @@ public class ObjectFactory {
* @param value The {@code Object} value to wrap.
* @return The wrapped value.
*/
- @XmlElementDecl(name = "AbstractObject")
+ @XmlElementDecl(name = "AbstractObject", namespace = Namespaces.GML)
public JAXBElement<Object> createObject(final Object value) {
return new JAXBElement<Object>(AbstractObject_QNAME, Object.class, null, value);
}
@@ -73,6 +73,7 @@ public class ObjectFactory {
*/
@Workaround(library = "JAXB", version = "2.1")
@XmlElementDecl(name = "AbstractGML",
+ namespace = Namespaces.GML,
substitutionHeadName = "AbstractObject",
substitutionHeadNamespace = Namespaces.GML) // Not necessary according javadoc, but appears to be in practice (JAXB 2.1 bug?)
public JAXBElement<Object> createAbstractGML(final Object value) {
@@ -90,6 +91,7 @@ public class ObjectFactory {
*/
@Workaround(library = "JAXB", version = "2.1")
@XmlElementDecl(name = "AbstractGeometry",
+ namespace = Namespaces.GML,
substitutionHeadName = "AbstractGML",
substitutionHeadNamespace = Namespaces.GML) // Not necessary according javadoc, but appears to be in practice (JAXB 2.1 bug?)
public JAXBElement<Object> createAbstractGeometry(final Object value) {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -41,23 +41,6 @@ public abstract class CodeListAdapter<Bo
}
/**
- * Forces the initialization of the given code list class, since some
- * calls to {@link CodeList#valueOf} are done whereas the constructor
- * has not already been called.
- *
- * @param <T> The code list type.
- * @param type The code list class to initialize.
- */
- protected static <T extends CodeList<T>> void ensureClassLoaded(final Class<T> type) {
- final String name = type.getName();
- try {
- Class.forName(name, true, type.getClassLoader());
- } catch (ClassNotFoundException ex) {
- throw new TypeNotPresentException(name, ex); // Should never happen.
- }
- }
-
- /**
* Returns the class of code list wrapped by this adapter.
*
* @return The code list class.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -18,7 +18,7 @@ package org.apache.sis.internal.jaxb.gml
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.sis.util.Version;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
@@ -39,14 +39,9 @@ import org.apache.sis.xml.IdentifiedObje
* @version 0.4
* @module
*/
+@XmlTransient
public abstract class GMLAdapter {
/**
- * A GML version suitable for calls to {@link org.apache.sis.internal.jaxb.Context#isGMLVersion}.
- */
- public static final Version GML_3_0 = new Version("3.0"),
- GML_3_2 = new Version("3.2");
-
- /**
* The period identifier, or {@code null} if undefined.
* This element is part of GML 3.1.1 specification.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -23,6 +23,7 @@ import org.apache.sis.internal.geoapi.te
import org.opengis.temporal.TemporalPrimitive;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.XmlUtilities;
+import org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.internal.jaxb.gco.PropertyType;
import org.apache.sis.internal.util.TemporalUtilities;
import org.apache.sis.util.resources.Errors;
@@ -35,7 +36,7 @@ import org.apache.sis.util.resources.Err
* @author Guilhem Legal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.00)
- * @version 0.3
+ * @version 0.4
* @module
*/
public final class TM_Primitive extends PropertyType<TM_Primitive, TemporalPrimitive> {
@@ -67,6 +68,8 @@ public final class TM_Primitive extends
/**
* Returns the GeoAPI interface which is bound by this adapter.
+ *
+ * @return {@code TemporalPrimitive.class}
*/
@Override
protected Class<TemporalPrimitive> getBoundType() {
@@ -74,6 +77,17 @@ public final class TM_Primitive extends
}
/**
+ * Returns {@code true} if the user asked to format a GML 3.2 document, or {@code false} for GML 3.1 or older.
+ * The only difference managed by this class is the namespace.
+ *
+ * <p>This method will be removed in a future SIS version if we find a better way to support evolution
+ * of GML schemas.</p>
+ */
+ private static boolean isGML32() {
+ return Context.isGMLVersion(Context.current(), LegacyNamespaces.VERSION_3_2);
+ }
+
+ /**
* Returns the {@code TimePeriod} generated from the metadata value.
* This method is systematically called at marshalling-time by JAXB.
*
@@ -81,7 +95,7 @@ public final class TM_Primitive extends
*/
@XmlElement(name = "TimePeriod")
public TimePeriod getTimePeriod() {
- if (!skip()) {
+ if (!skip() && isGML32()) {
final TemporalPrimitive metadata = this.metadata;
if (metadata instanceof Period) {
return new TimePeriod((Period) metadata);
@@ -98,7 +112,7 @@ public final class TM_Primitive extends
*/
@XmlElement(name = "TimeInstant")
public TimeInstant getTimeInstant() {
- if (!skip()) {
+ if (!skip() && isGML32()) {
final TemporalPrimitive metadata = this.metadata;
if (metadata instanceof Instant) {
return new TimeInstant((Instant) metadata);
@@ -111,7 +125,7 @@ public final class TM_Primitive extends
* Sets the value from the {@link TimePeriod}.
* This method is called at unmarshalling-time by JAXB.
*
- * @param period The adapter to set.
+ * @param period The wrapper to set.
*/
public void setTimePeriod(final TimePeriod period) {
metadata = null; // Cleaned first in case of failure.
@@ -142,7 +156,7 @@ public final class TM_Primitive extends
* Sets the value from the {@link TimeInstant}.
* This method is called at unmarshalling-time by JAXB.
*
- * @param instant The adapter to set.
+ * @param instant The wrapper to set.
*/
public void setTimeInstant(final TimeInstant instant) {
metadata = null; // Cleaned first in case of failure.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -97,6 +97,8 @@ public final class TimeInstant extends G
/**
* Returns a string representation for debugging and formatting error message.
+ *
+ * @return A string representation of this time instant.
*/
@Override
public String toString() {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -23,6 +23,8 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.sis.internal.geoapi.temporal.Period;
import org.apache.sis.internal.jaxb.Context;
+import static org.apache.sis.internal.jaxb.LegacyNamespaces.VERSION_3_0;
+
/**
* The adapter for {@code "TimePeriod"}. This is an attribute of {@link TM_Primitive}.
@@ -76,7 +78,7 @@ public final class TimePeriod extends GM
public TimePeriod(final Period period) {
super(period);
if (period != null) {
- if (Context.isGMLVersion(Context.current(), GML_3_0)) {
+ if (Context.isGMLVersion(Context.current(), VERSION_3_0)) {
begin = new TimePeriodBound.GML3(period.getBeginning(), "before");
end = new TimePeriodBound.GML3(period.getEnding(), "after");
} else {
@@ -88,6 +90,8 @@ public final class TimePeriod extends GM
/**
* Returns a string representation for debugging and formatting error message.
+ *
+ * @return A string representation of this time period.
*/
@Override
public String toString() {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -52,6 +52,8 @@ public abstract class TimePeriodBound {
/**
* Returns a string representation of this bound for debugging purpose.
+ *
+ * @return A string representation of the time currently set.
*/
@Override
public String toString() {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -18,6 +18,7 @@ package org.apache.sis.metadata;
import java.util.Map;
import java.util.logging.Logger;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.collection.TreeTable;
@@ -73,6 +74,7 @@ import org.apache.sis.util.logging.Loggi
*
* @see MetadataStandard
*/
+@XmlTransient
public abstract class AbstractMetadata implements LenientComparable {
/**
* The logger for messages related to metadata implementations.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.NoSuchElementException;
import java.lang.reflect.Modifier;
+import javax.xml.bind.annotation.XmlTransient;
import org.opengis.util.CodeList;
import org.apache.sis.util.ThreadSafe;
import org.apache.sis.util.logging.Logging;
@@ -84,6 +85,7 @@ import static org.apache.sis.internal.ja
* @module
*/
@ThreadSafe
+@XmlTransient
public abstract class ModifiableMetadata extends AbstractMetadata implements Cloneable {
/**
* Initial capacity of lists and sets. We use a small value because those
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -470,7 +470,8 @@ class PropertyAccessor {
* most of the time the key name will have exactly the expected case and using
* directly the given String instance allow usage of its cached hash code value.
*/
- final String key = CharSequences.trimWhitespaces(name.replace(" ", "").toLowerCase(Locale.ROOT));
+ final String key = CharSequences.trimWhitespaces(
+ CharSequences.replace(name, " ", "").toString().toLowerCase(Locale.ROOT));
if (key == name || (index = mapping.get(key)) == null) { // Identity comparison is okay here.
if (!mandatory) {
return -1;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -21,6 +21,7 @@ import java.util.logging.Logger;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import org.opengis.metadata.Identifier;
@@ -47,6 +48,7 @@ import static org.apache.sis.util.collec
* @module
*/
@ThreadSafe
+@XmlTransient
public class ISOMetadata extends ModifiableMetadata implements IdentifiedObject, Serializable {
/**
* Serial number for inter-operability with different versions.
@@ -93,6 +95,8 @@ public class ISOMetadata extends Modifia
* {@note Subclasses shall not override this method in a way that depends on the object state,
* since this method may be indirectly invoked by copy constructors (i.e. is may be
* invoked before this metadata object is fully constructed).}
+ *
+ * @return The metadata standard, which is {@linkplain MetadataStandard#ISO_19115 ISO 19115} by default.
*/
@Override
public MetadataStandard getStandard() {
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=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -37,6 +37,7 @@ import org.apache.sis.internal.jaxb.gco.
import org.apache.sis.internal.simple.SimpleIdentifiedObject;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
+import static org.apache.sis.util.CharSequences.trimWhitespaces;
import static org.apache.sis.util.collection.Containers.property;
import static org.opengis.referencing.IdentifiedObject.REMARKS_KEY;
@@ -246,8 +247,8 @@ public class ImmutableIdentifier impleme
*/
public ImmutableIdentifier(final Map<String,?> properties) throws IllegalArgumentException {
ensureNonNull("properties", properties);
- code = property(properties, CODE_KEY, String.class);
- version = property(properties, VERSION_KEY, String.class);
+ code = trimWhitespaces(property(properties, CODE_KEY, String.class));
+ version = trimWhitespaces(property(properties, VERSION_KEY, String.class));
remarks = Types.toInternationalString(properties, REMARKS_KEY);
/*
* Map String authority to one of the pre-defined constants (typically EPSG or OGC).
@@ -270,7 +271,7 @@ public class ImmutableIdentifier impleme
if (value == null && !properties.containsKey(CODESPACE_KEY)) {
codeSpace = getCodeSpace(authority);
} else if (value instanceof String) {
- codeSpace = (String) value;
+ codeSpace = trimWhitespaces((String) value);
} else {
throw illegalPropertyType(CODESPACE_KEY, value);
}
@@ -358,7 +359,7 @@ public class ImmutableIdentifier impleme
* @see Citations#getIdentifier(Citation)
*/
private static String getCodeSpace(final Citation authority) {
- final String codeSpace = Citations.getIdentifier(authority);
+ final String codeSpace = Citations.getIdentifier(authority); // Whitespaces trimed by Citations.
if (codeSpace != null) {
final int length = codeSpace.length();
if (length != 0) {
@@ -468,9 +469,8 @@ public class ImmutableIdentifier impleme
* Returns a string representation of this identifier.
* The default implementation returns a pseudo-WKT format.
*
- * {@note The <code>NamedIdentifier</code> subclass overrides this method with a different
- * behavior, in order to be compliant with the contract of the <code>GenericName</code>
- * interface.}
+ * {@note The <code>NamedIdentifier</code> subclass overrides this method with a different behavior,
+ * in order to be compliant with the contract of the <code>GenericName</code> interface.}
*
* @see org.apache.sis.referencing.IdentifiedObjects#toString(Identifier)
* @see org.apache.sis.referencing.NamedIdentifier#toString()
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation Acquisition} implementation.
+ * Information about the measuring instruments, the platform carrying them, and the mission to which the data contributes.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.acquisition OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -170,25 +170,21 @@ public final class Citations extends Sta
* Returns a citation of the given name. The method makes the following choice:
*
* <ul>
- * <li>If the given title is {@code null} or empty (ignoring spaces), then this method
- * returns {@code null}.</li>
+ * <li>If the given title is {@code null} or empty (ignoring spaces), then this method returns {@code null}.</li>
* <li>Otherwise if the given name matches a {@linkplain Citation#getTitle() title} or an
* {@linkplain Citation#getAlternateTitles() alternate titles} of one of the pre-defined
- * constants ({@link #EPSG}, {@link #GEOTIFF}, <i>etc.</i>), then that constant
- * is returned.</li>
+ * constants ({@link #EPSG}, {@link #GEOTIFF}, <i>etc.</i>), then that constant is returned.</li>
* <li>Otherwise, a new citation is created with the specified name as the title.</li>
* </ul>
*
* @param title The citation title (or alternate title), or {@code null}.
- * @return A citation using the specified name, or {@code null} if the given title is null
- * or empty.
+ * @return A citation using the specified name, or {@code null} if the given title is null or empty.
*/
public static Citation fromName(String title) {
if (title == null || ((title = CharSequences.trimWhitespaces(title)).isEmpty())) {
return null;
}
- for (int i=0; i<AUTHORITIES.length; i++) {
- final Citation citation = AUTHORITIES[i];
+ for (final Citation citation : AUTHORITIES) {
if (titleMatches(citation, title)) {
return citation;
}
@@ -289,12 +285,15 @@ public final class Citations extends Sta
* <li>Otherwise this method returns {@code null}.</li>
* </ul>
*
- * This method searches in alternate titles as a fallback because ISO specification said
- * that those titles are often used for abbreviations.
+ * {@note This method searches in alternate titles as a fallback because ISO specification said
+ * that those titles are often used for abbreviations.}
+ *
+ * This method ignores leading and trailing whitespaces of every character sequences.
+ * Null references, empty character sequences and sequences of whitespaces only are ignored.
*
* @param citation The citation for which to get the identifier, or {@code null}.
- * @return An identifier for the given citation, or {@code null} if the given citation is null
- * or does not declare any identifier or title.
+ * @return A non-empty identifier for the given citation without leading or trailing whitespaces,
+ * or {@code null} if the given citation is null or does not declare any identifier or title.
*/
public static String getIdentifier(final Citation citation) {
return org.apache.sis.internal.util.Citations.getIdentifier(citation);
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.citation.DefaultCitation Citation} implementation.
+ * Reference to the data or service (citation, responsible party, contact information).
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.citation OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.constraint.DefaultConstraints Constraints} implementation.
+ * Information about legal and security constraints placed on data.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.constraint OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
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=1548777&r1=1548776&r2=1548777&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] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information} implementation.
+ * Description of the dataset content.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.content OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistribution Distribution} implementation.
+ * Information about the options for obtaining a resource (data or service).
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.distribution OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.extent.DefaultExtent Extent} implementation.
+ * Information about spatial, vertical, and temporal extent.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.extent OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -56,8 +56,7 @@ public class DefaultResolution extends I
private static final long serialVersionUID = 3856547985745400172L;
/**
- * Either the scale as a {@link RepresentativeFraction} instance or the distance
- * as a {@code Double} instance.
+ * Either the scale as a {@link RepresentativeFraction} instance or the distance as a {@code Double} instance.
*/
private Object scaleOrDistance;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} implementation.
+ * Information to uniquely identify the data or service.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.identification OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.lineage.DefaultLineage Lineage} implementation.
+ * Information about the sources and production processes of a dataset.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.lineage OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.maintenance.DefaultMaintenanceInformation Maintenance information} implementation.
+ * Information about the frequency and scope of data updates.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.maintenance OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.DefaultMetadata Metadata} implementation.
+ * Root package for ISO 19115 metadata about resources (data or services).
* An explanation for this package is provided in the {@linkplain org.opengis.metadata OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.quality.DefaultDataQuality Data quality} implementation.
+ * Information about data quality, accuracy and consistency of a dataset.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.quality OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -33,9 +33,8 @@ import org.apache.sis.xml.Namespaces;
/**
- * Grid whose cells are regularly spaced in a geographic (i.e., lat / long) or map
- * coordinate system defined in the Spatial Referencing System (SRS) so that any cell
- * in the grid can be geolocated given its grid coordinate and the grid origin, cell spacing,
+ * Grid whose cells are regularly spaced in a geographic or projected coordinate reference system.
+ * Any cell in the grid can be geolocated given its grid coordinate and the grid origin, cell spacing,
* and orientation indication of whether or not geographic.
*
* {@section Relationship between properties}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -30,9 +30,9 @@ import org.apache.sis.xml.Namespaces;
/**
- * Grid with cells irregularly spaced in any given geographic/map projection coordinate
- * system, whose individual cells can be geolocated using geolocation information
- * supplied with the data but cannot be geolocated from the grid properties alone.
+ * Grid with cells irregularly spaced in any given geographic/map projection coordinate reference system.
+ * Individual cells can be geolocated using geolocation information supplied with the data but cannot be
+ * geolocated from the grid properties alone.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,7 +16,7 @@
*/
/**
- * {@linkplain org.apache.sis.metadata.iso.spatial.AbstractSpatialRepresentation Spatial representation} implementation.
+ * Information about the mechanisms (grid or vector) used to represent spatial data.
* An explanation for this package is provided in the {@linkplain org.opengis.metadata.spatial OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,8 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Arrays;
import java.util.Locale;
import java.util.Collections;
@@ -34,8 +32,6 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.util.CharSequences;
import org.apache.sis.test.XMLTestCase;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
import org.junit.Test;
import static org.apache.sis.test.Assert.*;
@@ -47,43 +43,13 @@ import static org.apache.sis.test.Assert
* @author Martin Desruisseaux (Geomatys)
* @author Guilhem Legal (Geomatys)
* @since 0.3 (derived from geotk-3.17)
- * @version 0.3
+ * @version 0.4
* @module
*
* @see <a href="http://jira.geotoolkit.org/browse/GEOTK-121">GEOTK-121</a>
*/
public final strictfp class CodeListMarshallingTest extends XMLTestCase {
/**
- * A poll of configured {@link Marshaller} and {@link Unmarshaller}, created when first needed.
- */
- private static MarshallerPool pool;
-
- /**
- * Creates the XML (un)marshaller pool to be shared by all test methods.
- * The (un)marshallers locale and timezone will be set to fixed values.
- *
- * @throws JAXBException If an error occurred while creating the pool.
- *
- * @see #disposeMarshallerPool()
- */
- @BeforeClass
- public static void createMarshallerPool() throws JAXBException {
- final Map<String,Object> properties = new HashMap<String,Object>(4);
- assertNull(properties.put(XML.LOCALE, Locale.FRANCE));
- assertNull(properties.put(XML.TIMEZONE, "CET"));
- pool = new MarshallerPool(properties);
- }
-
- /**
- * Invoked by JUnit after the execution of every tests in order to dispose
- * the {@link MarshallerPool} instance used internally by this class.
- */
- @AfterClass
- public static void disposeMarshallerPool() {
- pool = null;
- }
-
- /**
* Returns a XML string to use for testing purpose.
*
* @param baseURL The base URL of XML schemas.
@@ -140,6 +106,7 @@ public final strictfp class CodeListMars
final ResponsibleParty rp = (ResponsibleParty) XML.unmarshal(expected);
assertEquals(Role.PRINCIPAL_INVESTIGATOR, rp.getRole());
+ final MarshallerPool pool = getMarshallerPool();
final Marshaller marshaller = pool.acquireMarshaller();
marshaller.setProperty(XML.SCHEMAS, Collections.singletonMap("gmd",
"http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas")); // Intentionally omit trailing '/'.
@@ -155,6 +122,7 @@ public final strictfp class CodeListMars
*/
@Test
public void testLocalization() throws JAXBException {
+ final MarshallerPool pool = getMarshallerPool();
final Marshaller marshaller = pool.acquireMarshaller();
/*
* First, test using the French locale.
@@ -185,15 +153,13 @@ public final strictfp class CodeListMars
*/
@Test
public void testExtraCodes() throws JAXBException {
- final Marshaller marshaller = pool.acquireMarshaller();
final DefaultDataIdentification id = new DefaultDataIdentification();
id.setTopicCategories(Arrays.asList(
TopicCategory.valueOf("oceans"), // New code
TopicCategory.valueOf("OCEANS"), // Existing code with UML id="oceans"
TopicCategory.valueOf("test"))); // New code
- final String xml = marshal(marshaller, id);
- pool.recycle(marshaller);
+ final String xml = marshal(id);
// "OCEANS" is marshalled as "oceans" because is contains a UML id, which is lower-case.
assertEquals(2, CharSequences.count(xml, "<gmd:MD_TopicCategoryCode>oceans</gmd:MD_TopicCategoryCode>"));
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -16,13 +16,9 @@
*/
package org.apache.sis.xml;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Locale;
import java.net.URL;
import java.io.IOException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
import javax.xml.bind.JAXBException;
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.SimpleInternationalString;
@@ -36,8 +32,6 @@ import org.apache.sis.metadata.iso.quali
import org.apache.sis.metadata.iso.quality.DefaultConformanceResult;
import org.apache.sis.test.XMLTestCase;
import org.apache.sis.test.DependsOn;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
import org.junit.Test;
import static org.apache.sis.test.Assert.*;
@@ -59,42 +53,12 @@ import static org.apache.sis.test.TestUt
@DependsOn(FreeTextMarshallingTest.class)
public final strictfp class MetadataMarshallingTest extends XMLTestCase {
/**
- * A poll of configured {@link Marshaller} and {@link Unmarshaller}, created when first needed.
- */
- private static MarshallerPool pool;
-
- /**
- * Creates the XML (un)marshaller pool to be shared by all test methods.
- * The (un)marshallers locale and timezone will be set to fixed values.
- *
- * @throws JAXBException If an error occurred while creating the pool.
- *
- * @see #disposeMarshallerPool()
- */
- @BeforeClass
- public static void createMarshallerPool() throws JAXBException {
- final Map<String,Object> properties = new HashMap<String,Object>(4);
- assertNull(properties.put(XML.LOCALE, Locale.ENGLISH));
- assertNull(properties.put(XML.TIMEZONE, "CET"));
- pool = new MarshallerPool(properties);
- }
-
- /**
- * Invoked by JUnit after the execution of every tests in order to dispose
- * the {@link MarshallerPool} instance used internally by this class.
- */
- @AfterClass
- public static void disposeMarshallerPool() {
- pool = null;
- }
-
- /**
* Returns the URL to the XML file of the given name.
*
* @param filename The name of the XML file.
* @return The URL to the given XML file.
*/
- private URL getResource(final String filename) {
+ private static URL getResource(final String filename) {
final URL resource = MetadataMarshallingTest.class.getResource(filename);
assertNotNull(filename, resource);
return resource;
@@ -136,10 +100,8 @@ public final strictfp class MetadataMars
*/
@Test
public void testPositionalAccuracy() throws IOException, JAXBException {
- final Marshaller marshaller = pool.acquireMarshaller();
- final Unmarshaller unmarshaller = pool.acquireUnmarshaller();
- final URL resource = getResource("PositionalAccuracy.xml");
- final Object metadata = XML.unmarshal(resource);
+ final URL resource = getResource("PositionalAccuracy.xml");
+ final Object metadata = XML.unmarshal(resource);
assertInstanceOf("PositionalAccuracy.xml", AbstractElement.class, metadata);
final InternationalString nameOfMeasure = getSingleton(((AbstractElement) metadata).getNamesOfMeasure());
/*
@@ -158,9 +120,7 @@ public final strictfp class MetadataMars
/*
* Final comparison: ensure that we didn't lost any information.
*/
- assertXmlEquals(resource, marshal(marshaller, metadata), "xmlns:*", "xsi:schemaLocation", "xsi:type");
- pool.recycle(unmarshaller);
- pool.recycle(marshaller);
+ assertXmlEquals(resource, marshal(metadata), "xmlns:*", "xsi:schemaLocation", "xsi:type");
}
/**
@@ -174,8 +134,6 @@ public final strictfp class MetadataMars
*/
@Test
public void testProcessStep() throws IOException, JAXBException {
- final Marshaller marshaller = pool.acquireMarshaller();
- final Unmarshaller unmarshaller = pool.acquireUnmarshaller();
final DefaultProcessing processing = new DefaultProcessing();
final DefaultProcessStep processStep = new DefaultProcessStep("Some process step.");
processing.setProcedureDescription(new SimpleInternationalString("Some procedure."));
@@ -183,15 +141,13 @@ public final strictfp class MetadataMars
/*
* XML marshalling, and compare with the content of "ProcessStep.xml" file.
*/
- final String xml = marshal(marshaller, processStep);
+ final String xml = marshal(processStep);
assertTrue(xml.startsWith("<?xml"));
assertXmlEquals(getResource("ProcessStep.xml"), xml, "xmlns:*", "xsi:schemaLocation");
/*
* Final comparison: ensure that we didn't lost any information.
*/
- assertEquals(processStep, unmarshal(unmarshaller, xml));
- pool.recycle(unmarshaller);
- pool.recycle(marshaller);
+ assertEquals(processStep, unmarshal(DefaultProcessStep.class, xml));
}
/**
@@ -208,8 +164,6 @@ public final strictfp class MetadataMars
*/
@Test
public void testExtent() throws IOException, JAXBException {
- final Marshaller marshaller = pool.acquireMarshaller();
- final Unmarshaller unmarshaller = pool.acquireUnmarshaller();
final DefaultGeographicBoundingBox bbox = new DefaultGeographicBoundingBox(-99, -79, 14.9844, 31);
bbox.getIdentifierMap().put(IdentifierSpace.ID, "bbox");
final DefaultTemporalExtent temporal = new DefaultTemporalExtent();
@@ -221,14 +175,12 @@ public final strictfp class MetadataMars
/*
* XML marshalling, and compare with the content of "ProcessStep.xml" file.
*/
- final String xml = marshal(marshaller, extent);
+ final String xml = marshal(extent);
assertTrue(xml.startsWith("<?xml"));
assertXmlEquals(getResource("Extent.xml"), xml, "xmlns:*", "xsi:schemaLocation");
/*
* Final comparison: ensure that we didn't lost any information.
*/
- assertEquals(extent, unmarshal(unmarshaller, xml));
- pool.recycle(unmarshaller);
- pool.recycle(marshaller);
+ assertEquals(extent, unmarshal(DefaultExtent.class, xml));
}
}
Modified: sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml (original)
+++ sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml Sat Dec 7 02:00:42 2013
@@ -19,10 +19,10 @@
-->
<gmd:EX_Extent
- xmlns:gco="http://www.isotc211.org/2005/gco"
- xmlns:gmd="http://www.isotc211.org/2005/gmd"
- xmlns:gml="http://www.opengis.net/gml"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:gco = "http://www.isotc211.org/2005/gco"
+ xmlns:gmd = "http://www.isotc211.org/2005/gmd"
+ xmlns:gml = "http://www.opengis.net/gml/3.2"
+ xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation = "http://www.isotc211.org/2005/gmd http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd">
<gmd:geographicElement>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java?rev=1548777&r1=1548776&r2=1548777&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java [UTF-8] Sat Dec 7 02:00:42 2013
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlRootElement;
import javax.measure.unit.Unit;
import org.opengis.referencing.datum.Ellipsoid;
-import org.apache.sis.measure.Units;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.internal.jaxb.gco.Measure;
@@ -74,7 +73,6 @@ public final class SecondDefiningParamet
measure = new Measure(ellipsoid.getInverseFlattening(), Unit.ONE);
} else {
measure = new Measure(ellipsoid.getSemiMinorAxis(), ellipsoid.getAxisUnit());
- Units.ensureLinear(measure.unit);
}
}
}
@@ -100,12 +98,13 @@ public final class SecondDefiningParamet
/**
* Sets the semi-minor axis value. This is invoked by JAXB for unmarshalling.
+ * The unit of measurement (if any) shall be linear, but we do not verify that now.
+ * This will be verified by {@code DefaultEllipsoid.setSecondDefiningParameter(…)}.
*
* @param measure The semi-minor axis value.
*/
public void setSemiMinorAxis(final Measure measure) {
this.measure = measure;
- Units.ensureLinear(measure.unit);
}
/**