sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1605897 - in /sis/branches/JDK7: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citati...
Date Thu, 26 Jun 2014 20:01:35 GMT
Author: desruisseaux
Date: Thu Jun 26 20:01:34 2014
New Revision: 1605897

URL: http://svn.apache.org/r1605897
Log:
Merge from the JDK8 branch.

Added:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
      - copied unchanged from r1605895, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
      - copied, changed from r1605895, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java
      - copied unchanged from r1605895, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java
Removed:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java
Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK8:r1605797-1605895

Copied: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java (from r1605895, sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java?p2=sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java&r1=1605895&r2=1605897&rev=1605897&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -169,7 +169,7 @@ public abstract class LegacyPropertyAdap
      * @return The given value as a collection.
      */
     public static <L> Collection<L> asCollection(final L value) {
-        return (value != null) ? Collections.singleton(value) : Collections.emptySet();
+        return (value != null) ? Collections.singleton(value) : Collections.<L>emptySet();
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -37,8 +37,8 @@ import org.apache.sis.util.iso.Types;
  * @module
  */
 @XmlType(name = "AbstractCI_Party_Type", propOrder = {
-/// "name",
-/// "contactInfo"
+    "name",
+    "contactInfo"
 })
 @XmlRootElement(name = "CI_Party")
 public class AbstractParty extends ISOMetadata implements Party {
@@ -122,7 +122,7 @@ public class AbstractParty extends ISOMe
      * @return Name of the party.
      */
     @Override
-/// @XmlElement(name = "name")
+    @XmlElement(name = "name")
     public InternationalString getName() {
         return name;
     }
@@ -143,7 +143,7 @@ public class AbstractParty extends ISOMe
      * @return Contact information for the party.
      */
     @Override
-/// @XmlElement(name = "contactInfo")
+    @XmlElement(name = "contactInfo")
     public Collection<Contact> getContactInfo() {
         return contactInfo = nonNullCollection(contactInfo, Contact.class);
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -38,8 +38,8 @@ import org.apache.sis.metadata.iso.ISOMe
  */
 @XmlType(name = "CI_Responsibility_Type", propOrder = {
 /// "role",
-/// "extent",
-/// "party"
+/// "extents",
+/// "parties"
 })
 @XmlRootElement(name = "CI_Responsibility")
 public class DefaultResponsibility extends ISOMetadata implements Responsibility {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -99,11 +99,14 @@
     @XmlJavaTypeAdapter(CI_DateTypeCode.class),
     @XmlJavaTypeAdapter(CI_OnLineFunctionCode.class),
     @XmlJavaTypeAdapter(CI_OnlineResource.class),
+    @XmlJavaTypeAdapter(CI_Party.class),
     @XmlJavaTypeAdapter(CI_PresentationFormCode.class),
+    @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
     @XmlJavaTypeAdapter(CI_RoleCode.class),
     @XmlJavaTypeAdapter(CI_Series.class),
     @XmlJavaTypeAdapter(CI_Telephone.class),
+    @XmlJavaTypeAdapter(EX_Extent.class),
     @XmlJavaTypeAdapter(MD_Identifier.class),
 
     // Java types, primitive types and basic OGC types handling

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -138,7 +138,7 @@ public class DefaultConstraints extends 
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link LegalConstraints} or
+     *   <li>Otherwise if the given object is an instance of {@link LegalConstraints} or
      *       {@link SecurityConstraints}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -72,7 +72,7 @@ public class AbstractContentInformation 
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link FeatureCatalogueDescription}
+     *   <li>Otherwise if the given object is an instance of {@link FeatureCatalogueDescription}
      *       or {@link CoverageDescription}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -37,8 +37,8 @@ import org.apache.sis.metadata.iso.ISOMe
  * @module
  */
 @XmlType(name = "MD_AttributeGroup_Type", propOrder = {
-/// "contentType",
-/// "groupAttribute"
+    "contentType",
+    "groupAttribute"
 })
 @XmlRootElement(name = "MD_AttributeGroup")
 public class DefaultAttributeGroup extends ISOMetadata implements AttributeGroup {
@@ -111,7 +111,7 @@ public class DefaultAttributeGroup exten
      * @return The types of information represented by the value(s).
      */
     @Override
-/// @XmlElement(name = "contentType", required = true)
+    @XmlElement(name = "contentType", required = true)
     public Collection<CoverageContentType> getContentTypes() {
         return contentTypes = nonNullCollection(contentTypes, CoverageContentType.class);
     }
@@ -131,7 +131,7 @@ public class DefaultAttributeGroup exten
      * @return The content types for attributes groups for a {@code RangeDimension}, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "groupAttribute")
+    @XmlElement(name = "groupAttribute")
     public Collection<RangeDimension> getGroupAttributes() {
         return groupAttributes = nonNullCollection(groupAttributes, RangeDimension.class);
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -31,7 +31,7 @@ import org.opengis.metadata.content.Rang
 import org.opengis.util.RecordType;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.util.resources.Messages;
-import org.apache.sis.internal.metadata.LegacyProperties;
+import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
 import org.apache.sis.internal.metadata.MetadataUtilities;
 
 
@@ -113,7 +113,7 @@ public class DefaultCoverageDescription 
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link ImageDescription}, then this
+     *   <li>Otherwise if the given object is an instance of {@link ImageDescription}, then this
      *       method delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.</li>
      *   <li>Otherwise if the given object is already an instance of
      *       {@code DefaultCoverageDescription}, then it is returned unchanged.</li>
@@ -210,6 +210,7 @@ public class DefaultCoverageDescription 
 
     /**
      * Returns the type of information represented by the cell value.
+     * The default implementation fetches the value from the {@linkplain #getAttributeGroups() attribute groups}.
      *
      * @return Type of information represented by the cell value, or {@code null}.
      *
@@ -241,6 +242,7 @@ public class DefaultCoverageDescription 
 
     /**
      * Sets the type of information represented by the cell value.
+     * The default implementation stores the value in the {@linkplain #getAttributeGroups() attribute groups}.
      *
      * @param newValue The new content type.
      *
@@ -249,7 +251,7 @@ public class DefaultCoverageDescription 
     @Deprecated
     public void setContentType(final CoverageContentType newValue) {
         checkWritePermission();
-        final Collection<CoverageContentType> newValues = LegacyProperties.asCollection(newValue);
+        final Collection<CoverageContentType> newValues = LegacyPropertyAdapter.asCollection(newValue);
         final Collection<AttributeGroup> groups = getAttributeGroups();
         for (final AttributeGroup group : groups) {
             if (group instanceof DefaultAttributeGroup) {
@@ -264,6 +266,7 @@ public class DefaultCoverageDescription 
 
     /**
      * Returns the information on the dimensions of the cell measurement value.
+     * The default implementation fetches the values from the {@linkplain #getAttributeGroups() attribute groups}.
      *
      * @return Dimensions of the cell measurement value.
      *
@@ -273,7 +276,7 @@ public class DefaultCoverageDescription 
     @Deprecated
     @XmlElement(name = "dimension")
     public final Collection<RangeDimension> getDimensions() {
-        return new LegacyProperties<RangeDimension,AttributeGroup>(getAttributeGroups()) {
+        return new LegacyPropertyAdapter<RangeDimension,AttributeGroup>(getAttributeGroups()) {
             /** Stores a legacy value into the new kind of value. */
             @Override protected AttributeGroup wrap(final RangeDimension value) {
                 final DefaultAttributeGroup container = new DefaultAttributeGroup();
@@ -300,6 +303,7 @@ public class DefaultCoverageDescription 
 
     /**
      * Sets the information on the dimensions of the cell measurement value.
+     * The default implementation stores the values in the {@linkplain #getAttributeGroups() attribute groups}.
      *
      * @param newValues The new dimensions.
      *
@@ -308,7 +312,7 @@ public class DefaultCoverageDescription 
     @Deprecated
     public void setDimensions(final Collection<? extends RangeDimension> newValues) {
         checkWritePermission();
-        ((LegacyProperties<RangeDimension,?>) getDimensions()).setValues(newValues);
+        ((LegacyPropertyAdapter<RangeDimension,?>) getDimensions()).setValues(newValues);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -36,8 +36,8 @@ import org.apache.sis.util.ArgumentCheck
  * @module
  */
 @XmlType(name = "MD_FeatureTypeInfo", propOrder = {
-/// "featureTypeName",
-/// "featureInstanceCount"
+    "featureTypeName",
+    "featureInstanceCount"
 })
 @XmlRootElement(name = "MD_FeatureTypeInfo")
 public class DefaultFeatureTypeInfo extends ISOMetadata implements FeatureTypeInfo {
@@ -124,7 +124,7 @@ public class DefaultFeatureTypeInfo exte
      * @return Name of the feature type.
      */
     @Override
-/// @XmlElement(name = "featureTypeName", required = true)
+    @XmlElement(name = "featureTypeName", required = true)
     public GenericName getFeatureTypeName() {
         return featureTypeName;
     }
@@ -146,7 +146,7 @@ public class DefaultFeatureTypeInfo exte
      */
     @Override
     @ValueRange(minimum = 1)
-/// @XmlElement(name = "featureInstanceCount")
+    @XmlElement(name = "featureInstanceCount")
     public Integer getFeatureInstanceCount() {
         return featureInstanceCount;
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -88,7 +88,7 @@ public class DefaultRangeDimension exten
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link Band}, then this method
+     *   <li>Otherwise if the given object is an instance of {@link Band}, then this method
      *       delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.</li>
      *   <li>Otherwise if the given object is already an instance of
      *       {@code DefaultRangeDimension}, then it is returned unchanged.</li>

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -97,7 +97,7 @@ public class AbstractGeographicExtent ex
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link BoundingPolygon},
+     *   <li>Otherwise if the given object is an instance of {@link BoundingPolygon},
      *       {@link GeographicBoundingBox} or {@link GeographicDescription}, then this method
      *       delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.
      *       Note that if the given object implements more than one of the above-cited interfaces,

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -93,7 +93,7 @@ public class DefaultTemporalExtent exten
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link SpatialTemporalExtent},
+     *   <li>Otherwise if the given object is an instance of {@link SpatialTemporalExtent},
      *       then this method delegates to the {@code castOrCopy(…)} method of the corresponding
      *       SIS subclass.</li>
      *   <li>Otherwise if the given object is already an instance of

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -183,7 +183,7 @@ public class AbstractIdentification exte
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link DataIdentification} or
+     *   <li>Otherwise if the given object is an instance of {@link DataIdentification} or
      *       {@link ServiceIdentification}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -36,10 +36,10 @@ import org.apache.sis.metadata.iso.ISOMe
  * @module
  */
 @XmlType(name = "MD_AssociatedResource_Type", propOrder = {
-/// "name",
-/// "associationType",
-/// "initiativeType",
-/// "metadataReference"
+    "name",
+    "associationType",
+    "initiativeType",
+    "metadataReference"
 })
 @XmlRootElement(name = "MD_AssociatedResource")
 public class DefaultAssociatedResource extends ISOMetadata implements AssociatedResource {
@@ -134,7 +134,7 @@ public class DefaultAssociatedResource e
      * @return Citation information about the associated resource, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "name")
+    @XmlElement(name = "name")
     public Citation getName() {
         return name;
     }
@@ -155,7 +155,7 @@ public class DefaultAssociatedResource e
      * @return Type of relation between the resources.
      */
     @Override
-/// @XmlElement(name = "associationType", required = true)
+    @XmlElement(name = "associationType", required = true)
     public AssociationType getAssociationType() {
         return associationType;
     }
@@ -176,7 +176,7 @@ public class DefaultAssociatedResource e
      * @return The type of initiative under which the associated resource was produced, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "initiativeType")
+    @XmlElement(name = "initiativeType")
     public InitiativeType getInitiativeType() {
         return initiativeType;
     }
@@ -197,7 +197,7 @@ public class DefaultAssociatedResource e
      * @return Reference to the metadata of the associated resource, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "metadataReference")
