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/04/10 15:15:13 UTC
svn commit: r1466475 [1/4] - in /sis/trunk: ./ sis-build-helper/
sis-metadata/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/
sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/
sis-metadata/src/main/java/org/apache/sis/inte...
Author: desruisseaux
Date: Wed Apr 10 13:15:08 2013
New Revision: 1466475
URL: http://svn.apache.org/r1466475
Log:
Merge from the JDK6 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/pom.xml
sis/trunk/sis-build-helper/pom.xml
sis/trunk/sis-metadata/pom.xml
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultThematicClassificationCorrectness.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTopologicalConsistency.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/referencing/DefaultReferenceIdentifier.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
sis/trunk/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
sis/trunk/sis-utility/pom.xml
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/DateConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapWithSpecialCases.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/Angle.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/Latitude.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/Longitude.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/MeasurementRange.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/Range.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Version.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/CollectionsExt.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptyQueue.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/EmptySortedSet.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/UnmodifiableArrayList.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
sis/trunk/src/main/docbook/fr/XML.xml
sis/trunk/src/main/docbook/fr/geoapi.xml
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1463923-1466461
Merged /sis/branches/JDK6:r1464355-1466472
Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Wed Apr 10 13:15:08 2013
@@ -108,10 +108,17 @@ Apache SIS is a toolkit for describing l
============================================================== -->
<developers>
<developer>
+ <name>Adam Estrada</name>
+ <id>aestrada</id>
+ <roles>
+ <role>lead</role>
+ </roles>
+ </developer>
+ <developer>
<name>Chris A. Mattmann</name>
<id>mattmann</id>
<email>mattmann@apache.org</email>
- <url>http://people.apache.org/~mattmann/</url>
+ <url>http://sunset.usc.edu/~mattmann/</url>
<organization>NASA Jet Propulsion Laboratory</organization>
<organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
<timezone>-8</timezone>
@@ -121,12 +128,29 @@ Apache SIS is a toolkit for describing l
</roles>
</developer>
<developer>
+ <name>Joseph F. White</name>
+ <id>jwhite</id>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Martin Desruisseaux</name>
+ <id>desruisseaux</id>
+ <email>desruisseaux@apache.org</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>Patrick O'Leary</name>
<id>pjaol</id>
<email>pjaol@apache.org</email>
- <url>http://people.apache.org/~pjaol/</url>
<organization>AT&T Interactive</organization>
- <organizationUrl>http://www.attinteractive.com/</organizationUrl>
+ <organizationUrl>http://www.attinteractive.com</organizationUrl>
<timezone>-8</timezone>
<properties />
<roles>
@@ -134,7 +158,7 @@ Apache SIS is a toolkit for describing l
</roles>
</developer>
<developer>
- <name>Paul Ramirez</name>
+ <name>Paul Michael Ramirez</name>
<id>pramirez</id>
<email>pramirez@apache.org</email>
<url>http://people.apache.org/~pramirez/</url>
@@ -150,7 +174,6 @@ Apache SIS is a toolkit for describing l
<name>Sean McCleese</name>
<id>smcclees</id>
<email>smcclees@apache.org</email>
- <url>http://people.apache.org/~smcclees/</url>
<organization>NASA Jet Propulsion Laboratory</organization>
<organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
<timezone>-8</timezone>
@@ -163,7 +186,6 @@ Apache SIS is a toolkit for describing l
<name>Nga Chung</name>
<id>nchung</id>
<email>nchung@apache.org</email>
- <url>http://people.apache.org/~nchung/</url>
<organization>NASA Jet Propulsion Laboratory</organization>
<organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
<timezone>-8</timezone>
@@ -173,21 +195,59 @@ Apache SIS is a toolkit for describing l
</roles>
</developer>
</developers>
+
<contributors>
<contributor>
- <name>Greg Reddin</name>
+ <name>Adrian Custer</name>
+ <roles>
+ <role>documentation</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Andrew Hart</name>
+ <!-- id>ahart</id -->
+ </contributor>
+ <contributor>
+ <name>Charitha</name>
+ <!-- id>charithcc</id -->
+ </contributor>
+ <contributor>
+ <name>Cédric Briançon</name>
+ <email>cedric.briancon@geomatys.com</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Gregory D. Reddin</name>
+ <!-- id>greddin</id -->
<roles>
<role>mentor</role>
</roles>
</contributor>
<contributor>
+ <name>Guilhem Legal</name>
+ <email>guilhem.legal@geomatys.com</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
+ <contributor>
<name>Ian Holsman</name>
+ <!-- id>ianh</id -->
<roles>
<role>mentor</role>
</roles>
</contributor>
<contributor>
<name>Joe Schaefer</name>
+ <!-- id>joes</id -->
<roles>
<role>mentor</role>
</roles>
@@ -198,6 +258,23 @@ Apache SIS is a toolkit for describing l
<role>mentor</role>
</roles>
</contributor>
+ <contributor>
+ <name>Peter Karich</name>
+ <!-- id>pk</id -->
+ </contributor>
+ <contributor>
+ <name>Ross Laidlaw</name>
+ <!-- id>rlaidlaw</id -->
+ </contributor>
+ <contributor>
+ <name>Touraïvane</name>
+ <organization>Institut de Recherche pour le Développement (IRD)</organization>
+ <organizationUrl>http://www.ird.fr</organizationUrl>
+ <timezone>+11</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
</contributors>
@@ -444,7 +521,7 @@ Apache SIS is a toolkit for describing l
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: sis/trunk/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/sis-build-helper/pom.xml?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-build-helper/pom.xml (original)
+++ sis/trunk/sis-build-helper/pom.xml Wed Apr 10 13:15:08 2013
@@ -69,17 +69,20 @@ Define Maven Mojos and Javadoc taglets f
=========================================================== -->
<developers>
<developer>
- <id>desruisseaux</id>
<name>Martin Desruisseaux</name>
+ <id>desruisseaux</id>
<email>desruisseaux@apache.org</email>
<organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com/</organizationUrl>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>Developer</role>
+ <role>developer</role>
</roles>
</developer>
</developers>
+ <contributors>
+ <!-- To prevent inheritance from parent pom.xml -->
+ </contributors>
<!-- ===========================================================
Modified: sis/trunk/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/pom.xml?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/pom.xml (original)
+++ sis/trunk/sis-metadata/pom.xml Wed Apr 10 13:15:08 2013
@@ -52,44 +52,51 @@ Implementations of metadata derived from
=========================================================== -->
<developers>
<developer>
- <id>desruisseaux</id>
<name>Martin Desruisseaux</name>
+ <id>desruisseaux</id>
<email>desruisseaux@apache.org</email>
<organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com/</organizationUrl>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>Developer</role>
+ <role>developer</role>
</roles>
</developer>
</developers>
<contributors>
<contributor>
+ <name>Adrian Custer</name>
+ <roles>
+ <role>documentation</role>
+ </roles>
+ </contributor>
+ <contributor>
<name>Cédric Briançon</name>
<email>cedric.briancon@geomatys.com</email>
<organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>Developer</role>
+ <role>developer</role>
</roles>
</contributor>
<contributor>
<name>Guilhem Legal</name>
<email>guilhem.legal@geomatys.com</email>
<organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>Developer</role>
+ <role>developer</role>
</roles>
</contributor>
<contributor>
<name>Touraïvane</name>
- <organization>
- Institut de Recherche pour le Développement (IRD)
- </organization>
+ <organization>Institut de Recherche pour le Développement (IRD)</organization>
+ <organizationUrl>http://www.ird.fr</organizationUrl>
<timezone>+11</timezone>
<roles>
- <role>Developer</role>
+ <role>developer</role>
</roles>
</contributor>
</contributors>
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class LE_ProcessStep extends Defa
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -7511299413801716712L;
+ private static final long serialVersionUID = -3629663823701442873L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -37,7 +37,7 @@ public class LE_Source extends DefaultSo
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -8237367019409009341L;
+ private static final long serialVersionUID = -4284654104287846003L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -37,7 +37,7 @@ public class MI_Band extends DefaultBand
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -7061684569453232088L;
+ private static final long serialVersionUID = -6839213923457158942L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class MI_CoverageDescription exte
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -8679911383066193615L;
+ private static final long serialVersionUID = -8365259738630697633L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class MI_Georectified extends Def
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = 6964334064255912684L;
+ private static final long serialVersionUID = 7518820483760523541L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class MI_Georeferenceable extend
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -8181513425297909032L;
+ private static final long serialVersionUID = 4709694415908530851L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class MI_ImageDescription extends
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -943279317653405499L;
+ private static final long serialVersionUID = -6373977837954788960L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -39,7 +39,7 @@ public class MI_Metadata extends Default
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = 5472890635961139724L;
+ private static final long serialVersionUID = -2785777463171443407L;
/**
* Creates an initially empty metadata.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ReferenceSystemMetadata.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -58,7 +58,7 @@ public class ReferenceSystemMetadata imp
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = 7008508657011563047L;
+ private static final long serialVersionUID = 2810145397032096087L;
/**
* The primary name by which this object is identified.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -41,7 +41,7 @@ public final class ExcludedSet<E> extend
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -3882719616419776295L;
+ private static final long serialVersionUID = -5502982329328318554L;
/**
* The name of the mutually exclusive properties.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -29,7 +29,7 @@ public class InvalidMetadataException ex
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = 3219759595538181102L;
+ private static final long serialVersionUID = 947896851753786460L;
/**
* Creates a new exception with the specified detail message.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -580,7 +580,7 @@ public abstract class ModifiableMetadata
* Used for mutable sets only.
*/
private final class MutableSet<E> extends CheckedHashSet<E> {
- private static final long serialVersionUID = 2337350768744454264L;
+ private static final long serialVersionUID = 3032602282358733056L;
public MutableSet(Class<E> type) {
super(type, 4); // Use a small capacity because we typically have few elements.
@@ -612,7 +612,7 @@ public abstract class ModifiableMetadata
* Used for mutable lists only.
*/
private final class MutableList<E> extends CheckedArrayList<E> {
- private static final long serialVersionUID = -5016778173550153002L;
+ private static final long serialVersionUID = 5800381255701183058L;
public MutableList(Class<E> type) {
super(type, 4); // Use a small capacity because we typically have few elements.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -65,7 +65,7 @@ class PropertyDescriptor<T> extends Simp
/**
* For cross-versions compatibility.
*/
- private static final long serialVersionUID = 888961503200860655L;
+ private static final long serialVersionUID = 6279709738674566891L;
/**
* The interface which contain this property.
@@ -108,7 +108,7 @@ class PropertyDescriptor<T> extends Simp
*/
static final class Bounded<T extends Number & Comparable<T>> extends PropertyDescriptor<T> {
/** For cross versions compatibility. */
- private static final long serialVersionUID = 7869130373802184834L;
+ private static final long serialVersionUID = 2066938309308576985L;
/** The range of valid values. */
private final NumberRange<T> range;
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -37,7 +37,7 @@ public class UnmodifiableMetadataExcepti
/**
* For cross-version compatibility.
*/
- private static final long serialVersionUID = -1885135341334523675L;
+ private static final long serialVersionUID = 286569086054839096L;
/**
* Creates a new exception with the specified detail message.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -50,7 +50,7 @@ public class DefaultApplicationSchemaInf
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3109191272905767382L;
+ private static final long serialVersionUID = -884081423040392985L;
/**
* Name of the application schema used.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -61,7 +61,7 @@ public class DefaultExtendedElementInfor
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -935396252908733907L;
+ private static final long serialVersionUID = 5892811836634834434L;
/**
* Name of the extended metadata element.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -41,7 +41,7 @@ public class DefaultFeatureTypeList exte
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5417914796207743856L;
+ private static final long serialVersionUID = 1172943083269243669L;
/**
* Instance of a type defined in the spatial schema.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ public class DefaultIdentifier extends I
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7459062382170865919L;
+ private static final long serialVersionUID = -23375776954553866L;
/**
* Alphanumeric value identifying an instance in the namespace.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -99,7 +99,7 @@ public class DefaultMetadata extends ISO
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7254025230235329493L;
+ private static final long serialVersionUID = 7337533776231004504L;
/**
* Unique identifier for this metadata file, or {@code null} if none.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -46,7 +46,7 @@ public class DefaultMetadataExtensionInf
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 573866936088674519L;
+ private static final long serialVersionUID = 1471486028607039929L;
/**
* Information about on-line sources containing the community profile name and
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ public class DefaultPortrayalCatalogueRe
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = -3095277682987563157L;
+ private static final long serialVersionUID = -6211960792438534868L;
/**
* Bibliographic reference to the portrayal catalogue cited.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ public class ISOMetadata extends Modifia
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5730550742604669102L;
+ private static final long serialVersionUID = -4997239501383133209L;
/**
* All identifiers associated with this metadata, or {@code null} if none.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -55,7 +55,7 @@ public class DefaultAcquisitionInformati
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 1232071263806560246L;
+ private static final long serialVersionUID = 6115581617356679324L;
/**
* Identifies the plan as implemented by the acquisition.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -45,7 +45,7 @@ public class DefaultEnvironmentalRecord
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8553651678708627947L;
+ private static final long serialVersionUID = 3634348015931833471L;
/**
* Average air temperature along the flight pass during the photo flight.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -60,7 +60,7 @@ public class DefaultEvent extends ISOMet
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -5625600499628778407L;
+ private static final long serialVersionUID = -519920133287763009L;
/**
* Initiator of the event.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -50,7 +50,7 @@ public class DefaultInstrument extends I
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6356044176200794578L;
+ private static final long serialVersionUID = -7439143424271079960L;
/**
* Complete citation of the instrument.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -59,7 +59,7 @@ public class DefaultObjective extends IS
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -4633298523976029384L;
+ private static final long serialVersionUID = 8273806197892815938L;
/**
* Priority applied to the target.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -61,7 +61,7 @@ public class DefaultOperation extends IS
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -4247450339144267883L;
+ private static final long serialVersionUID = 4828650802232651791L;
/**
* Description of the mission on which the platform observations are made and the
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -50,7 +50,7 @@ public class DefaultPlan extends ISOMeta
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8457900515677160271L;
+ private static final long serialVersionUID = -1212695055582082867L;
/**
* Manner of sampling geometry that the planner expects for collection of objective data.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -51,7 +51,7 @@ public class DefaultPlatform extends ISO
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -6870357428019309408L;
+ private static final long serialVersionUID = -1607271701134014369L;
/**
* Source where information about the platform is described.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -47,7 +47,7 @@ public class DefaultPlatformPass extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -1695097227120034432L;
+ private static final long serialVersionUID = -6447077434254133293L;
/**
* Area covered by the pass.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -45,7 +45,7 @@ public class DefaultRequestedDate extend
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8884795189934200802L;
+ private static final long serialVersionUID = 942236885315159329L;
/**
* Preferred date and time of collection,
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -59,7 +59,7 @@ public class DefaultRequirement extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7305276418007196948L;
+ private static final long serialVersionUID = -4987984804974769238L;
/**
* Identification of reference or guidance material for the requirement.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -69,23 +69,19 @@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord Environmental record}<br>
* </td></tr></table>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -48,7 +48,7 @@ public class DefaultAddress extends ISOM
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2278687294173262546L;
+ private static final long serialVersionUID = 1357443146723845129L;
/**
* State, province of the location.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -75,7 +75,7 @@ public class DefaultCitation extends ISO
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2595269795652984755L;
+ private static final long serialVersionUID = 3490090845236158848L;
/**
* The authority for International Standard Book Number.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -46,7 +46,7 @@ public class DefaultCitationDate extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2884791484254008454L;
+ private static final long serialVersionUID = 5140213754542273710L;
/**
* Reference date for the cited resource in milliseconds elapsed sine January 1st, 1970,
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -49,7 +49,7 @@ public class DefaultContact extends ISOM
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 3283637180253117382L;
+ private static final long serialVersionUID = 3844283689911660546L;
/**
* Telephone numbers at which the organization or individual may be contacted.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -50,7 +50,7 @@ public class DefaultOnlineResource exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5412370008274334799L;
+ private static final long serialVersionUID = 1413613911128890864L;
/**
* Location (address) for on-line access using a Uniform Resource Locator address or
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -49,7 +49,7 @@ public class DefaultResponsibleParty ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2477962229031486552L;
+ private static final long serialVersionUID = -3429257224445006902L;
/**
* Name of the responsible person- surname, given name, title separated by a delimiter.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -44,7 +44,7 @@ public class DefaultSeries extends ISOMe
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2784101441023323052L;
+ private static final long serialVersionUID = 7061644572814855051L;
/**
* Name of the series, or aggregate dataset, of which the dataset is a part.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -42,7 +42,7 @@ public class DefaultTelephone extends IS
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 4920157673337669241L;
+ private static final long serialVersionUID = -1920621361930970869L;
/**
* Telephone numbers by which individuals can speak to the responsible organization or individual.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -64,23 +64,19 @@
* except at XML marshalling time (for ISO 19139 compliance).
* See {@link org.apache.sis.xml.IdentifierMap} for more information.
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -49,7 +49,7 @@ public class DefaultConstraints extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 1771854790746022204L;
+ private static final long serialVersionUID = -5622398793237824161L;
/**
* Limitation affecting the fitness for use of the resource.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -27,6 +27,9 @@ import org.opengis.metadata.constraint.L
/**
* Restrictions and legal prerequisites for accessing and using the resource.
+ * The {@linkplain #getOtherConstraints() other constraint} element shall be non-empty only if
+ * {@linkplain #getAccessConstraints() access constraints} and/or {@linkplain #getUseConstraints()
+ * use constraints} elements have a value of {@link Restriction#OTHER_RESTRICTIONS}.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
@@ -45,7 +48,7 @@ public class DefaultLegalConstraints ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2891061818279024901L;
+ private static final long serialVersionUID = -228007779747439839L;
/**
* Access constraints applied to assure the protection of privacy or intellectual property,
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -45,7 +45,7 @@ public class DefaultSecurityConstraints
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6412833018607679734L;;
+ private static final long serialVersionUID = 621767670847345848L;;
/**
* Name of the handling restrictions on the resource.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -43,23 +43,19 @@
* {@code └─} {@linkplain org.opengis.metadata.constraints.Classification Classification} «code list»<br>
* </td></tr></table>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -45,7 +45,7 @@ public class AbstractContentInformation
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -1609535650982322560L;
+ private static final long serialVersionUID = -3237461458526348999L;
/**
* Constructs an initially empty content information.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -69,7 +69,7 @@ public class DefaultBand extends Default
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3543010637264725421L;
+ private static final long serialVersionUID = 6969884732125615287L;
/**
* Longest wavelength that the sensor is capable of collecting within a designated band.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -55,7 +55,7 @@ public class DefaultCoverageDescription
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5943716957630930520L;
+ private static final long serialVersionUID = -3314118785767660332L;
/**
* Description of the attribute described by the measurement value.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -53,7 +53,7 @@ public class DefaultFeatureCatalogueDesc
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 1984922846251567908L;
+ private static final long serialVersionUID = -3626075463499626813L;
/**
* Mask for the {@code compliant} {@link Boolean} value.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -59,7 +59,7 @@ public class DefaultImageDescription ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -6168624828802439062L;
+ private static final long serialVersionUID = 1756867502303578674L;
/**
* Mask for the {@code triangulationIndicator} {@link Boolean} value.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1466475&r1=1466474&r2=1466475&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Wed Apr 10 13:15:08 2013
@@ -47,7 +47,7 @@ public class DefaultRangeDimension exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 4365956866782010460L;
+ private static final long serialVersionUID = -8624244894762434804L;
/**
* Number that uniquely identifies instances of bands of wavelengths on which a sensor operates.