sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1554741 [1/4] - in /sis/branches/JDK6: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/ core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/si...
Date Thu, 02 Jan 2014 06:05:01 GMT
Author: desruisseaux
Date: Thu Jan  2 06:04:58 2014
New Revision: 1554741

URL: http://svn.apache.org/r1554741
Log:
Merge from the JDK7 branch.

Added:
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/UniversalTimeAdapter.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PixelInCell.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_RangeMeaning.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/
      - copied from r1554739, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
      - copied, changed from r1554739, sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/cs/
      - copied from r1554739, sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/cs/
    sis/branches/JDK6/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified Julian.xml
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified Julian.xml
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/GeoapiAssert.java
      - copied unchanged from r1554739, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/GeoapiAssert.java
Removed:
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DatumTestCase.java
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/package-info.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrix.java
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/package-info.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
    sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/XmlUtilities.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/Measure.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/io/IO.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/Angle.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/Latitude.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/Longitude.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java
    sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
    sis/branches/JDK6/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
    sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
    sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
    sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelDataInputTest.java
    sis/branches/JDK6/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ChannelImageInputStreamTest.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1554592-1554739

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -78,13 +78,13 @@ public final class PT_Locale extends Xml
     @XmlType(name = "PT_Locale", propOrder = { "languageCode", "country", "characterEncoding" })
     private static final class Wrapper {
         /**
-         * The language code, or {@code null} if none.
+         * The language code, or {@code null} if none.
          */
         @XmlElement(required = true)
         LanguageCode languageCode;
 
         /**
-         * The country code, or {@code null} if none.
+         * The country code, or {@code null} if none.
          */
         @XmlElement
         Country country;

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/DateAdapter.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -44,6 +44,8 @@ import org.apache.sis.internal.jaxb.XmlU
  * @since   0.4
  * @version 0.4
  * @module
+ *
+ * @see UniversalTimeAdapter
  */
 public final class DateAdapter extends XmlAdapter<XMLGregorianCalendar, Date> {
     /**

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/GMLAdapter.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -42,7 +42,7 @@ import org.apache.sis.xml.IdentifiedObje
 @XmlTransient
 public abstract class GMLAdapter {
     /**
-     * The period identifier, or {@code null} if undefined.
+     * The period identifier, or {@code null} if undefined.
      * This element is part of GML 3.1.1 specification.
      *
      * {@section Difference between <code>gmd:uuid</code> and <code>gml:id</code>}

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -45,7 +45,7 @@ public abstract class TimePeriodBound {
     }
 
     /**
-     * Returns the XML calendar, or {@code null} if none. This information is encoded
+     * Returns the XML calendar, or {@code null} if none. This information is encoded
      * in different fields depending if we are reading/writing a GML2 or a GML3 file.
      */
     abstract XMLGregorianCalendar calendar();
@@ -80,7 +80,7 @@ public abstract class TimePeriodBound {
         public String indeterminatePosition;
 
         /**
-         * The actual time position, or {@code null} for {@linkplain #indeterminatePosition indeterminate position}.
+         * The actual time position, or {@code null} for {@linkplain #indeterminatePosition indeterminate position}.
          *
          * <p><strong>WARNING: The timezone information may be lost!</strong> This is because this field
          * is derived from a {@link java.util.Date}, in which case we don't know if the time is really 0
@@ -120,7 +120,7 @@ public abstract class TimePeriodBound {
 
     /**
      * The begin or end position in a {@link TimePeriod}, expressed in the GML 2 way.
-     * This object encapsulates a {@link TimeInstant} inside a {@code begin} or {@code end}
+     * This object encapsulates a {@link TimeInstant} inside a {@code begin} or {@code end}
      * element inside a GML 2 {@link TimePeriod} in GML 2. This is not used for GML 3.
      * Example:
      *

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -47,7 +47,7 @@ public enum KeyNamePolicy {
 
     /**
      * The keys in the map are the Javabeans property names. This is the method name with
-     * the {@code get} or {@code is} prefix removed, and the first letter made lower-case.
+     * the {@code get} or {@code is} prefix removed, and the first letter made lower-case.
      *
      * <p>This is the default type of names returned by {@link AbstractMetadata#asMap()}.</p>
      */

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -77,7 +77,7 @@ import static org.apache.sis.util.Argume
  *       Only getter methods will be used and all operations that modify the metadata properties
  *       will throw an {@link UnmodifiableMetadataException}.</li>
  *   <li>For <em>read/write</em> metadata, the {@link #getImplementation(Class)}
- *       method must be overridden in a {@code MetadataStandard} subclass.</li>
+ *       method must be overridden in a {@code MetadataStandard} subclass.</li>
  * </ul>
  *
  * {@section Thread safety}
@@ -274,7 +274,7 @@ public class MetadataStandard implements
      *         not implement a metadata interface of the expected package and {@code mandatory}
      *         is {@code false}.
      * @throws ClassCastException if the specified class does not implement a metadata interface
-     *         of the expected package and {@code mandatory} is {@code true}.
+     *         of the expected package and {@code mandatory} is {@code true}.
      */
     final PropertyAccessor getAccessor(final Class<?> implementation, final boolean mandatory) {
         synchronized (accessors) {
@@ -436,7 +436,7 @@ public class MetadataStandard implements
     }
 
     /**
-     * Returns the implementation class for the given interface, or {@code null} if none.
+     * Returns the implementation class for the given interface, or {@code null} if none.
      * The default implementation returns {@code null} if every cases. Subclasses shall
      * override this method in order to map GeoAPI interfaces to their implementation.
      *
@@ -588,9 +588,9 @@ public class MetadataStandard implements
      * The map is backed by the metadata object using Java reflection, so changes in the
      * underlying metadata object are immediately reflected in the map and conversely.
      *
-     * <p>The map content is determined by the arguments: {@code metadata} determines the set of
+     * <p>The map content is determined by the arguments: {@code metadata} determines the set of
      * keys, {@code keyPolicy} determines their {@code String} representations of those keys and
-     * {@code valuePolicy} determines whether entries having a null value or an empty collection
+     * {@code valuePolicy} determines whether entries having a null value or an empty collection
      * shall be included in the map.</p>
      *
      * {@section Supported operations}

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -263,7 +263,7 @@ public abstract class ModifiableMetadata
      *       modifiable.</li>
      *   <li>If {@code source} is null or empty, returns {@code null}
      *       (meaning that the metadata property is not provided).</li>
-     *   <li>If {@code target} is null, creates a new {@link List}.</li>
+     *   <li>If {@code target} is null, creates a new {@link List}.</li>
      *   <li>Copies the content of the given {@code source} into the target.</li>
      * </ul>
      *
@@ -271,7 +271,7 @@ public abstract class ModifiableMetadata
      * @param  source      The source list, or {@code null}.
      * @param  target      The target list, or {@code null} if not yet created.
      * @param  elementType The base type of elements to put in the list.
-     * @return A list (possibly the {@code target} instance) containing the {@code source}
+     * @return A list (possibly the {@code target} instance) containing the {@code source}
      *         elements, or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      *
@@ -311,7 +311,7 @@ public abstract class ModifiableMetadata
      *       modifiable.</li>
      *   <li>If {@code source} is null or empty, returns {@code null}
      *       (meaning that the metadata property is not provided).</li>
-     *   <li>If {@code target} is null, creates a new {@link Set}.</li>
+     *   <li>If {@code target} is null, creates a new {@link Set}.</li>
      *   <li>Copies the content of the given {@code source} into the target.</li>
      * </ul>
      *
@@ -319,7 +319,7 @@ public abstract class ModifiableMetadata
      * @param  source      The source set, or {@code null}.
      * @param  target      The target set, or {@code null} if not yet created.
      * @param  elementType The base type of elements to put in the set.
-     * @return A set (possibly the {@code target} instance) containing the {@code source}
+     * @return A set (possibly the {@code target} instance) containing the {@code source}
      *         elements, or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      *
@@ -359,7 +359,7 @@ public abstract class ModifiableMetadata
      *       modifiable.</li>
      *   <li>If {@code source} is null or empty, returns {@code null}
      *       (meaning that the metadata property is not provided).</li>
-     *   <li>If {@code target} is null, creates a new {@link Set} or a new {@link List}
+     *   <li>If {@code target} is null, creates a new {@link Set} or a new {@link List}
      *       depending on the value returned by {@link #collectionType(Class)}.</li>
      *   <li>Copies the content of the given {@code source} into the target.</li>
      * </ul>
@@ -375,7 +375,7 @@ public abstract class ModifiableMetadata
      * @param  source      The source collection, or {@code null}.
      * @param  target      The target collection, or {@code null} if not yet created.
      * @param  elementType The base type of elements to put in the collection.
-     * @return A collection (possibly the {@code target} instance) containing the {@code source}
+     * @return A collection (possibly the {@code target} instance) containing the {@code source}
      *         elements, or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      */
@@ -420,7 +420,7 @@ public abstract class ModifiableMetadata
 
     /**
      * Creates a list with the content of the {@code source} collection,
-     * or returns {@code null} if the source is {@code null} or empty.
+     * or returns {@code null} if the source is {@code null} or empty.
      * This is a convenience method for copying fields in subclass copy constructors.
      *
      * @param  <E>         The type represented by the {@code Class} argument.
@@ -440,7 +440,7 @@ public abstract class ModifiableMetadata
 
     /**
      * Creates a set with the content of the {@code source} collection,
-     * or returns {@code null} if the source is {@code null} or empty.
+     * or returns {@code null} if the source is {@code null} or empty.
      * This is a convenience method for copying fields in subclass copy constructors.
      *
      * @param  <E>         The type represented by the {@code Class} argument.
@@ -460,7 +460,7 @@ public abstract class ModifiableMetadata
 
     /**
      * Creates a list or set with the content of the {@code source} collection,
-     * or returns {@code null} if the source is {@code null} or empty.
+     * or returns {@code null} if the source is {@code null} or empty.
      * This is a convenience method for copying fields in subclass copy constructors.
      *
      * <p>The collection type is selected as described in the

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -491,8 +491,7 @@ class PropertyAccessor {
      *
      * @param  index The index of the property for which to get the name.
      * @param  keyPolicy The kind of name to return.
-     * @return The name of the given kind at the given index,
-     *         or {@code null} if the index is out of bounds.
+     * @return The name of the given kind at the given index, or {@code null} if the index is out of bounds.
      */
     @SuppressWarnings("fallthrough")
     @Workaround(library="JDK", version="1.7") // Actually apply to String.intern() below.
@@ -583,8 +582,7 @@ class PropertyAccessor {
      * The information are created when first needed.
      *
      * @param  index The index of the property for which to get the information.
-     * @return The information for the property at the given index,
-     *         or {@code null} if the index is out of bounds.
+     * @return The information for the property at the given index, or {@code null} if the index is out of bounds.
      *
      * @see PropertyInformation
      */

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -338,7 +338,7 @@ final class PropertyInformation<E> exten
      * Compares the given object with this element information for equality.
      *
      * @param  obj The object to compare with this element information for equality.
-     * @return {@code true} if both objects are equal.
+     * @return {@code true} if both objects are equal.
      */
     @Override
     public boolean equals(final Object obj) {

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -50,7 +50,7 @@ final class StandardImplementation exten
     private final String[] prefix;
 
     /**
-     * The acronyms that implementation classes may have, or {@code null} if none. If non-null,
+     * The acronyms that implementation classes may have, or {@code null} if none. If non-null,
      * then this array shall contain (<var>full text</var>, <var>acronym</var>) pairs. The full
      * text shall appear to the end of the class name, otherwise it is not replaced. This is
      * necessary in order to avoid the replacement of {@code "DefaultCoordinateSystemAxis"} by
@@ -92,7 +92,7 @@ final class StandardImplementation exten
     }
 
     /**
-     * Returns the implementation class for the given interface, or {@code null} if none.
+     * Returns the implementation class for the given interface, or {@code null} if none.
      * This class uses heuristic rules based on naming conventions.
      *
      * @param  type The interface, typically from the {@code org.opengis.metadata} package.

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -162,7 +162,7 @@ final class TreeNodeChildren extends Abs
      *        the collection interface even for singleton elements if they wish.}
      *
      * @param  index The index in the accessor (<em>not</em> the index in this collection).
-     * @return {@code true} if the value at the given index is a collection.
+     * @return {@code true} if the value at the given index is a collection.
      */
     final boolean isCollection(final int index) {
         return accessor.isCollection(index);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -66,7 +66,7 @@ public class DefaultConstraints extends 
     /**
      * Constructs a new constraints with the given {@linkplain #getUseLimitations() use limitation}.
      *
-     * @param useLimitation The use limitation, or {@code null} if none.
+     * @param useLimitation The use limitation, or {@code null} if none.
      */
     public DefaultConstraints(final CharSequence useLimitation) {
         useLimitations = singleton(Types.toInternationalString(useLimitation), InternationalString.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -79,7 +79,7 @@ public class DefaultLegalConstraints ext
     /**
      * Constructs a new constraints with the given {@linkplain #getUseLimitations() use limitation}.
      *
-     * @param useLimitation The use limitation, or {@code null} if none.
+     * @param useLimitation The use limitation, or {@code null} if none.
      */
     public DefaultLegalConstraints(final CharSequence useLimitation) {
         super(useLimitation);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -77,7 +77,7 @@ public class DefaultSecurityConstraints 
     /**
      * Constructs a new constraints with the given {@linkplain #getUseLimitations() use limitation}.
      *
-     * @param useLimitation The use limitation, or {@code null} if none.
+     * @param useLimitation The use limitation, or {@code null} if none.
      */
     public DefaultSecurityConstraints(final CharSequence useLimitation) {
         super(useLimitation);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -160,7 +160,7 @@ public class DefaultGeographicBoundingBo
      * @param northBoundLatitude The maximal φ value.
      *
      * @throws IllegalArgumentException If (<var>south bound</var> &gt; <var>north bound</var>).
-     *         Note that {@linkplain Double#NaN NaN} values are allowed.
+     *         Note that {@linkplain Double#NaN NaN} values are allowed.
      *
      * @see #setBounds(double, double, double, double)
      */
@@ -368,7 +368,7 @@ public class DefaultGeographicBoundingBo
      * <p>This method should be invoked <strong>before</strong> {@link #normalize()}.</p>
      *
      * @throws IllegalArgumentException If (<var>south bound</var> &gt; <var>north bound</var>).
-     *         Note that {@linkplain Double#NaN NaN} values are allowed.
+     *         Note that {@linkplain Double#NaN NaN} values are allowed.
      */
     private static void verifyBounds(final double southBoundLatitude, final double northBoundLatitude)
             throws IllegalArgumentException
@@ -437,7 +437,7 @@ public class DefaultGeographicBoundingBo
      * @param northBoundLatitude The maximal φ value.
      *
      * @throws IllegalArgumentException If (<var>south bound</var> &gt; <var>north bound</var>).
-     *         Note that {@linkplain Double#NaN NaN} values are allowed.
+     *         Note that {@linkplain Double#NaN NaN} values are allowed.
      */
     public void setBounds(final double westBoundLongitude,
                           final double eastBoundLongitude,

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -110,7 +110,7 @@ public class DefaultMaintenanceInformati
      * Creates a maintenance information.
      *
      * @param maintenanceAndUpdateFrequency The frequency with which changes and additions are
-     *        made to the resource after the initial resource is completed, or {@code null} if none.
+     *        made to the resource after the initial resource is completed, or {@code null} if none.
      */
     public DefaultMaintenanceInformation(final MaintenanceFrequency maintenanceAndUpdateFrequency) {
         this.maintenanceAndUpdateFrequency = maintenanceAndUpdateFrequency;

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -64,7 +64,7 @@ public class DefaultScopeDescription ext
 
     /**
      * The names of the mutually exclusive properties. The index of each name shall be the
-     * value of the above {@code byte} constants minus one.
+     * value of the above {@code byte} constants minus one.
      */
     private static final String[] NAMES = {
         "attributes",

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -138,6 +138,16 @@ public final strictfp class HardCodedCit
     }
 
     /**
+     * The <a href="http://sis.apache.org">Apache SIS</a> project.
+     */
+    public static final DefaultCitation SIS;
+    static {
+        final DefaultCitation c = new DefaultCitation("SIS");
+        c.freeze();
+        SIS = c;
+    }
+
+    /**
      * Do not allow instantiation of this class.
      */
     private HardCodedCitations() {

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -16,14 +16,12 @@
  */
 package org.apache.sis.metadata.iso.lineage;
 
-import java.net.URL;
-import java.io.IOException;
 import javax.xml.bind.JAXBException;
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.test.XMLTestCase;
 import org.junit.Test;
 
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
 
 
 /**
@@ -37,16 +35,9 @@ import static org.apache.sis.test.Assert
  */
 public final strictfp class DefaultProcessStepTest extends XMLTestCase {
     /**
-     * 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.
+     * An XML file in this package containing a process step definition.
      */
-    private static URL getResource(final String filename) {
-        final URL resource = DefaultProcessStepTest.class.getResource(filename);
-        assertNotNull(filename, resource);
-        return resource;
-    }
+    private static final String XML_FILE = "ProcessStep.xml";
 
     /**
      * Tests the (un)marshalling of a metadata mixing elements from ISO 19115 and ISO 19115-2 standards.
@@ -54,11 +45,10 @@ public final strictfp class DefaultProce
      * <p><b>XML test file:</b>
      * <a href="{@scmUrl metadata}/lineage/ProcessStep.xml">ProcessStep.xml</a></p>
      *
-     * @throws IOException   If an error occurred while reading the XML file.
      * @throws JAXBException If an error occurred during the during marshalling / unmarshalling processes.
      */
     @Test
-    public void testXML() throws IOException, JAXBException {
+    public void testXML() throws JAXBException {
         final DefaultProcessing  processing  = new DefaultProcessing();
         final DefaultProcessStep processStep = new DefaultProcessStep("Some process step.");
         processing.setProcedureDescription(new SimpleInternationalString("Some procedure."));
@@ -66,12 +56,10 @@ public final strictfp class DefaultProce
         /*
          * XML marshalling, and compare with the content of "ProcessStep.xml" file.
          */
-        final String xml = marshal(processStep);
-        assertTrue(xml.startsWith("<?xml"));
-        assertXmlEquals(getResource("ProcessStep.xml"), xml, "xmlns:*", "xsi:schemaLocation");
+        assertMarshalEqualsFile(XML_FILE, processStep, "xlmns:*", "xsi:schemaLocation");
         /*
-         * Final comparison: ensure that we didn't lost any information.
+         * XML unmarshalling: ensure that we didn't lost any information.
          */
-        assertEquals(processStep, unmarshal(DefaultProcessStep.class, xml));
+        assertEquals(processStep, unmarshalFile(DefaultProcessStep.class, XML_FILE));
     }
 }

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -17,17 +17,14 @@
 package org.apache.sis.metadata.iso.quality;
 
 import java.util.Locale;
-import java.net.URL;
-import java.io.IOException;
 import javax.xml.bind.JAXBException;
 import org.opengis.util.InternationalString;
-import org.apache.sis.xml.XML;
 import org.apache.sis.xml.FreeTextMarshallingTest;
 import org.apache.sis.test.XMLTestCase;
 import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
-import static org.apache.sis.test.Assert.*;
+import static org.opengis.test.Assert.*;
 import static org.apache.sis.test.TestUtilities.getSingleton;
 
 
@@ -43,16 +40,9 @@ import static org.apache.sis.test.TestUt
 @DependsOn(FreeTextMarshallingTest.class)
 public final strictfp class AbstractPositionalAccuracyTest extends XMLTestCase {
     /**
-     * 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.
+     * An XML file in this package containing a positional accuracy definition.
      */
-    private static URL getResource(final String filename) {
-        final URL resource = AbstractPositionalAccuracyTest.class.getResource(filename);
-        assertNotNull(filename, resource);
-        return resource;
-    }
+    private static final String XML_FILE = "PositionalAccuracy.xml";
 
     /**
      * Tests the (un)marshalling of a text group with a default {@code <gco:CharacterString>} element.
@@ -62,18 +52,15 @@ public final strictfp class AbstractPosi
      * <p><b>XML test file:</b>
      * <a href="{@scmUrl metadata}/quality/PositionalAccuracy.xml">PositionalAccuracy.xml</a></p>
      *
-     * @throws IOException   If an error occurred while reading the XML file.
      * @throws JAXBException If an error occurred during the during marshalling / unmarshalling processes.
      *
      * @see <a href="http://jira.geotoolkit.org/browse/GEOTK-107">GEOTK-107</a>
      * @see FreeTextMarshallingTest
      */
     @Test
-    public void testXML() throws IOException, JAXBException {
-        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());
+    public void testXML() throws JAXBException {
+        final AbstractElement metadata = unmarshalFile(AbstractElement.class, XML_FILE);
+        final InternationalString nameOfMeasure = getSingleton(metadata.getNamesOfMeasure());
         /*
          * Programmatic verification of the text group.
          */
@@ -86,10 +73,10 @@ public final strictfp class AbstractPosi
          * needs to contain a "result" element in order to pass XML validation test.
          */
         assertInstanceOf("Wrong value for <gmd:result>", DefaultConformanceResult.class,
-                getSingleton(((AbstractElement) metadata).getResults()));
+                getSingleton(metadata.getResults()));
         /*
-         * Final comparison: ensure that we didn't lost any information.
+         * Marshalling: ensure that we didn't lost any information.
          */
-        assertXmlEquals(resource, marshal(metadata), "xmlns:*", "xsi:schemaLocation", "xsi:type");
+        assertMarshalEqualsFile(XML_FILE, metadata, "xmlns:*", "xsi:schemaLocation", "xsi:type");
     }
 }

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -201,7 +201,7 @@ public class GeneralDirectPosition exten
     /**
      * Sets the ordinate values along all dimensions.
      *
-     * @param  ordinates The new ordinates values, or a {@code null} array
+     * @param  ordinates The new ordinates values, or a {@code null} array
      *         for setting all ordinate values to {@link Double#NaN NaN}.
      * @throws MismatchedDimensionException If the length of the specified array is not
      *         equals to the {@linkplain #getDimension() dimension} of this position.
@@ -247,7 +247,7 @@ public class GeneralDirectPosition exten
      * contains a coordinate reference system (CRS), then the CRS for this position will
      * be set to the CRS of the specified position.
      *
-     * @param  position The new position for this point, or {@code null} for setting all ordinate
+     * @param  position The new position for this point, or {@code null} for setting all ordinate
      *         values to {@link Double#NaN NaN}.
      * @throws MismatchedDimensionException if the given position doesn't have the expected dimension.
      */

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -55,7 +55,7 @@ import static org.apache.sis.math.MathFu
  * coordinates of an arbitrary number of dimensions. This is in contrast with
  * {@link Envelope2D}, which can use only two-dimensional coordinates.
  *
- * <p>A {@code GeneralEnvelope} can be created in various ways:</p>
+ * <p>A {@code GeneralEnvelope} can be created in various ways:</p>
  * <ul>
  *   <li>{@linkplain #GeneralEnvelope(int) From a given number of dimension}, with all ordinates initialized to 0.</li>
  *   <li>{@linkplain #GeneralEnvelope(double[], double[]) From two coordinate points}.</li>

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatumType.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -21,8 +21,7 @@ import org.apache.sis.internal.jaxb.gml.
 
 
 /**
- * JAXB adapter mapping implementing class to the GeoAPI interface. See
- * package documentation for more information about JAXB and interface.
+ * JAXB adapter for (un)marshalling of GeoAPI code list.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4 (derived from geotk-3.20)

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CS_AxisDirection.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -21,10 +21,9 @@ import org.apache.sis.internal.jaxb.gml.
 
 
 /**
- * JAXB adapter mapping implementing class to the GeoAPI interface. See
- * package documentation for more information about JAXB and interface.
+ * JAXB adapter for (un)marshalling of GeoAPI code list.
  *
- * @author Guilhem Legal (Geomatys)
+ * @author  Guilhem Legal (Geomatys)
  * @since   0.4 (derived from geotk-3.04)
  * @version 0.4
  * @module

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameter.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -21,7 +21,9 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.measure.unit.Unit;
 import org.opengis.referencing.datum.Ellipsoid;
 import org.apache.sis.xml.Namespaces;
+import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.gco.Measure;
+import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -128,7 +130,10 @@ public final class SecondDefiningParamet
      * @param measure The inverse flattening value.
      */
     public void setInverseFlattening(final Measure measure) {
-        measure.setUnit(Unit.ONE);
+        if (measure.setUnit(Unit.ONE)) {
+            Context.warningOccured(Context.current(), SecondDefiningParameter.class, "setInverseFlattening",
+                    Errors.class, Errors.Keys.IncompatiblePropertyValue_1, "uom");
+        }
         this.measure = measure;
     }
 }

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/package-info.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -32,8 +32,6 @@
  */
 @XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GML, xmlns = {
     @XmlNs(prefix = "gml", namespaceURI = Namespaces.GML),
-    @XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
-    @XmlNs(prefix = "gco", namespaceURI = Namespaces.GCO),
     @XmlNs(prefix = "xsi", namespaceURI = Namespaces.XSI)
 })
 @XmlAccessorType(XmlAccessType.NONE)

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -36,23 +36,6 @@ public final class ReferencingTypes exte
      */
     @Override
     public void getTypes(final Collection<Class<?>> addTo) {
-        if (exists(addTo)) return;
         addTo.add(AbstractIdentifiedObject.class);
     }
-
-    /**
-     * Temporary workaround for avoiding a conflict between SIS and Geotk JAXB annotations.
-     * To be removed after we finished the port of Geotk referencing module to Apache SIS.
-     *
-     * @deprecated To be removed after sis-referencing completion.
-     */
-    @Deprecated
-    private static boolean exists(final Collection<Class<?>> addTo) {
-        for (final Class<?> type : addTo) {
-            if (org.opengis.referencing.crs.CoordinateReferenceSystem.class.isAssignableFrom(type)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -37,6 +37,7 @@ import org.opengis.referencing.Identifie
 import org.opengis.referencing.ReferenceIdentifier;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.Matrix;
 import org.opengis.util.CodeList;
 
 import org.apache.sis.measure.Units;
@@ -49,6 +50,7 @@ import org.apache.sis.util.resources.Err
 import org.apache.sis.internal.util.Citations;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
+import org.apache.sis.referencing.operation.transform.LinearTransform;
 
 // Related to JDK7
 import org.apache.sis.internal.jdk7.JDK7;
@@ -364,7 +366,7 @@ public class Formatter {
     /**
      * Increase or reduce the indentation. A value of {@code +1} increase
      * the indentation by the amount of spaces specified at construction time,
-     * and a value of {@code +1} reduce it.
+     * and a value of {@code -1} reduce it.
      */
     private void indent(final int amount) {
         margin = Math.max(0, margin + indentation*amount);
@@ -516,6 +518,14 @@ public class Formatter {
         if (transform != null) {
             if (transform instanceof FormattableObject) {
                 append((FormattableObject) transform);
+            } else if (transform instanceof LinearTransform) {
+                appendSeparator(true);
+                buffer.append("PARAM_MT").appendCodePoint(symbols.getOpeningBracket(0));
+                quote("Affine");
+                indent(+1);
+                append(((LinearTransform) transform).getMatrix());
+                indent(-1);
+                buffer.appendCodePoint(symbols.getClosingBracket(0));
             } else {
                 throw new UnformattableObjectException(Errors.format(
                         Errors.Keys.IllegalClass_2, FormattableObject.class, transform.getClass()));
@@ -524,6 +534,52 @@ public class Formatter {
     }
 
     /**
+     * Appends a sequence of {@code PARAMETER[…]} elements for the given matrix.
+     * Only elements different than the default values are appended.
+     * The default values are 1 on the matrix diagonal and 0 elsewhere.
+     *
+     * @param matrix The matrix to append to the WKT, or {@code null} if none.
+     */
+    public void append(final Matrix matrix) {
+        if (matrix == null) {
+            return;
+        }
+        final int numRow = matrix.getNumRow();
+        final int numCol = matrix.getNumCol();
+        final int openingBracket  = symbols.getOpeningBracket(0);
+        final int closingBracket  = symbols.getClosingBracket(0);
+        final int openQuote       = symbols.getOpenQuote();
+        final int closeQuote      = symbols.getCloseQuote();
+        final String separator    = symbols.getSeparator();
+        final StringBuffer buffer = this.buffer;
+        boolean columns = false;
+        do {
+            appendSeparator(true);
+            buffer.append("PARAMETER").appendCodePoint(openingBracket);
+            quote(columns ? "num_col" : "num_row");
+            buffer.append(separator);
+            format(columns ? numCol : numRow);
+            buffer.appendCodePoint(closingBracket);
+        } while ((columns = !columns) == true);
+        for (int j=0; j<numRow; j++) {
+            for (int i=0; i<numCol; i++) {
+                final double element = matrix.getElement(j, i);
+                if (element != (i == j ? 1 : 0)) {
+                    appendSeparator(true);
+                    buffer.append("PARAMETER").appendCodePoint(openingBracket);
+                    setColor(ElementKind.PARAMETER);
+                    buffer.appendCodePoint(openQuote).append("elt_").append(j)
+                            .append('_').append(i).appendCodePoint(closeQuote);
+                    resetColor();
+                    buffer.append(separator);
+                    format(element);
+                    buffer.appendCodePoint(closingBracket);
+                }
+            }
+        }
+    }
+
+    /**
      * Appends a {@linkplain ParameterValue parameter} in WKT form.
      * If the supplied parameter is actually a {@linkplain ParameterValueGroup parameter group},
      * all contained parameters will flattened in a single list.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -120,7 +120,8 @@ import org.apache.sis.internal.jdk7.Obje
     AbstractReferenceSystem.class,
     org.apache.sis.referencing.datum.AbstractDatum.class,
     org.apache.sis.referencing.datum.DefaultEllipsoid.class,
-    org.apache.sis.referencing.datum.DefaultPrimeMeridian.class
+    org.apache.sis.referencing.datum.DefaultPrimeMeridian.class,
+    org.apache.sis.referencing.cs.AbstractCS.class
 })
 public class AbstractIdentifiedObject extends FormattableObject implements IdentifiedObject,
         LenientComparable, Deprecable, Serializable

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -21,7 +21,9 @@ import java.util.Arrays;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 import javax.measure.unit.NonSI;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.referencing.ReferenceIdentifier;
@@ -65,6 +67,10 @@ import static org.apache.sis.util.Utilit
  * @see DefaultCoordinateSystemAxis
  * @see org.apache.sis.referencing.crs.AbstractCRS
  */
+@XmlType(name = "AbstractCoordinateSystemType")
+@XmlSeeAlso({
+    DefaultEllipsoidalCS.class
+})
 public class AbstractCS extends AbstractIdentifiedObject implements CoordinateSystem {
     /**
      * Serial number for inter-operability with different versions.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -59,6 +59,14 @@ public class DefaultAffineCS extends Abs
     private static final long serialVersionUID = 7977674229369042440L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    DefaultAffineCS() {
+    }
+
+    /**
      * Constructs a coordinate system of arbitrary dimension. This constructor is
      * not public because {@code AffineCS} are restricted to 2 and 3 dimensions.
      */

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -64,6 +64,14 @@ public class DefaultCartesianCS extends 
     private static final long serialVersionUID = -6182037957705712945L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultCartesianCS() {
+    }
+
+    /**
      * Constructs a one-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -23,8 +23,10 @@ import javax.measure.unit.Unit;
 import javax.measure.unit.NonSI;
 import javax.measure.quantity.Angle;
 import javax.measure.converter.UnitConverter;
+import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.referencing.ReferenceIdentifier;
@@ -39,6 +41,7 @@ import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.io.wkt.Formatter;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
@@ -72,6 +75,14 @@ import org.apache.sis.internal.jdk7.Obje
  * @see AbstractCS
  * @see Unit
  */
+@XmlType(name = "CoordinateSystemAxisType", propOrder = {
+    "abbreviation",
+    "direction",
+    "minimum",
+    "maximum",
+    "rangeMeaning"
+})
+@XmlRootElement(name = "CoordinateSystemAxis")
 public class DefaultCoordinateSystemAxis extends AbstractIdentifiedObject implements CoordinateSystemAxis {
     /**
      * Serial number for inter-operability with different versions.
@@ -143,13 +154,16 @@ public class DefaultCoordinateSystemAxis
     private final Unit<?> unit;
 
     /**
-     * Minimal and maximal value for this axis.
+     * Minimal and maximal value for this axis, or negative/positive infinity if none.
+     *
+     * Consider this field as final. It is not final only for XML unmarshalling.
      */
-    private final double minimum, maximum;
+    private double minimumValue, maximumValue;
 
     /**
-     * The range meaning for this axis.
+     * The range meaning for this axis, or {@code null} if unspecified.
      */
+    @XmlElement
     private final RangeMeaning rangeMeaning;
 
     /**
@@ -163,8 +177,8 @@ public class DefaultCoordinateSystemAxis
         direction    = null;
         unit         = null;
         rangeMeaning = null;
-        minimum      = Double.NEGATIVE_INFINITY;
-        maximum      = Double.POSITIVE_INFINITY;
+        minimumValue = Double.NEGATIVE_INFINITY;
+        maximumValue = Double.POSITIVE_INFINITY;
     }
 
     /**
@@ -205,32 +219,37 @@ public class DefaultCoordinateSystemAxis
      * @param abbreviation The {@linkplain #getAbbreviation() abbreviation} used for this coordinate system axis.
      * @param direction    The {@linkplain #getDirection() direction} of this coordinate system axis.
      * @param unit         The {@linkplain #getUnit() unit of measure} used for this coordinate system axis.
-     * @param minimum      The minimum value normally allowed for this axis.
-     * @param maximum      The maximum value normally allowed for this axis.
-     * @param rangeMeaning The meaning of axis value range specified by the minimum and maximum values.
+     * @param minimumValue The minimum value normally allowed for this axis, or {@link Double#NEGATIVE_INFINITY} if none.
+     * @param maximumValue The maximum value normally allowed for this axis, or {@link Double#POSITIVE_INFINITY} if none.
+     * @param rangeMeaning The meaning of axis value range specified by the minimum and maximum values, or {@code null}
+     *                     if it does not apply. Shall not be null if the minimum and maximum values are not infinite.
      */
     public DefaultCoordinateSystemAxis(final Map<String,?> properties,
                                        final String        abbreviation,
                                        final AxisDirection direction,
                                        final Unit<?>       unit,
-                                       final double        minimum,
-                                       final double        maximum,
-                                       final RangeMeaning  rangeMeaning)
+                                       final double        minimumValue,
+                                       final double        maximumValue,
+                                             RangeMeaning  rangeMeaning)
     {
         super(properties);
         this.abbreviation = abbreviation;
         this.direction    = direction;
         this.unit         = unit;
-        this.minimum      = minimum;
-        this.maximum      = maximum;
-        this.rangeMeaning = rangeMeaning;
+        this.minimumValue = minimumValue;
+        this.maximumValue = maximumValue;
         ensureNonNull("abbreviation", abbreviation);
         ensureNonNull("direction",    direction);
         ensureNonNull("unit",         unit);
-        ensureNonNull("rangeMeaning", rangeMeaning);
-        if (!(minimum < maximum)) { // Use '!' for catching NaN
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalRange_2, minimum, maximum));
+        if (!(minimumValue < maximumValue)) { // Use '!' for catching NaN
+            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalRange_2, minimumValue, maximumValue));
+        }
+        if ((minimumValue != Double.NEGATIVE_INFINITY) || (maximumValue != Double.POSITIVE_INFINITY)) {
+            ensureNonNull("rangeMeaning", rangeMeaning);
+        } else {
+            rangeMeaning = null;
         }
+        this.rangeMeaning = rangeMeaning;
     }
 
     /**
@@ -259,13 +278,14 @@ public class DefaultCoordinateSystemAxis
         ensureNonNull("unit",         unit);
         double min = Double.NEGATIVE_INFINITY;
         double max = Double.POSITIVE_INFINITY;
-        RangeMeaning r = RangeMeaning.EXACT;
+        RangeMeaning r = null;
         if (Units.isAngular(unit)) {
             final UnitConverter fromDegrees = NonSI.DEGREE_ANGLE.getConverterTo(unit.asType(Angle.class));
             final AxisDirection dir = AxisDirections.absolute(direction);
             if (dir.equals(AxisDirection.NORTH)) {
                 min = fromDegrees.convert(Latitude.MIN_VALUE);
                 max = fromDegrees.convert(Latitude.MAX_VALUE);
+                r = RangeMeaning.EXACT;
             } else if (dir.equals(AxisDirection.EAST)) {
                 min = fromDegrees.convert(Longitude.MIN_VALUE);
                 max = fromDegrees.convert(Longitude.MAX_VALUE);
@@ -277,8 +297,8 @@ public class DefaultCoordinateSystemAxis
                 max = t;
             }
         }
-        minimum = min;
-        maximum = max;
+        minimumValue = min;
+        maximumValue = max;
         rangeMeaning = r;
     }
 
@@ -298,8 +318,8 @@ public class DefaultCoordinateSystemAxis
         abbreviation = axis.getAbbreviation();
         direction    = axis.getDirection();
         unit         = axis.getUnit();
-        minimum      = axis.getMinimumValue();
-        maximum      = axis.getMaximumValue();
+        minimumValue = axis.getMinimumValue();
+        maximumValue = axis.getMaximumValue();
         rangeMeaning = axis.getRangeMeaning();
     }
 
@@ -368,7 +388,29 @@ public class DefaultCoordinateSystemAxis
      */
     @Override
     public double getMinimumValue() {
-        return minimum;
+        return minimumValue;
+    }
+
+    /**
+     * Invoke by JAXB at marshalling time for fetching the minimum value, or {@code null} if none.
+     */
+    @XmlElement(name = "minimumValue")
+    private Double getMinimum() {
+        return (minimumValue != Double.NEGATIVE_INFINITY) ? minimumValue : null;
+    }
+
+    /**
+     * Invoked by JAXB at unmarshalling time for setting the minimum value.
+     */
+    private void setMinimum(final Double value) {
+        if (value != null) {
+            final double min = value.doubleValue();
+            if (min < maximumValue) {
+                minimumValue = min;
+            } else {
+                outOfRange("minimumValue", value);
+            }
+        }
     }
 
     /**
@@ -380,14 +422,48 @@ public class DefaultCoordinateSystemAxis
      */
     @Override
     public double getMaximumValue() {
-        return maximum;
+        return maximumValue;
+    }
+
+    /**
+     * Invoke by JAXB at marshalling time for fetching the maximum value, or {@code null} if none.
+     */
+    @XmlElement(name = "maximumValue")
+    private Double getMaximum() {
+        return (maximumValue != Double.POSITIVE_INFINITY) ? maximumValue : null;
+    }
+
+    /**
+     * Invoked by JAXB at unmarshalling time for setting the maximum value.
+     */
+    private void setMaximum(final Double value) {
+        if (value != null) {
+            final double max = value.doubleValue();
+            if (max > minimumValue) {
+                maximumValue = max;
+            } else {
+                outOfRange("maximumValue", value);
+            }
+        }
+    }
+
+    /**
+     * Invoked at unmarshalling time if a minimum or maximum value is out of range.
+     *
+     * @param name  The property name. Will also be used as "method" name for logging purpose,
+     *              since the setter method "conceptually" do not exist (it is only for JAXB).
+     * @param value The invalid value.
+     */
+    private static void outOfRange(final String name, final Double value) {
+        Context.warningOccured(Context.current(), DefaultCoordinateSystemAxis.class, name,
+                Errors.class, Errors.Keys.InconsistentAttribute_2, name, value);
     }
 
     /**
      * Returns the meaning of axis value range specified by the {@linkplain #getMinimumValue() minimum}
      * and {@linkplain #getMaximumValue() maximum} values.
      *
-     * @return The meaning of axis value range.
+     * @return The meaning of axis value range, or {@code null} if unspecified.
      */
     @Override
     public RangeMeaning getRangeMeaning() {
@@ -500,8 +576,8 @@ public class DefaultCoordinateSystemAxis
         if (compareMetadata) {
             if (!Objects.equals(this.abbreviation, that.abbreviation) ||
                 !Objects.equals(this.rangeMeaning, that.rangeMeaning) ||
-                Double.doubleToLongBits(minimum) != Double.doubleToLongBits(that.minimum) ||
-                Double.doubleToLongBits(maximum) != Double.doubleToLongBits(that.maximum))
+                Double.doubleToLongBits(minimumValue) != Double.doubleToLongBits(that.minimumValue) ||
+                Double.doubleToLongBits(maximumValue) != Double.doubleToLongBits(that.maximumValue))
             {
                 return false;
             }
@@ -565,7 +641,7 @@ public class DefaultCoordinateSystemAxis
          * differentiate this CoordinateSystemAxis implementation from implementations of other GeoAPI interfaces.
          */
         return serialVersionUID ^ (super.computeHashCode() + Objects.hashCode(unit) + Objects.hashCode(direction)
-                + Double.doubleToLongBits(minimum) + 31*Double.doubleToLongBits(maximum));
+                + Double.doubleToLongBits(minimumValue) + 31*Double.doubleToLongBits(maximumValue));
     }
 
     /**

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -58,6 +58,14 @@ public class DefaultCylindricalCS extend
     private static final long serialVersionUID = -8290402732390917907L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultCylindricalCS() {
+    }
+
+    /**
      * Constructs a three-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -18,6 +18,8 @@ package org.apache.sis.referencing.cs;
 
 import java.util.Map;
 import javax.measure.unit.Unit;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
@@ -51,6 +53,8 @@ import org.apache.sis.measure.Units;
  * @version 0.4
  * @module
  */
+@XmlType(name = "EllipsoidalCSType")
+@XmlRootElement(name = "EllipsoidalCS")
 public class DefaultEllipsoidalCS extends AbstractCS implements EllipsoidalCS {
     /**
      * Serial number for inter-operability with different versions.
@@ -58,6 +62,14 @@ public class DefaultEllipsoidalCS extend
     private static final long serialVersionUID = -1452492488902329211L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultEllipsoidalCS() {
+    }
+
+    /**
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1554741&r1=1554740&r2=1554741&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Thu Jan  2 06:04:58 2014
@@ -57,6 +57,14 @@ public class DefaultLinearCS extends Abs
     private static final long serialVersionUID = -6890723478287625763L;
 
     /**
+     * Constructs a new coordinate system in which every attributes are set to a null or empty value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly reserved to JAXB,
+     * which will assign values to the fields using reflexion.
+     */
+    private DefaultLinearCS() {
+    }
+
+    /**
      * Constructs a coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.



Mime
View raw message