+    @XmlElement(name = "metadataReference")
     public Citation getMetadataReference() {
         return metadataReference;
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -34,7 +34,7 @@ import org.opengis.util.InternationalStr
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.metadata.iso.quality.DefaultScope;
 import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
-import org.apache.sis.internal.metadata.LegacyProperties;
+import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
 
 
 /**
@@ -213,6 +213,7 @@ public class DefaultMaintenanceInformati
 
     /**
      * Returns the scheduled revision date for resource.
+     * The default implementation fetches the value from the {@linkplain #getMaintenanceDates() maintenance dates}.
      *
      * @return Scheduled revision date, or {@code null}.
      *
@@ -236,6 +237,7 @@ public class DefaultMaintenanceInformati
 
     /**
      * Sets the scheduled revision date for resource.
+     * The default implementation stores the value in the {@linkplain #getMaintenanceDates() maintenance dates}.
      *
      * @param newValue The new date of next update.
      */
@@ -302,6 +304,7 @@ public class DefaultMaintenanceInformati
 
     /**
      * Returns the scope of data to which maintenance is applied.
+     * The default implementation fetches the values from the {@linkplain #getMaintenanceScopes() maintenance scopes}.
      *
      * @return Scope of data to which maintenance is applied.
      *
@@ -313,7 +316,7 @@ public class DefaultMaintenanceInformati
     @Deprecated
     @XmlElement(name = "updateScope")
     public final Collection<ScopeCode> getUpdateScopes() {
-        return new LegacyProperties<ScopeCode,Scope>(getMaintenanceScopes()) {
+        return new LegacyPropertyAdapter<ScopeCode,Scope>(getMaintenanceScopes()) {
             /** Stores a legacy value into the new kind of value. */
             @Override protected Scope wrap(final ScopeCode value) {
                 return new DefaultScope(value);
@@ -337,6 +340,7 @@ public class DefaultMaintenanceInformati
 
     /**
      * Sets the scope of data to which maintenance is applied.
+     * The default implementation stores the values in the {@linkplain #getMaintenanceScopes() maintenance scopes}.
      *
      * @param newValues The new update scopes.
      *
@@ -345,11 +349,12 @@ public class DefaultMaintenanceInformati
     @Deprecated
     public void setUpdateScopes(final Collection<? extends ScopeCode> newValues) {
         checkWritePermission();
-        ((LegacyProperties<ScopeCode,?>) getUpdateScopes()).setValues(newValues);
+        ((LegacyPropertyAdapter<ScopeCode,?>) getUpdateScopes()).setValues(newValues);
     }
 
     /**
      * Returns additional information about the range or extent of the resource.
+     * The default implementation fetches the values from the {@linkplain #getMaintenanceScopes() maintenance scopes}.
      *
      * @return Additional information about the range or extent of the resource.
      *
@@ -361,7 +366,7 @@ public class DefaultMaintenanceInformati
     @Deprecated
     @XmlElement(name = "updateScopeDescription")
     public final Collection<ScopeDescription> getUpdateScopeDescriptions() {
-        return new LegacyProperties<ScopeDescription,Scope>(getMaintenanceScopes()) {
+        return new LegacyPropertyAdapter<ScopeDescription,Scope>(getMaintenanceScopes()) {
             /** Stores a legacy value into the new kind of value. */
             @Override protected Scope wrap(final ScopeDescription value) {
                 final DefaultScope container = new DefaultScope();
@@ -388,6 +393,7 @@ public class DefaultMaintenanceInformati
 
     /**
      * Sets additional information about the range or extent of the resource.
+     * The default implementation stores the values in the {@linkplain #getMaintenanceScopes() maintenance scopes}.
      *
      * @param newValues The new update scope descriptions.
      *
@@ -396,7 +402,7 @@ public class DefaultMaintenanceInformati
     @Deprecated
     public void setUpdateScopeDescriptions(final Collection<? extends ScopeDescription> newValues) {
         checkWritePermission();
-        ((LegacyProperties<ScopeDescription,?>) getUpdateScopeDescriptions()).setValues(newValues);
+        ((LegacyPropertyAdapter<ScopeDescription,?>) getUpdateScopeDescriptions()).setValues(newValues);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -70,7 +70,7 @@ public class AbstractCompleteness extend
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link CompletenessCommission} or
+     *   <li>Otherwise if the given object is an instance of {@link CompletenessCommission} or
      *       {@link CompletenessOmission}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -329,7 +329,7 @@ public class AbstractElement extends ISO
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link PositionalAccuracy},
+     *   <li>Otherwise if the given object is an instance of {@link PositionalAccuracy},
      *       {@link TemporalAccuracy}, {@link ThematicAccuracy}, {@link LogicalConsistency},
      *       {@link Completeness} or {@link Usability}, then this method delegates to the
      *       {@code castOrCopy(…)} method of the corresponding SIS subclass.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -75,7 +75,7 @@ public class AbstractLogicalConsistency 
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link ConceptualConsistency},
+     *   <li>Otherwise if the given object is an instance of {@link ConceptualConsistency},
      *       {@link DomainConsistency}, {@link FormatConsistency} or {@link TopologicalConsistency},
      *       then this method delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.
      *       Note that if the given object implements more than one of the above-cited interfaces,

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -83,7 +83,7 @@ public class AbstractPositionalAccuracy 
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link RelativeInternalPositionalAccuracy},
+     *   <li>Otherwise if the given object is an instance of {@link RelativeInternalPositionalAccuracy},
      *       {@link AbsoluteExternalPositionalAccuracy} or {@link GriddedDataPositionalAccuracy}, then this
      *       method delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.
      *       Note that if the given object implements more than one of the above-cited interfaces,

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -73,7 +73,7 @@ public class AbstractResult extends ISOM
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link ConformanceResult},
+     *   <li>Otherwise if the given object is an instance of {@link ConformanceResult},
      *       {@link QuantitativeResult}or {@link CoverageResult}, then this method delegates to
      *       the {@code castOrCopy(…)} method of the corresponding SIS subclass.
      *       Note that if the given object implements more than one of the above-cited interfaces,

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -72,7 +72,7 @@ public class AbstractTemporalAccuracy ex
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link AccuracyOfATimeMeasurement},
+     *   <li>Otherwise if the given object is an instance of {@link AccuracyOfATimeMeasurement},
      *       {@link TemporalConsistency} or {@link TemporalValidity}, then this method delegates to
      *       the {@code castOrCopy(…)} method of the corresponding SIS subclass.
      *       Note that if the given object implements more than one of the above-cited interfaces,

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -73,7 +73,7 @@ public class AbstractThematicAccuracy ex
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link QuantitativeAttributeAccuracy},
+     *   <li>Otherwise if the given object is an instance of {@link QuantitativeAttributeAccuracy},
      *       {@link NonQuantitativeAttributeAccuracy} or {@link ThematicClassificationCorrectness},
      *       then this method delegates to the {@code castOrCopy(…)} method of the corresponding
      *       SIS subclass. Note that if the given object implements more than one of the above-cited

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -79,7 +79,7 @@ public class AbstractGeolocationInformat
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link GCPCollection}, then this method
+     *   <li>Otherwise if the given object is an instance of {@link GCPCollection}, then this method
      *       delegates to the {@code castOrCopy(…)} method of the corresponding SIS subclass.</li>
      *   <li>Otherwise if the given object is already an instance of
      *       {@code AbstractGeolocationInformation}, then it is returned unchanged.</li>

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -72,7 +72,7 @@ public class AbstractSpatialRepresentati
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link VectorSpatialRepresentation} or
+     *   <li>Otherwise if the given object is an instance of {@link VectorSpatialRepresentation} or
      *       {@link GridSpatialRepresentation}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -126,7 +126,7 @@ public class DefaultGridSpatialRepresent
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of {@link Georectified} or
+     *   <li>Otherwise if the given object is an instance of {@link Georectified} or
      *       {@link Georeferenceable}, then this method delegates to the {@code castOrCopy(…)}
      *       method of the corresponding SIS subclass. Note that if the given object implements
      *       more than one of the above-cited interfaces, then the {@code castOrCopy(…)} method

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -155,6 +155,7 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.lineage.Source.class,
             org.opengis.metadata.maintenance.MaintenanceFrequency.class,
             org.opengis.metadata.maintenance.MaintenanceInformation.class,
+            org.opengis.metadata.maintenance.MetadataScope.class,
             org.opengis.metadata.maintenance.ScopeCode.class,
 //          org.opengis.metadata.maintenance.ScopeDescription.class,  // Excluded because this is an union.
             org.opengis.metadata.quality.AbsoluteExternalPositionalAccuracy.class,

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -379,7 +379,7 @@ public class AbstractIdentifiedObject ex
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of
+     *   <li>Otherwise if the given object is an instance of
      *       {@link org.opengis.referencing.cs.CoordinateReferenceSystem},
      *       {@link org.opengis.referencing.cs.CoordinateSystem},
      *       {@link org.opengis.referencing.cs.CoordinateSystemAxis},

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -195,7 +195,7 @@ public class AbstractCRS extends Abstrac
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of
+     *   <li>Otherwise if the given object is an instance of
      *       {@link org.opengis.referencing.crs.GeodeticCRS} (including the
      *       {@link org.opengis.referencing.crs.GeographicCRS} and
      *       {@link org.opengis.referencing.crs.GeocentricCRS} subtypes),

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -238,7 +238,7 @@ public class AbstractCS extends Abstract
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of
+     *   <li>Otherwise if the given object is an instance of
      *       {@link org.opengis.referencing.cs.AffineCS},
      *       {@link org.opengis.referencing.cs.CartesianCS},
      *       {@link org.opengis.referencing.cs.SphericalCS},

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -224,7 +224,7 @@ public class AbstractDatum extends Abstr
      *
      * <ul>
      *   <li>If the given object is {@code null}, then this method returns {@code null}.</li>
-     *   <li>Otherwise if the given object is is an instance of
+     *   <li>Otherwise if the given object is an instance of
      *       {@link org.opengis.referencing.datum.GeodeticDatum},
      *       {@link org.opengis.referencing.datum.VerticalDatum},
      *       {@link org.opengis.referencing.datum.TemporalDatum},

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1605897&r1=1605896&r2=1605897&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Thu Jun 26 20:01:34 2014
@@ -94,7 +94,7 @@ import static org.apache.sis.util.Number
  * {@link #newRange(Comparable, Comparable)} method. Subclasses can override that method if they
  * need to customize the range objects to be created.
  *
- * <p>While it is possible to create {@code RangeSet<Date>} instances, is is more efficient to
+ * <p>While it is possible to create {@code RangeSet<Date>} instances, is more efficient to
  * use {@code RangeSet<Long>} with millisecond values because {@code RangeSet} will internally
  * use {@code long[]} arrays in the later case.</p>
  *



Mime
View raw message