sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1606123 - in /sis/branches/JDK6: ./ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/c...
Date Fri, 27 Jun 2014 15:22:58 GMT
Author: desruisseaux
Date: Fri Jun 27 15:22:57 2014
New Revision: 1606123

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

Added:
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
      - copied unchanged from r1606122, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
    sis/branches/JDK6/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK8:r1606014-1606119
  Merged /sis/branches/JDK7:r1606016-1606122

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRoot
 import javax.xml.bind.annotation.XmlType;
 import org.opengis.metadata.citation.Party;
 import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.citation.ResponsibleParty;
 import org.opengis.metadata.citation.Role;
 import org.opengis.metadata.extent.Extent;
 import org.apache.sis.metadata.iso.ISOMetadata;
@@ -118,6 +119,10 @@ public class DefaultResponsibility exten
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultResponsibility castOrCopy(final Responsibility object) {
+        if (object instanceof ResponsibleParty) {
+            return DefaultResponsibleParty.castOrCopy((ResponsibleParty) object);
+        }
+        //-- Intentionally tested after the sub-interfaces.
         if (object == null || object instanceof DefaultResponsibility) {
             return (DefaultResponsibility) object;
         }

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -82,7 +82,6 @@ public class DefaultConstraints extends 
 
     /**
      * Citation for the limitation of constraint.
-     * Example: "copyright statement, license agreement, etc."
      */
     private Collection<Citation> references;
 
@@ -124,11 +123,11 @@ public class DefaultConstraints extends 
         super(object);
         if (object != null) {
             useLimitations              = copyCollection(object.getUseLimitations(), InternationalString.class);
-///         constraintApplicationScopes = copyCollection(object.getConstraintApplicationScope(), Scope.class);
-///         graphics                    = copyCollection(object.getGraphic(), BrowseGraphic.class);
-///         references                  = copyCollection(object.getReference(), Citation.class);
-///         releasability               = object.getReleasability();
-///         responsibleParties          = copyCollection(object.getResponsibleParty(), Responsibility.class);
+            constraintApplicationScopes = copyCollection(object.getConstraintApplicationScopes(), Scope.class);
+            graphics                    = copyCollection(object.getGraphics(), BrowseGraphic.class);
+            references                  = copyCollection(object.getReferences(), Citation.class);
+            releasability               = object.getReleasability();
+            responsibleParties          = copyCollection(object.getResponsibleParties(), Responsibility.class);
         }
     }
 
@@ -199,7 +198,7 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "constraintApplicationScope")
     public Collection<Scope> getConstraintApplicationScopes() {
         return constraintApplicationScopes = nonNullCollection(constraintApplicationScopes, Scope.class);
@@ -223,7 +222,7 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "graphic")
     public Collection<BrowseGraphic> getGraphics() {
         return graphics = nonNullCollection(graphics, BrowseGraphic.class);
@@ -236,7 +235,7 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-    public void setGraphic(final Collection<? extends BrowseGraphic> newValues) {
+    public void setGraphics(final Collection<? extends BrowseGraphic> newValues) {
         graphics = writeCollection(newValues, graphics, BrowseGraphic.class);
     }
 
@@ -248,9 +247,9 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "reference")
-    public Collection<Citation> getReference() {
+    public Collection<Citation> getReferences() {
         return references = nonNullCollection(references, Citation.class);
     }
 
@@ -261,18 +260,18 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-    public void setReference(Collection<? extends Citation> newValues) {
+    public void setReferences(Collection<? extends Citation> newValues) {
         references = writeCollection(newValues, references, Citation.class);
     }
 
     /**
-     * Returns information concerning the parties to whom the resource can or cannot be released, or {@code null} if none.
+     * Returns information concerning the parties to whom the resource can or cannot be released.
      *
      * @return Information concerning the parties to whom the resource, or {@code null} if none.
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "releasability")
     public Releasability getReleasability() {
         return releasability;
@@ -297,7 +296,7 @@ public class DefaultConstraints extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "responsibleParty")
     public Collection<Responsibility> getResponsibleParties() {
         return responsibleParties = nonNullCollection(responsibleParties, Responsibility.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -33,23 +33,15 @@ import org.apache.sis.measure.ValueRange
 /**
  * Range of wavelengths in the electromagnetic spectrum.
  *
- * {@section SIS extension}
- * The {@link Band} interface defined by ISO 19115-2 is specific to measurements in
- * electromagnetic spectrum. For the needs of Image I/O, an additional interface -
- * {@link org.apache.sis.image.io.metadata.SampleDimension} - has been defined with
- * a subset of the {@code Band} API but without the restriction to wavelengths.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @since   0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.5
  * @module
  */
 @XmlType(name = "MD_Band_Type", propOrder = {
-    "maxValue",
-    "minValue",
-    "units",
     "peakResponse",
     "bitsPerValue",
     "toneGradation",
@@ -63,28 +55,26 @@ import org.apache.sis.measure.ValueRange
 })
 @XmlRootElement(name = "MD_Band")
 @XmlSeeAlso(org.apache.sis.internal.jaxb.gmi.MI_Band.class)
-public class DefaultBand extends DefaultRangeDimension implements Band {
+public class DefaultBand extends DefaultSampleDimension implements Band {
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 6969884732125615287L;
+    private static final long serialVersionUID = -2474871120376144737L;
 
     /**
-     * Longest wavelength that the sensor is capable of collecting within a designated band.
+     * Shortest wavelength that the sensor is capable of collecting within a designated band.
      */
-    private Double maxValue;
+    private Double boundMin;
 
     /**
-     * Shortest wavelength that the sensor is capable of collecting within a designated band.
+     * Longest wavelength that the sensor is capable of collecting within a designated band.
      */
-    private Double minValue;
+    private Double boundMax;
 
     /**
-     * Units in which sensor wavelengths are expressed. Should be non-null if
-     * {@linkplain #getMinValue() min value} or {@linkplain #getMaxValue() max value}
-     * are provided.
+     * Units in which sensor wavelengths are expressed.
      */
-    private Unit<Length> units;
+    private Unit<Length> boundUnit;
 
     /**
      * Wavelength at which the response is the highest.
@@ -92,27 +82,11 @@ public class DefaultBand extends Default
     private Double peakResponse;
 
     /**
-     * Maximum number of significant bits in the uncompressed representation for the value
-     * in each band of each pixel.
-     */
-    private Integer bitsPerValue;
-
-    /**
      * Number of discrete numerical values in the grid data.
      */
     private Integer toneGradation;
 
     /**
-     * Scale factor which has been applied to the cell value.
-     */
-    private Double scaleFactor;
-
-    /**
-     * The physical value corresponding to a cell value of zero.
-     */
-    private Double offset;
-
-    /**
      * Designation of criterion for defining maximum and minimum wavelengths for a spectral band.
      */
     private BandDefinition bandBoundaryDefinition;
@@ -156,14 +130,11 @@ public class DefaultBand extends Default
     public DefaultBand(final Band object) {
         super(object);
         if (object != null) {
-            maxValue                 = object.getMaxValue();
-            minValue                 = object.getMinValue();
-            units                    = object.getUnits();
+            boundMin                 = object.getBoundMin();
+            boundMax                 = object.getBoundMax();
+            boundUnit                = object.getBoundUnit();
             peakResponse             = object.getPeakResponse();
-            bitsPerValue             = object.getBitsPerValue();
             toneGradation            = object.getToneGradation();
-            scaleFactor              = object.getScaleFactor();
-            offset                   = object.getOffset();
             bandBoundaryDefinition   = object.getBandBoundaryDefinition();
             nominalSpatialResolution = object.getNominalSpatialResolution();
             transferFunctionType     = object.getTransferFunctionType();
@@ -203,69 +174,79 @@ public class DefaultBand extends Default
      *
      * @return Longest wavelength that the sensor is capable of collecting within a designated band,
      *         or {@code null} if unspecified.
+     *
+     * @since 0.5
      */
     @Override
-    @XmlElement(name = "maxValue")
-    public Double getMaxValue() {
-        return maxValue;
+    @ValueRange(minimum=0)
+/// @XmlElement(name = "boundMax")
+    public Double getBoundMax() {
+        return boundMax;
     }
 
     /**
      * Sets the longest wavelength that the sensor is capable of collecting within a designated band.
      *
      * @param newValue The new longest wavelength.
+     *
+     * @since 0.5
      */
-    public void setMaxValue(final Double newValue) {
+    public void setBoundMax(final Double newValue) {
         checkWritePermission();
-        maxValue = newValue;
+        boundMax = newValue;
     }
 
     /**
      * Returns the shortest wavelength that the sensor is capable of collecting within a designated band.
-     * The units of measurement is given by {@link #getUnits()}.
+     * The units of measurement is given by {@link #getBoundUnit()}.
      *
      * @return Shortest wavelength that the sensor is capable of collecting within a designated band,
      *         or {@code null} if unspecified.
+     *
+     * @since 0.5
      */
     @Override
-    @XmlElement(name = "minValue")
-    public Double getMinValue() {
-        return minValue;
+    @ValueRange(minimum=0)
+/// @XmlElement(name = "boundMin")
+    public Double getBoundMin() {
+        return boundMin;
     }
 
     /**
      * Sets the shortest wavelength that the sensor is capable of collecting within a designated band.
      *
      * @param newValue The new shortest wavelength.
+     *
+     * @since 0.5
      */
-    public void setMinValue(final Double newValue) {
+    public void setBoundMin(final Double newValue) {
         checkWritePermission();
-        minValue = newValue;
+        boundMin = newValue;
     }
 
     /**
-     * Returns the units in which sensor wavelengths are expressed. Shall be non-null
-     * if {@linkplain #getMinValue() min value} or {@linkplain #getMaxValue() max value}
-     * are provided.
+     * Returns units in which sensor wavelengths are expressed.
+     *
+     * @return Units in which sensor wavelengths are expressed.
      *
-     * @return Units in which sensor wavelengths are expressed, or {@code null}.
+     * @since 0.5
      */
     @Override
-    @XmlElement(name = "units")
-    public Unit<Length> getUnits() {
-        return units;
+/// @XmlElement(name = "boundUnit")
+    public Unit<Length> getBoundUnit() {
+        return boundUnit;
     }
 
     /**
-     * Sets the units in which sensor wavelengths are expressed. Shall be non-null if
-     * {@linkplain #getMinValue() min value} or {@linkplain #getMaxValue() max value}
-     * are provided.
+     * Set a new units in which sensor wavelengths are expressed.
      *
-     * @param newValue The new units.
+     * @param newValue the new unit.
+     *
+     * @since 0.5
      */
-    public void setUnits(final Unit<Length> newValue) {
+    public void setBoundUnit(final Unit<Length> newValue) {
         checkWritePermission();
-        units = newValue;
+        boundUnit = newValue;
     }
 
     /**
@@ -275,6 +256,7 @@ public class DefaultBand extends Default
      * @return Wavelength at which the response is the highest, or {@code null} if unspecified.
      */
     @Override
+    @ValueRange(minimum=0)
     @XmlElement(name = "peakResponse")
     public Double getPeakResponse() {
         return peakResponse;
@@ -291,33 +273,27 @@ public class DefaultBand extends Default
     }
 
     /**
-     * Returns the maximum number of significant bits in the uncompressed
-     * representation for the value in each band of each pixel.
-     *
-     * @return Maximum number of significant bits in the uncompressed representation, or {@code null}.
+     * {@inheritDoc}
      */
     @Override
     @ValueRange(minimum=1)
     @XmlElement(name = "bitsPerValue")
     public Integer getBitsPerValue() {
-        return bitsPerValue;
+        return super.getBitsPerValue();
     }
 
     /**
-     * Sets the maximum number of significant bits in the uncompressed representation
-     * for the value in each band of each pixel.
-     *
-     * @param newValue The new number of bits per value.
+     * {@inheritDoc}
      */
+    @Override
     public void setBitsPerValue(final Integer newValue) {
-        checkWritePermission();
-        bitsPerValue = newValue;
+        super.setBitsPerValue(newValue);
     }
 
     /**
      * Returns the number of discrete numerical values in the grid data.
      *
-     * @return Number of discrete numerical values in the grid data, or {@code null}.
+     * @return Number of discrete numerical values in the grid data, or {@code null} if none.
      */
     @Override
     @ValueRange(minimum=0)
@@ -337,45 +313,37 @@ public class DefaultBand extends Default
     }
 
     /**
-     * Returns the scale factor which has been applied to the cell value.
-     *
-     * @return Scale factor which has been applied to the cell value, or {@code null}.
+     * {@inheritDoc}
      */
     @Override
     @XmlElement(name = "scaleFactor")
     public Double getScaleFactor() {
-        return scaleFactor;
+        return super.getScaleFactor();
     }
 
     /**
-     * Sets the scale factor which has been applied to the cell value.
-     *
-     * @param newValue The new scale factor.
+     * {@inheritDoc}
      */
+    @Override
     public void setScaleFactor(final Double newValue) {
-        checkWritePermission();
-        scaleFactor = newValue;
+        super.setScaleFactor(newValue);
     }
 
     /**
-     * Returns the physical value corresponding to a cell value of zero.
-     *
-     * @return The physical value corresponding to a cell value of zero, or {@code null}.
+     * {@inheritDoc}
      */
     @Override
     @XmlElement(name = "offset")
     public Double getOffset() {
-        return offset;
+        return super.getOffset();
     }
 
     /**
-     * Sets the physical value corresponding to a cell value of zero.
-     *
-     * @param newValue The new offset.
+     * {@inheritDoc}
      */
+    @Override
     public void setOffset(final Double newValue) {
-        checkWritePermission();
-        offset = newValue;
+        super.setOffset(newValue);
     }
 
     /**
@@ -445,7 +413,7 @@ public class DefaultBand extends Default
     }
 
     /**
-     * Polarization of the radiation transmitted.
+     * Returns the polarization of the radiation transmitted.
      *
      * @return Polarization of the radiation transmitted, or {@code null}.
      */
@@ -466,7 +434,7 @@ public class DefaultBand extends Default
     }
 
     /**
-     * Polarization of the radiation detected.
+     * Returns polarization of the radiation detected.
      *
      * @return Polarization of the radiation detected, or {@code null}.
      */

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlRoot
 import org.opengis.util.MemberName;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
-import org.opengis.metadata.content.Band;
 import org.opengis.metadata.content.RangeDimension;
+import org.opengis.metadata.content.SampleDimension;
 import org.apache.sis.metadata.iso.ISOMetadata;
 
 
@@ -88,8 +88,8 @@ public class DefaultRangeDimension exten
         super(object);
         if (object != null) {
             sequenceIdentifier = object.getSequenceIdentifier();
-            description        = object.getDescriptor();
-///         names              = copyCollection(object.getNames(), Identifier.class);
+            description        = object.getDescription();
+            names              = copyCollection(object.getNames(), Identifier.class);
         }
     }
 
@@ -99,7 +99,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 an instance of {@link Band}, then this method
+     *   <li>Otherwise if the given object is an instance of {@link SampleDimension}, 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>
@@ -114,8 +114,8 @@ public class DefaultRangeDimension exten
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultRangeDimension castOrCopy(final RangeDimension object) {
-        if (object instanceof Band) {
-            return DefaultBand.castOrCopy((Band) object);
+        if (object instanceof SampleDimension) {
+            return DefaultSampleDimension.castOrCopy((SampleDimension) object);
         }
         // Intentionally tested after the sub-interfaces.
         if (object == null || object instanceof DefaultRangeDimension) {
@@ -152,7 +152,7 @@ public class DefaultRangeDimension exten
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "description")
     public InternationalString getDescription() {
         return description;
@@ -206,7 +206,7 @@ public class DefaultRangeDimension exten
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "name")
     public Collection<Identifier> getNames() {
         return names = nonNullCollection(names, Identifier.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -109,8 +109,8 @@ public class DefaultBrowseGraphic extend
             fileName         = object.getFileName();
             fileDescription  = object.getFileDescription();
             fileType         = object.getFileType();
-///         imageConstraints = object.getImageConstraints();
-///         linkage          = object.getLinkage();
+            imageConstraints = object.getImageConstraints();
+            linkages         = object.getLinkages();
         }
     }
 
@@ -211,7 +211,7 @@ public class DefaultBrowseGraphic extend
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "imageConstraints")
     public Collection<Constraints> getImageConstraints() {
         return imageConstraints = nonNullCollection(imageConstraints, Constraints.class);
@@ -235,7 +235,7 @@ public class DefaultBrowseGraphic extend
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "linkage")
     public Collection<OnlineResource> getLinkages() {
         return linkages = nonNullCollection(linkages, OnlineResource.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElem
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.citation.Citation;
-import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.identification.Usage;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.util.iso.Types;
@@ -33,7 +33,7 @@ import static org.apache.sis.internal.me
 
 
 /**
- * Brief description of ways in which the resource(s) is/are currently used.
+ * Brief description of ways in which the resource(s) is/are currently or has been used.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)
@@ -78,7 +78,7 @@ public class DefaultUsage extends ISOMet
      * Identification of and means of communicating with person(s) and organization(s)
      * using the resource(s).
      */
-    private Collection<ResponsibleParty> userContactInfo;
+    private Collection<Responsibility> userContactInfo;
 
     /**
      * Responses to the user-determined limitations.
@@ -109,10 +109,10 @@ public class DefaultUsage extends ISOMet
      * @param userContactInfo Means of communicating with person(s) and organization(s), or {@code null} if none.
      */
     public DefaultUsage(final CharSequence specificUsage,
-                        final ResponsibleParty userContactInfo)
+                        final Responsibility userContactInfo)
     {
         this.specificUsage   = Types.toInternationalString(specificUsage);
-        this.userContactInfo = singleton(userContactInfo, ResponsibleParty.class);
+        this.userContactInfo = singleton(userContactInfo, Responsibility.class);
     }
 
     /**
@@ -130,10 +130,10 @@ public class DefaultUsage extends ISOMet
             specificUsage             = object.getSpecificUsage();
             usageDate                 = toMilliseconds(object.getUsageDate());
             userDeterminedLimitations = object.getUserDeterminedLimitations();
-            userContactInfo           = copyCollection(object.getUserContactInfo(), ResponsibleParty.class);
-///         responses                 = copyCollection(object.getResponse(), InternationalString.class);
-///         additionalDocumentation   = copyCollection(object.getAdditionalDocumentation(), Citation.class);
-///         identifiedIssues          = copyCollection(object.getIdentifiedIssues(), Citation.class);
+            userContactInfo           = copyCollection(object.getUserContactInfo(), Responsibility.class);
+            responses                 = copyCollection(object.getResponses(), InternationalString.class);
+            additionalDocumentation   = copyCollection(object.getAdditionalDocumentation(), Citation.class);
+            identifiedIssues          = copyCollection(object.getIdentifiedIssues(), Citation.class);
         }
     }
 
@@ -184,8 +184,7 @@ public class DefaultUsage extends ISOMet
     }
 
     /**
-     * Returns the date and time of the first use or range of uses
-     * of the resource and/or resource series.
+     * Returns the date and time of the first use or range of uses of the resource and/or resource series.
      *
      * @return Date of the first use of the resource, or {@code null}.
      */
@@ -233,8 +232,8 @@ public class DefaultUsage extends ISOMet
      */
     @Override
     @XmlElement(name = "userContactInfo", required = true)
-    public Collection<ResponsibleParty> getUserContactInfo() {
-        return userContactInfo = nonNullCollection(userContactInfo, ResponsibleParty.class);
+    public Collection<Responsibility> getUserContactInfo() {
+        return userContactInfo = nonNullCollection(userContactInfo, Responsibility.class);
     }
 
     /**
@@ -242,8 +241,8 @@ public class DefaultUsage extends ISOMet
      *
      * @param newValues The new user contact info.
      */
-    public void setUserContactInfo(final Collection<? extends ResponsibleParty> newValues) {
-        userContactInfo = writeCollection(newValues, userContactInfo, ResponsibleParty.class);
+    public void setUserContactInfo(final Collection<? extends Responsibility> newValues) {
+        userContactInfo = writeCollection(newValues, userContactInfo, Responsibility.class);
     }
 
     /**
@@ -253,9 +252,9 @@ public class DefaultUsage extends ISOMet
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "response")
-    public Collection<? extends InternationalString> getResponse() {
+    public Collection<? extends InternationalString> getResponses() {
         return responses = nonNullCollection(responses, InternationalString.class);
     }
 
@@ -266,7 +265,7 @@ public class DefaultUsage extends ISOMet
      *
      * @since 0.5
      */
-    public void setResponse(final Collection<? extends InternationalString> newValues) {
+    public void setResponses(final Collection<? extends InternationalString> newValues) {
         responses = writeCollection(newValues, responses, InternationalString.class);
     }
 
@@ -277,7 +276,7 @@ public class DefaultUsage extends ISOMet
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "additionalDocumentation")
     public Collection<Citation> getAdditionalDocumentation() {
         return additionalDocumentation = nonNullCollection(additionalDocumentation, Citation.class);
@@ -302,7 +301,7 @@ public class DefaultUsage extends ISOMet
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "identifiedIssues")
     public Collection<? extends Citation> getIdentifiedIssues() {
         return identifiedIssues = nonNullCollection(identifiedIssues, Citation.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -98,6 +98,7 @@
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
     @XmlJavaTypeAdapter(CI_Citation.class),
+    @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
     @XmlJavaTypeAdapter(DS_AssociationTypeCode.class),
     @XmlJavaTypeAdapter(DS_InitiativeTypeCode.class),

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -107,8 +107,8 @@ public class DefaultLineage extends ISOM
         super(object);
         if (object != null) {
             statement               = object.getStatement();
-///         scopes                  = copyCollection(object.getScopes(), Scope.class);
-///         additionalDocumentation = copyCollection(object.getAdditionalDocumentation(), Citation.class);
+            scopes                  = copyCollection(object.getScopes(), Scope.class);
+            additionalDocumentation = copyCollection(object.getAdditionalDocumentation(), Citation.class);
             processSteps            = copyCollection(object.getProcessSteps(), ProcessStep.class);
             sources                 = copyCollection(object.getSources(), Source.class);
         }
@@ -169,7 +169,7 @@ public class DefaultLineage extends ISOM
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "scope")
     public Collection<Scope> getScopes() {
         return scopes = nonNullCollection(scopes, Scope.class);
@@ -194,7 +194,7 @@ public class DefaultLineage extends ISOM
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "additionalDocumentation")
     public Collection<Citation> getAdditionalDocumentation() {
         return additionalDocumentation = nonNullCollection(additionalDocumentation, Citation.class);

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElem
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.citation.Citation;
-import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.quality.Scope;
 import org.opengis.metadata.lineage.Source;
 import org.opengis.metadata.lineage.Processing;
@@ -66,7 +66,7 @@ public class DefaultProcessStep extends 
     /**
      * Serial number for inter-operability with different versions.
      */
-//    private static final long serialVersionUID = -3511714360929580873L;
+    private static final long serialVersionUID = -535020568951006598L;
 
     /**
      * Description of the event, including related parameters or tolerances.
@@ -89,7 +89,7 @@ public class DefaultProcessStep extends 
      * Identification of, and means of communication with, person(s) and
      * organization(s) associated with the process step.
      */
-    private Collection<ResponsibleParty> processors;
+    private Collection<Responsibility> processors;
 
     /**
      * Process step documentation.
@@ -153,10 +153,10 @@ public class DefaultProcessStep extends 
             description           = object.getDescription();
             rationale             = object.getRationale();
             date                  = toMilliseconds(object.getDate());
-            processors            = copyCollection(object.getProcessors(), ResponsibleParty.class);
-///         references            = copyCollection(object.getReferences(), Citation.class);
+            processors            = copyCollection(object.getProcessors(), Responsibility.class);
+            references            = copyCollection(object.getReferences(), Citation.class);
             sources               = copyCollection(object.getSources(), Source.class);
-///         scope                 = object.getScope();
+            scope                 = object.getScope();
             outputs               = copyCollection(object.getOutputs(), Source.class);
             processingInformation = object.getProcessingInformation();
             reports               = copyCollection(object.getReports(), ProcessStepReport.class);
@@ -259,8 +259,8 @@ public class DefaultProcessStep extends 
      */
     @Override
     @XmlElement(name = "processor")
-    public Collection<ResponsibleParty> getProcessors() {
-        return processors = nonNullCollection(processors, ResponsibleParty.class);
+    public Collection<Responsibility> getProcessors() {
+        return processors = nonNullCollection(processors, Responsibility.class);
     }
 
     /**
@@ -269,8 +269,8 @@ public class DefaultProcessStep extends 
      *
      * @param newValues The new processors.
      */
-    public void setProcessors(final Collection<? extends ResponsibleParty> newValues) {
-        processors = writeCollection(newValues, processors, ResponsibleParty.class);
+    public void setProcessors(final Collection<? extends Responsibility> newValues) {
+        processors = writeCollection(newValues, processors, Responsibility.class);
     }
 
     /**
@@ -280,7 +280,7 @@ public class DefaultProcessStep extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "reference")
     public Collection<Citation> getReferences() {
         return references = nonNullCollection(references, Citation.class);
@@ -304,7 +304,7 @@ public class DefaultProcessStep extends 
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "scope")
     public Scope getScope() {
         return scope;

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -144,15 +144,12 @@ public class DefaultSource extends ISOMe
     public DefaultSource(final Source object) {
         super(object);
         if (object != null) {
-            setScaleDenominator(object.getScaleDenominator());
-            setSourceExtents   (object.getSourceExtents());
-
             description             = object.getDescription();
-///         sourceSpatialResolution = object.getSourceSpatialResolution();
+            sourceSpatialResolution = object.getSourceSpatialResolution();
             sourceReferenceSystem   = object.getSourceReferenceSystem();
             sourceCitation          = object.getSourceCitation();
-///         sourceMetadata          = copyCollection(object.getSourceMetadata(), Citation.class);
-///         scope                   = object.getScope();
+            sourceMetadata          = copyCollection(object.getSourceMetadata(), Citation.class);
+            scope                   = object.getScope();
             sourceSteps             = copyCollection(object.getSourceSteps(), ProcessStep.class);
             processedLevel          = object.getProcessedLevel();
             resolution              = object.getResolution();
@@ -212,7 +209,7 @@ public class DefaultSource extends ISOMe
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "sourceSpatialResolution")
     public Resolution getSourceSpatialResolution() {
         return sourceSpatialResolution;
@@ -318,7 +315,7 @@ public class DefaultSource extends ISOMe
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "sourceMetadata")
     public Collection<Citation> getSourceMetadata() {
         return sourceMetadata = nonNullCollection(sourceMetadata, Citation.class);
@@ -344,7 +341,7 @@ public class DefaultSource extends ISOMe
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "scope")
     public Scope getScope() {
         return scope;

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -78,7 +78,7 @@
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
     @XmlJavaTypeAdapter(CI_Citation.class),
-    @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
+    @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(EX_Extent.class),
     @XmlJavaTypeAdapter(LE_Algorithm.class),
     @XmlJavaTypeAdapter(LE_NominalResolution.class),

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElem
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.metadata.citation.DateType;
 import org.opengis.metadata.citation.CitationDate;
-import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.maintenance.MaintenanceFrequency;
 import org.opengis.metadata.maintenance.MaintenanceInformation;
 import org.opengis.metadata.maintenance.ScopeCode;
@@ -95,7 +95,7 @@ public class DefaultMaintenanceInformati
      * Identification of, and means of communicating with, person(s) and organization(s)
      * with responsibility for maintaining the resource.
      */
-    private Collection<ResponsibleParty> contacts;
+    private Collection<Responsibility> contacts;
 
     /**
      * Creates a an initially empty maintenance information.
@@ -125,17 +125,12 @@ public class DefaultMaintenanceInformati
     public DefaultMaintenanceInformation(final MaintenanceInformation object) {
         super(object);
         if (object != null) {
-            setDateOfNextUpdate        (object.getDateOfNextUpdate());
-            setDateOfNextUpdate        (object.getDateOfNextUpdate());
-            setUpdateScopes            (object.getUpdateScopes());
-            setUpdateScopeDescriptions (object.getUpdateScopeDescriptions());
-
             maintenanceAndUpdateFrequency   = object.getMaintenanceAndUpdateFrequency();
-///         maintenanceDates                = copyCollection(object.getMaintenanceDate(), CitationDate.class);
+            maintenanceDates                = copyCollection(object.getMaintenanceDates(), CitationDate.class);
             userDefinedMaintenanceFrequency = object.getUserDefinedMaintenanceFrequency();
-///         maintenanceScope                = copyCollection(object.getMaintenanceScope(), Scope.class);
+            maintenanceScopes               = copyCollection(object.getMaintenanceScopes(), Scope.class);
             maintenanceNotes                = copyCollection(object.getMaintenanceNotes(), InternationalString.class);
-            contacts                        = copyCollection(object.getContacts(), ResponsibleParty.class);
+            contacts                        = copyCollection(object.getContacts(), Responsibility.class);
         }
     }
 
@@ -190,11 +185,11 @@ public class DefaultMaintenanceInformati
     /**
      * Return the date information associated with maintenance of resource.
      *
-     * @return date information associated with maintenance of resource.
+     * @return Date information associated with maintenance of resource.
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "maintenanceDate", required = true)
     public Collection<CitationDate> getMaintenanceDates() {
         return maintenanceDates = nonNullCollection(maintenanceDates, CitationDate.class);
@@ -285,7 +280,7 @@ public class DefaultMaintenanceInformati
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "maintenanceScope")
     public Collection<Scope> getMaintenanceScopes() {
         return maintenanceScopes = nonNullCollection(maintenanceScopes, Scope.class);
@@ -434,8 +429,8 @@ public class DefaultMaintenanceInformati
      */
     @Override
     @XmlElement(name = "contact")
-    public Collection<ResponsibleParty> getContacts() {
-        return contacts = nonNullCollection(contacts, ResponsibleParty.class);
+    public Collection<Responsibility> getContacts() {
+        return contacts = nonNullCollection(contacts, Responsibility.class);
     }
 
     /**
@@ -445,7 +440,7 @@ public class DefaultMaintenanceInformati
      * @param newValues The new identification of person(s) and organization(s)
      *                  with responsibility for maintaining the resource.
      */
-    public void setContacts(final Collection<? extends ResponsibleParty> newValues) {
-        contacts = writeCollection(newValues, contacts, ResponsibleParty.class);
+    public void setContacts(final Collection<? extends Responsibility> newValues) {
+        contacts = writeCollection(newValues, contacts, Responsibility.class);
     }
 }

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -71,7 +71,7 @@
 })
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlJavaTypeAdapters({
-    @XmlJavaTypeAdapter(CI_ResponsibleParty.class),
+    @XmlJavaTypeAdapter(CI_Responsibility.class),
     @XmlJavaTypeAdapter(MD_MaintenanceFrequencyCode.class),
     @XmlJavaTypeAdapter(MD_MaintenanceInformation.class),
     @XmlJavaTypeAdapter(MD_ScopeCode.class),

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -112,8 +112,8 @@ public class DefaultDimension extends IS
             dimensionName        = object.getDimensionName();
             dimensionSize        = object.getDimensionSize();
             resolution           = object.getResolution();
-///         dimensionTitle       = object.getDimensionTitle();
-///         dimensionDescription = object.getDimensionDescription();
+            dimensionTitle       = object.getDimensionTitle();
+            dimensionDescription = object.getDimensionDescription();
         }
     }
 
@@ -218,7 +218,7 @@ public class DefaultDimension extends IS
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "dimensionTitle")
     public InternationalString getDimensionTitle() {
         return dimensionTitle;
@@ -243,7 +243,7 @@ public class DefaultDimension extends IS
      *
      * @since 0.5
      */
-/// @Override
+    @Override
 /// @XmlElement(name = "dimensionDescription")
     public InternationalString getDimensionDescription() {
         return dimensionDescription;

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -128,7 +128,7 @@ public abstract strictfp class MetadataT
             return new Date(random.nextInt() * 1000L);
         }
         if (CodeList.class.isAssignableFrom(type)) try {
-            final CodeList[] codes = (CodeList[]) type.getMethod("values", (Class[]) null).invoke(null, (Object[]) null);
+            final CodeList<?>[] codes = (CodeList<?>[]) type.getMethod("values", (Class[]) null).invoke(null, (Object[]) null);
             return codes[random.nextInt(codes.length)];
         } catch (Exception e) { // (ReflectiveOperationException) on JDK7 branch.
             fail(e.toString());
@@ -253,6 +253,9 @@ public abstract strictfp class MetadataT
              * Try to write a value.
              */
             final boolean isWritable = isWritable(accessor.implementation, property);
+            if (isWritable != accessor.isWritable(i)) {
+                System.out.println(accessor);
+            }
             assertEquals("isWritable", isWritable, accessor.isWritable(i));
             if (isWritable) {
                 final Object newValue = valueFor(property, elementType);

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -112,6 +112,7 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.content.PolarizationOrientation.class,
             org.opengis.metadata.content.RangeDimension.class,
             org.opengis.metadata.content.RangeElementDescription.class,
+            org.opengis.metadata.content.SampleDimension.class,
             org.opengis.metadata.content.TransferFunctionType.class,
             org.opengis.metadata.distribution.DataFile.class,
             org.opengis.metadata.distribution.DigitalTransferOptions.class,

Modified: sis/branches/JDK6/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java?rev=1606123&r1=1606122&r2=1606123&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java [UTF-8] Fri Jun 27 15:22:57 2014
@@ -149,7 +149,7 @@ public final strictfp class MetadataRead
             "  │   └─Attribute group\n" +
             "  │       └─Group attribute\n" +
             "  │           ├─Sequence identifier……………………………… SST\n" +
-            "  │           └─Descriptor……………………………………………………… Sea temperature\n" +
+            "  │           └─Description…………………………………………………… Sea temperature\n" +
             "  └─Data quality info\n" +
             "      └─Lineage\n" +
             "          └─Statement…………………………………………………………………… 2003-04-07 12:12:50 - created by gribtocdl" +



Mime
View raw message