sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1501150 [1/3] - in /sis/branches/JDK6: ./ application/ application/sis-console/ application/sis-webapp/ core/sis-build-helper/ core/sis-build-helper/src/site/apt/ core/sis-metadata/ core/sis-metadata/src/main/java/org/apache/sis/internal/j...
Date Tue, 09 Jul 2013 09:14:57 GMT
Author: desruisseaux
Date: Tue Jul  9 09:14:55 2013
New Revision: 1501150

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

Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/application/pom.xml
    sis/branches/JDK6/application/sis-console/pom.xml
    sis/branches/JDK6/application/sis-webapp/pom.xml
    sis/branches/JDK6/core/sis-build-helper/pom.xml
    sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt
    sis/branches/JDK6/core/sis-metadata/pom.xml
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.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/content/DefaultRangeElementDescription.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.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/DefaultDataIdentification.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.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/lineage/DefaultAlgorithm.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/DefaultNominalResolution.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/DefaultProcessStepReport.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.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/maintenance/DefaultMaintenanceInformation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.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/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
    sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
    sis/branches/JDK6/core/sis-referencing/pom.xml
    sis/branches/JDK6/core/sis-utility/pom.xml
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
    sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
    sis/branches/JDK6/pom.xml
    sis/branches/JDK6/src/site/apt/download.apt
    sis/branches/JDK6/storage/pom.xml

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1499817-1501148

Modified: sis/branches/JDK6/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/pom.xml?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/application/pom.xml (original)
+++ sis/branches/JDK6/application/pom.xml Tue Jul  9 09:14:55 2013
@@ -70,7 +70,7 @@
 
       <!-- Collect JAR files in <root>/target/binaries directory. -->
       <plugin>
-        <groupId>org.apache.sis</groupId>
+        <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
         <version>${sis.plugin.version}</version>
         <executions>
@@ -97,7 +97,7 @@
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>org.apache.sis</groupId>
+      <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-utility</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: sis/branches/JDK6/application/sis-console/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/pom.xml?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-console/pom.xml (original)
+++ sis/branches/JDK6/application/sis-console/pom.xml Tue Jul  9 09:14:55 2013
@@ -35,6 +35,7 @@
   <!-- ===========================================================
            Module Description
        =========================================================== -->
+  <groupId>org.apache.sis.application</groupId>
   <artifactId>sis-console</artifactId>
   <packaging>bundle</packaging>
   <name>Apache SIS console</name>

Modified: sis/branches/JDK6/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-webapp/pom.xml?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK6/application/sis-webapp/pom.xml Tue Jul  9 09:14:55 2013
@@ -31,6 +31,7 @@
     <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.apache.sis.application</groupId>
   <artifactId>sis-webapp</artifactId>
   <packaging>war</packaging>
   <name>Apache SIS web services layer</name>

Modified: sis/branches/JDK6/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/pom.xml?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/pom.xml Tue Jul  9 09:14:55 2013
@@ -35,6 +35,7 @@
   <!-- ===========================================================
            Module Description
        =========================================================== -->
+  <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-build-helper</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Apache SIS build helper</name>

Modified: sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Tue Jul  9 09:14:55 2013
@@ -91,7 +91,7 @@ Building Apache SIS
 <build>
   <plugins>
     <plugin>
-      <groupId>org.apache.sis</groupId>
+      <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-build-helper</artifactId>
       <version>${sis.plugin.version}</version>
       <executions>
@@ -137,7 +137,7 @@ Building Apache SIS
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.sis</groupId>
+        <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
         <version>${sis.plugin.version}</version>
         <executions>

Modified: sis/branches/JDK6/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/pom.xml?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK6/core/sis-metadata/pom.xml Tue Jul  9 09:14:55 2013
@@ -35,6 +35,7 @@
   <!-- ===========================================================
            Module Description
        =========================================================== -->
+  <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-metadata</artifactId>
   <packaging>bundle</packaging>
   <name>Apache SIS metadata</name>
@@ -110,7 +111,7 @@ Implementations of metadata derived from
 
       <!-- Collect JAR files in <root>/target/binaries directory. -->
       <plugin>
-        <groupId>org.apache.sis</groupId>
+        <groupId>org.apache.sis.core</groupId>
         <artifactId>sis-build-helper</artifactId>
         <version>${sis.plugin.version}</version>
         <executions>
@@ -141,7 +142,7 @@ Implementations of metadata derived from
        =========================================================== -->
   <dependencies>
     <dependency>
-      <groupId>org.apache.sis</groupId>
+      <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-utility</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -156,7 +157,7 @@ Implementations of metadata derived from
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>org.apache.sis</groupId>
+      <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-utility</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -116,12 +116,12 @@ public class SC_VerticalCRS extends Prop
      */
     @XmlAnyElement(lax = true)
     public Object getElement() {
-        final LogRecord record = new LogRecord(Level.WARNING, Errors.format(
-                Errors.Keys.MissingRequiredModule_1, "sis-referencing"));
+        final LogRecord record = Errors.getResources(null).getLogRecord(Level.WARNING,
+                Errors.Keys.MissingRequiredModule_1, "sis-referencing");
         record.setSourceClassName(SC_VerticalCRS.class.getName());
         record.setSourceMethodName("getElement");
         final Context context = Context.current();
-        context.warningOccured(context, metadata, record);
+        Context.warningOccured(context, metadata, record);
         return null;
     }
 

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -158,6 +158,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Name of the application schema used.
+     *
+     * @return Name of the application schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "name", required = true)
@@ -177,6 +179,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Identification of the schema language used.
+     *
+     * @return The schema language used, or {@code null}.
      */
     @Override
     @XmlElement(name = "schemaLanguage", required = true)
@@ -196,6 +200,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Formal language used in Application Schema.
+     *
+     * @return Formal language used in Application Schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "constraintLanguage", required = true)
@@ -215,6 +221,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Full application schema given as an ASCII file.
+     *
+     * @return Application schema as an ASCII file, or {@code null}.
      */
     @Override
     @XmlElement(name = "schemaAscii")
@@ -234,6 +242,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Full application schema given as a graphics file.
+     *
+     * @return Application schema as a graphics file, or {@code null}.
      */
     @Override
     @XmlElement(name = "graphicsFile")
@@ -253,6 +263,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Full application schema given as a software development file.
+     *
+     * @return Application schema as a software development file, or {@code null}.
      */
     @Override
     @XmlElement(name = "softwareDevelopmentFile")
@@ -272,6 +284,8 @@ public class DefaultApplicationSchemaInf
 
     /**
      * Software dependent format used for the application schema software dependent file.
+     *
+     * @return Format used for the application schema software file, or {@code null}.
      */
     @Override
     @XmlElement(name = "softwareDevelopmentFileFormat")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -230,6 +230,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Name of the extended metadata element.
+     *
+     * @return Name of the extended metadata element, or {@code null}.
      */
     @Override
     @XmlElement(name = "name", required = true)
@@ -249,6 +251,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Short form suitable for use in an implementation method such as XML or SGML.
+     *
+     * @return Short form suitable for use in an implementation method such as XML or SGML, or {@code null}.
      */
     @Override
     @XmlElement(name = "shortName")
@@ -270,6 +274,8 @@ public class DefaultExtendedElementInfor
      * Three digit code assigned to the extended element.
      * Returns a non-null value only if the {@linkplain #getDataType() data type}
      * is {@linkplain Datatype#CODE_LIST_ELEMENT code list element}.
+     *
+     * @return Three digit code assigned to the extended element, or {@code null}.
      */
     @Override
     @XmlElement(name = "domainCode")
@@ -289,6 +295,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Definition of the extended element.
+     *
+     * @return Definition of the extended element, or {@code null}.
      */
     @Override
     @XmlElement(name = "definition", required = true)
@@ -308,6 +316,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Obligation of the extended element.
+     *
+     * @return Obligation of the extended element, or {@code null}.
      */
     @Override
     @XmlElement(name = "obligation")
@@ -329,6 +339,8 @@ public class DefaultExtendedElementInfor
      * Condition under which the extended element is mandatory.
      * Returns a non-null value only if the {@linkplain #getObligation() obligation}
      * is {@linkplain Obligation#CONDITIONAL conditional}.
+     *
+     * @return The condition under which the extended element is mandatory, or {@code null}.
      */
     @Override
     @XmlElement(name = "condition")
@@ -348,6 +360,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Code which identifies the kind of value provided in the extended element.
+     *
+     * @return The kind of value provided in the extended element, or {@code null}.
      */
     @Override
     @XmlElement(name = "dataType", required = true)
@@ -371,6 +385,8 @@ public class DefaultExtendedElementInfor
      * {@linkplain #getDataType() data type} is {@linkplain Datatype#ENUMERATION enumeration},
      * {@linkplain Datatype#CODE_LIST code list} or {@linkplain Datatype#CODE_LIST_ELEMENT
      * code list element}.
+     *
+     * @return Maximum occurrence of the extended element, or {@code null}.
      */
     @Override
     @ValueRange(minimum=0)
@@ -395,6 +411,8 @@ public class DefaultExtendedElementInfor
      * {@linkplain #getDataType() data type} is {@linkplain Datatype#ENUMERATION enumeration},
      * {@linkplain Datatype#CODE_LIST code list} or {@linkplain Datatype#CODE_LIST_ELEMENT
      * code list element}.
+     *
+     * @return Valid values that can be assigned to the extended element, or {@code null}.
      */
     @Override
     @XmlElement(name = "domainValue")
@@ -415,6 +433,8 @@ public class DefaultExtendedElementInfor
     /**
      * Name of the metadata entity(s) under which this extended metadata element may appear.
      * The name(s) may be standard metadata element(s) or other extended metadata element(s).
+     *
+     * @return Name of the metadata entity(s) under which this extended metadata element may appear.
      */
     @Override
     @XmlElement(name = "parentEntity", required = true)
@@ -433,6 +453,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Specifies how the extended element relates to other existing elements and entities.
+     *
+     * @return How the extended element relates to other existing elements and entities, or {@code null}.
      */
     @Override
     @XmlElement(name = "rule", required = true)
@@ -452,6 +474,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Reason for creating the extended element.
+     *
+     * @return Reason for creating the extended element.
      */
     @Override
     @XmlElement(name = "rationale")
@@ -470,6 +494,8 @@ public class DefaultExtendedElementInfor
 
     /**
      * Name of the person or organization creating the extended element.
+     *
+     * @return Name of the person or organization creating the extended element.
      */
     @Override
     @XmlElement(name = "source", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -114,6 +114,8 @@ public class DefaultFeatureTypeList exte
 
     /**
      * Instance of a type defined in the spatial schema.
+     *
+     * @return Instance of a type defined in the spatial schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "spatialObject", required = true)
@@ -133,6 +135,8 @@ public class DefaultFeatureTypeList exte
 
     /**
      * Name of the spatial schema used.
+     *
+     * @return Name of the spatial schema used, or {@code null}.
      */
     @Override
     @XmlElement(name = "spatialSchemaName", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -138,6 +138,8 @@ public class DefaultIdentifier extends I
 
     /**
      * Alphanumeric value identifying an instance in the namespace.
+     *
+     * @return Value identifying an instance in the namespace, or {@code null}.
      */
     @Override
     @XmlElement(name = "code", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -313,6 +313,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the unique identifier for this metadata file, or {@code null} if none.
+     *
+     * @return Unique identifier for this metadata file, or {@code null}.
      */
     @Override
     @XmlElement(name = "fileIdentifier")
@@ -334,6 +336,8 @@ public class DefaultMetadata extends ISO
      * Returns the language used for documenting metadata. This {@code DefaultMetadata} object and
      * its children will use that locale for marshalling {@link org.opengis.util.InternationalString}
      * and {@link org.opengis.util.CodeList} instances in ISO 19139 compliant XML documents.
+     *
+     * @return Language used for documenting metadata, or {@code null}.
      */
     @Override
     @XmlElement(name = "language")
@@ -358,8 +362,9 @@ public class DefaultMetadata extends ISO
     }
 
     /**
-     * Provides information about an alternatively used localized character
-     * string for a linguistic extension.
+     * Provides information about an alternatively used localized character string for a linguistic extension.
+     *
+     * @return Alternatively used localized character string for a linguistic extension.
      */
     @Override
     @XmlElement(name = "locale")
@@ -369,8 +374,7 @@ public class DefaultMetadata extends ISO
     }
 
     /**
-     * Sets information about an alternatively used localized character
-     * string for a linguistic extension.
+     * Sets information about an alternatively used localized character string for a linguistic extension.
      *
      * @param newValues The new locales.
      */
@@ -380,6 +384,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the full name of the character coding standard used for the metadata set.
+     *
+     * @return character coding standard used for the metadata, or {@code null}.
      */
     @Override
     @XmlElement(name = "characterSet")
@@ -399,6 +405,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the file identifier of the metadata to which this metadata is a subset (child).
+     *
+     * @return Identifier of the metadata to which this metadata is a subset, or {@code null}.
      */
     @Override
     @XmlElement(name = "parentIdentifier")
@@ -418,6 +426,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the scope to which the metadata applies.
+     *
+     * @return Scope to which the metadata applies.
      */
     @Override
     @XmlElement(name = "hierarchyLevel")
@@ -436,6 +446,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the name of the hierarchy levels for which the metadata is provided.
+     *
+     * @return Hierarchy levels for which the metadata is provided.
      */
     @Override
     @XmlElement(name = "hierarchyLevelName")
@@ -454,6 +466,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the parties responsible for the metadata information.
+     *
+     * @return Parties responsible for the metadata information.
      */
     @Override
     @XmlElement(name = "contact", required = true)
@@ -473,6 +487,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the date that the metadata was created.
+     *
+     * @return Date that the metadata was created, or {@code null}.
      */
     @Override
     @XmlElement(name = "dateStamp", required = true)
@@ -492,6 +508,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the name of the metadata standard (including profile name) used.
+     *
+     * @return Name of the metadata standard used, or {@code null}.
      */
     @Override
     @XmlElement(name = "metadataStandardName")
@@ -511,6 +529,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the version (profile) of the metadata standard used.
+     *
+     * @return Version of the metadata standard used, or {@code null}.
      */
     @Override
     @XmlElement(name = "metadataStandardVersion")
@@ -530,6 +550,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides the URI of the dataset to which the metadata applies.
+     *
+     * @return Uniformed Resource Identifier of the dataset, or {@code null}.
      */
     @Override
     @XmlElement(name = "dataSetURI")
@@ -549,6 +571,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the digital representation of spatial information in the dataset.
+     *
+     * @return Digital representation of spatial information in the dataset.
      */
     @Override
     @XmlElement(name = "spatialRepresentationInfo")
@@ -567,6 +591,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns the description of the spatial and temporal reference systems used in the dataset.
+     *
+     * @return Spatial and temporal reference systems used in the dataset.
      */
     @Override
     @XmlElement(name = "referenceSystemInfo")
@@ -585,6 +611,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns information describing metadata extensions.
+     *
+     * @return Metadata extensions.
      */
     @Override
     @XmlElement(name = "metadataExtensionInfo")
@@ -603,6 +631,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Returns basic information about the resource(s) to which the metadata applies.
+     *
+     * @return The resource(s) to which the metadata applies.
      */
     @Override
     @XmlElement(name = "identificationInfo", required = true)
@@ -622,6 +652,8 @@ public class DefaultMetadata extends ISO
     /**
      * Provides information about the feature catalogue and describes the coverage and
      * image data characteristics.
+     *
+     * @return The feature catalogue, coverage descriptions and image data characteristics.
      */
     @Override
     @XmlElement(name = "contentInfo")
@@ -641,6 +673,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides information about the distributor of and options for obtaining the resource(s).
+     *
+     * @return The distributor of and options for obtaining the resource(s), or {@code null}.
      */
     @Override
     @XmlElement(name = "distributionInfo")
@@ -660,6 +694,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides overall assessment of quality of a resource(s).
+     *
+     * @return Overall assessment of quality of a resource(s).
      */
     @Override
     @XmlElement(name = "dataQualityInfo")
@@ -677,8 +713,9 @@ public class DefaultMetadata extends ISO
     }
 
     /**
-     * Provides information about the catalogue of rules defined for the portrayal of a
-     * resource(s).
+     * Provides information about the catalogue of rules defined for the portrayal of a resource(s).
+     *
+     * @return The catalogue of rules defined for the portrayal of a resource(s).
      */
     @Override
     @XmlElement(name = "portrayalCatalogueInfo")
@@ -691,14 +728,14 @@ public class DefaultMetadata extends ISO
      *
      * @param newValues The new portrayal catalog info.
      */
-    public void setPortrayalCatalogueInfo(
-            final Collection<? extends PortrayalCatalogueReference> newValues)
-    {
+    public void setPortrayalCatalogueInfo(final Collection<? extends PortrayalCatalogueReference> newValues) {
         portrayalCatalogueInfo = writeCollection(newValues, portrayalCatalogueInfo, PortrayalCatalogueReference.class);
     }
 
     /**
      * Provides restrictions on the access and use of data.
+     *
+     * @return Restrictions on the access and use of data.
      */
     @Override
     @XmlElement(name = "metadataConstraints")
@@ -717,6 +754,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides information about the conceptual schema of a dataset.
+     *
+     * @return The conceptual schema of a dataset.
      */
     @Override
     @XmlElement(name = "applicationSchemaInfo")
@@ -735,6 +774,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides information about the frequency of metadata updates, and the scope of those updates.
+     *
+     * @return The frequency of metadata updates and their scope, or {@code null}.
      */
     @Override
     @XmlElement(name = "metadataMaintenance")
@@ -754,6 +795,8 @@ public class DefaultMetadata extends ISO
 
     /**
      * Provides information about the acquisition of the data.
+     *
+     * @return The acquisition of data.
      */
     @Override
     @XmlElement(name = "acquisitionInformation", namespace = Namespaces.GMI)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -111,6 +111,8 @@ public class DefaultMetadataExtensionInf
     /**
      * Information about on-line sources containing the community profile name and
      * the extended metadata elements. Information for all new metadata elements.
+     *
+     * @return Online sources to community profile name and extended metadata elements, or {@code null}.
      */
     @Override
     @XmlElement(name = "extensionOnLineResource")
@@ -131,6 +133,8 @@ public class DefaultMetadataExtensionInf
     /**
      * Provides information about a new metadata element, not found in ISO 19115, which is
      * required to describe geographic data.
+     *
+     * @return New metadata elements not found in ISO 19115.
      */
     @Override
     @XmlElement(name = "extendedElementInformation")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -107,6 +107,8 @@ public class DefaultPortrayalCatalogueRe
 
     /**
      * Bibliographic reference to the portrayal catalogue cited.
+     *
+     * @return References to the portrayal catalogue cited.
      */
     @Override
     @XmlElement(name = "portrayalCatalogueCitation", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -147,6 +147,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the plan as implemented by the acquisition.
+     *
+     * @return Plan as implemented by the acquisition.
      */
     @Override
     @XmlElement(name = "acquisitionPlan")
@@ -165,6 +167,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the requirement the data acquisition intends to satisfy.
+     *
+     * @return Requirement the data acquisition intends to satisfy.
      */
     @Override
     @XmlElement(name = "acquisitionRequirement")
@@ -184,6 +188,8 @@ public class DefaultAcquisitionInformati
     /**
      * Returns a record of the environmental circumstances during the data acquisition.
      * {@code null} if unspecified.
+     *
+     * @return Record of the environmental circumstances, or {@code null}.
      */
     @Override
     @XmlElement(name = "environmentalConditions")
@@ -203,6 +209,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the general information about the instrument used in data acquisition.
+     *
+     * @return Instrument used in data acquisition.
      */
     @Override
     @XmlElement(name = "instrument")
@@ -221,6 +229,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the area or object to be sensed.
+     *
+     * @return Area or object to be sensed.
      */
     @Override
     @XmlElement(name = "objective")
@@ -239,6 +249,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the general information about an identifiable activity which provided the data.
+     *
+     * @return Identifiable activity which provided the data.
      */
     @Override
     @XmlElement(name = "operation")
@@ -257,6 +269,8 @@ public class DefaultAcquisitionInformati
 
     /**
      * Returns the general information about the platform from which the data were taken.
+     *
+     * @return Platform from which the data were taken.
      */
     @Override
     @XmlElement(name = "platform")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -119,6 +119,8 @@ public class DefaultEnvironmentalRecord 
 
     /**
      * Returns the average air temperature along the flight pass during the photo flight.
+     *
+     * @return Average air temperature along the flight pass during the photo flight, or {@code null}.
      */
     @Override
     @XmlElement(name = "averageAirTemperature", required = true)
@@ -138,6 +140,8 @@ public class DefaultEnvironmentalRecord 
 
     /**
      * Returns the maximum relative humidity along the flight pass during the photo flight.
+     *
+     * @return Maximum relative humidity along the flight pass during the photo flight, or {@code null}.
      */
     @Override
     @ValueRange(minimum=0, maximum=100)
@@ -158,6 +162,8 @@ public class DefaultEnvironmentalRecord 
 
     /**
      * Returns the maximum altitude during the photo flight.
+     *
+     * @return Maximum altitude during the photo flight, or {@code null}.
      */
     @Override
     @XmlElement(name = "maxAltitude", required = true)
@@ -176,8 +182,9 @@ public class DefaultEnvironmentalRecord 
     }
 
     /**
-     * Returns the meteorological conditions in the photo flight area, in particular clouds,
-     * snow and wind.
+     * Returns the meteorological conditions in the photo flight area, in particular clouds, snow and wind.
+     *
+     * @return Meteorological conditions in the photo flight area, or {@code null}.
      */
     @Override
     @XmlElement(name = "meteorologicalConditions", required = true)
@@ -186,8 +193,7 @@ public class DefaultEnvironmentalRecord 
     }
 
     /**
-     * Sets the meteorological conditions in the photo flight area, in particular clouds,
-     * snow and wind.
+     * Sets the meteorological conditions in the photo flight area, in particular clouds, snow and wind.
      *
      * @param newValue The meteorological conditions value.
      */

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -153,6 +153,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the event name or number.
+     *
+     * @return Event name or number, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -173,6 +175,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the initiator of the event.
+     *
+     * @return Initiator of the event, or {@code null}.
      */
     @Override
     @XmlElement(name = "trigger", required = true)
@@ -192,6 +196,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Meaning of the event.
+     *
+     * @return Meaning of the event, or {@code null}.
      */
     @Override
     @XmlElement(name = "context", required = true)
@@ -211,6 +217,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the relative time ordering of the event.
+     *
+     * @return Relative time ordering, or {@code null}.
      */
     @Override
     @XmlElement(name = "sequence", required = true)
@@ -230,6 +238,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the time the event occurred.
+     *
+     * @return Time the event occurred, or {@code null}.
      */
     @Override
     @XmlElement(name = "time", required = true)
@@ -249,6 +259,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the objective or objectives satisfied by an event.
+     *
+     * @return Objectives satisfied by an event.
      */
     @Override
     @XmlElement(name = "expectedObjective")
@@ -267,6 +279,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the pass during which an event occurs. {@code null} if unspecified.
+     *
+     * @return Pass during which an event occurs, or {@code null}.
      */
     @Override
     @XmlElement(name = "relatedPass")
@@ -285,6 +299,8 @@ public class DefaultEvent extends ISOMet
 
     /**
      * Returns the instrument or instruments for which the event is meaningful.
+     *
+     * @return Instruments for which the event is meaningful.
      */
     @Override
     @XmlElement(name = "relatedSensor")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -125,6 +125,8 @@ public class DefaultInstrument extends I
 
     /**
      * Returns the complete citation of the instrument.
+     *
+     * @return Complete citation of the instrument.
      */
     @Override
     @XmlElement(name = "citation")
@@ -143,6 +145,8 @@ public class DefaultInstrument extends I
 
     /**
      * Returns the unique identification of the instrument.
+     *
+     * @return Unique identification of the instrument, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -163,6 +167,8 @@ public class DefaultInstrument extends I
 
     /**
      * Returns the name of the type of instrument. Examples: framing, line-scan, push-broom, pan-frame.
+     *
+     * @return Type of instrument, or {@code null}.
      */
     @Override
     @XmlElement(name = "type", required = true)
@@ -182,6 +188,8 @@ public class DefaultInstrument extends I
 
     /**
      * Returns the textual description of the instrument. {@code null} if unspecified.
+     *
+     * @return Textual description, or {@code null}.
      */
     @Override
     @XmlElement(name = "description")
@@ -201,6 +209,8 @@ public class DefaultInstrument extends I
 
     /**
      * Returns the platform on which the instrument is mounted. {@code null} if unspecified.
+     *
+     * @return Platform on which the instrument is mounted, or {@code null}.
      */
     @Override
     @XmlElement(name = "mountedOn")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -160,6 +160,8 @@ public class DefaultObjective extends IS
      * {@note The <code>&lt:gmd:identifier&gt;</code> element marshalled to XML will exclude
      *        all the above cited identifiers, for ISO 19139 compliance. Those identifiers
      *        will appear in other XML elements or attributes.}
+     *
+     * @return Identify the objective.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -185,6 +187,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the priority applied to the target. {@code null} if unspecified.
+     *
+     * @return Priority applied, or {@code null}.
      */
     @Override
     @XmlElement(name = "priority")
@@ -204,6 +208,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the collection technique for the objective.
+     *
+     * @return Collection technique for the objective.
      */
     @Override
     @XmlElement(name = "type")
@@ -222,6 +228,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the role or purpose performed by or activity performed at the objective.
+     *
+     * @return Role or purpose performed by or activity performed at the objective.
      */
     @Override
     @XmlElement(name = "function")
@@ -241,6 +249,8 @@ public class DefaultObjective extends IS
     /**
      * Returns the extent information including the bounding box, bounding polygon, vertical and
      * temporal extent of the objective.
+     *
+     * @return Extent information.
      */
     @Override
     @XmlElement(name = "extent")
@@ -260,6 +270,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the event or events associated with objective completion.
+     *
+     * @return Events associated with objective completion.
      */
     @Override
     @XmlElement(name = "objectiveOccurence", required = true)
@@ -278,6 +290,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the pass of the platform over the objective.
+     *
+     * @return Pass of the platform.
      */
     @Override
     @XmlElement(name = "pass")
@@ -296,6 +310,8 @@ public class DefaultObjective extends IS
 
     /**
      * Returns the instrument which senses the objective data.
+     *
+     * @return Instrument which senses the objective data.
      */
     @Override
     @XmlElement(name = "sensingInstrument")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -64,8 +64,7 @@ public class DefaultOperation extends IS
     private static final long serialVersionUID = 4828650802232651791L;
 
     /**
-     * Description of the mission on which the platform observations are made and the
-     * objectives of that mission.
+     * Description of the mission on which the platform observations are made and the objectives of that mission.
      */
     private InternationalString description;
 
@@ -174,6 +173,8 @@ public class DefaultOperation extends IS
     /**
      * Returns the description of the mission on which the platform observations are made and the
      * objectives of that mission. {@code null} if unspecified.
+     *
+     * @return Description of the mission, or {@code null}.
      */
     @Override
     @XmlElement(name = "description")
@@ -194,6 +195,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the identification of the mission. {@code null} if unspecified.
+     *
+     * @return Identification of the mission, or {@code null}.
      */
     @Override
     @XmlElement(name = "citation")
@@ -213,6 +216,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the unique identification of the operation.
+     *
+     * @return Unique identification of the operation, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -233,6 +238,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the status of the data acquisition.
+     *
+     * @return Status of the data acquisition, or {@code null}.
      */
     @Override
     @XmlElement(name = "status", required = true)
@@ -252,6 +259,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the collection technique for the operation.
+     *
+     * @return Collection technique for the operation, or {@code null}.
      */
     @Override
     @XmlElement(name = "type")
@@ -271,6 +280,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the sub-missions that make up part of a larger mission.
+     *
+     * @return Sub-missions.
      */
     @Override
     @XmlElement(name = "childOperation")
@@ -289,6 +300,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns object(s) or area(s) of interest to be sensed.
+     *
+     * @return Object(s) or area(s) of interest.
      */
     @Override
     @XmlElement(name = "objective")
@@ -307,6 +320,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the heritage of the operation.
+     *
+     * @return Heritage of the operation, or {@code null}.
      */
     @Override
     @XmlElement(name = "parentOperation", required = true)
@@ -326,6 +341,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the plan satisfied by the operation.
+     *
+     * @return Plan satisfied by the operation, or {@code null}.
      */
     @Override
     @XmlElement(name = "plan")
@@ -345,6 +362,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the platform (or platforms) used in the operation.
+     *
+     * @return Platforms used in the operation.
      */
     @Override
     @XmlElement(name = "platform")
@@ -363,6 +382,8 @@ public class DefaultOperation extends IS
 
     /**
      * Returns the record of an event occurring during an operation.
+     *
+     * @return Record of an event occurring during an operation.
      */
     @Override
     @XmlElement(name = "significantEvent")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -131,6 +131,8 @@ public class DefaultPlan extends ISOMeta
     /**
      * Returns the manner of sampling geometry that the planner expects for collection of
      * objective data. {@code null} if unspecified.
+     *
+     * @return Manner of sampling geometry, or {@code null}.
      */
     @Override
     @XmlElement(name = "type")
@@ -151,6 +153,8 @@ public class DefaultPlan extends ISOMeta
 
     /**
      * Returns the current status of the plan (pending, completed, etc.)
+     *
+     * @return Current status of the plan, or {@code null}.
      */
     @Override
     @XmlElement(name = "status", required = true)
@@ -170,6 +174,8 @@ public class DefaultPlan extends ISOMeta
 
     /**
      * Returns the identification of authority requesting target collection.
+     *
+     * @return Identification of authority requesting target collection, or {@code null}.
      */
     @Override
     @XmlElement(name = "citation", required = true)
@@ -189,6 +195,8 @@ public class DefaultPlan extends ISOMeta
 
     /**
      * Returns the identification of the activity or activities that satisfy a plan.
+     *
+     * @return Identification of the activity or activities.
      */
     @Override
     @XmlElement(name = "operation")
@@ -207,6 +215,8 @@ public class DefaultPlan extends ISOMeta
 
     /**
      * Returns the requirement satisfied by the plan.
+     *
+     * @return Requirement satisfied by the plan.
      */
     @Override
     @XmlElement(name = "satisfiedRequirement")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -125,8 +125,9 @@ public class DefaultPlatform extends ISO
     }
 
     /**
-     * Returns the source where information about the platform is described. {@code null}
-     * if unspecified.
+     * Returns the source where information about the platform is described. {@code null} if unspecified.
+     *
+     * @return Source where information about the platform is described, or {@code null}.
      */
     @Override
     @XmlElement(name = "citation")
@@ -146,6 +147,8 @@ public class DefaultPlatform extends ISO
 
     /**
      * Returns the unique identification of the platform.
+     *
+     * @return Unique identification of the platform, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -166,6 +169,8 @@ public class DefaultPlatform extends ISO
 
     /**
      * Gets the narrative description of the platform supporting the instrument.
+     *
+     * @return Narrative description of the platform, or {@code null}.
      */
     @Override
     @XmlElement(name = "description", required = true)
@@ -185,6 +190,8 @@ public class DefaultPlatform extends ISO
 
     /**
      * Returns the organization responsible for building, launch, or operation of the platform.
+     *
+     * @return Organization responsible for building, launch, or operation of the platform.
      */
     @Override
     @XmlElement(name = "sponsor")
@@ -203,6 +210,8 @@ public class DefaultPlatform extends ISO
 
     /**
      * Gets the instrument(s) mounted on a platform.
+     *
+     * @return Instrument(s) mounted on a platform.
      */
     @Override
     @XmlElement(name = "instrument", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -110,6 +110,8 @@ public class DefaultPlatformPass extends
 
     /**
      * Returns the unique name of the pass.
+     *
+     * @return Unique name of the pass, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -131,7 +133,7 @@ public class DefaultPlatformPass extends
     /**
      * Returns the area covered by the pass. {@code null} if unspecified.
      *
-     * @todo annotate an implementation of {@link Geometry} in order to annotate this method.
+     * @return Area covered by the pass, or {@code null}.
      */
     @Override
     @XmlElement(name = "extent")
@@ -151,6 +153,8 @@ public class DefaultPlatformPass extends
 
     /**
      * Returns the occurrence of one or more events for a pass.
+     *
+     * @return Occurrence of one or more events for a pass.
      */
     @Override
     @XmlElement(name = "relatedEvent")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -109,6 +109,8 @@ public class DefaultRequestedDate extend
 
     /**
      * Returns the preferred date and time of collection.
+     *
+     * @return Preferred date and time, or {@code null}.
      */
     @Override
     @XmlElement(name = "requestedDateOfCollection", required = true)
@@ -128,6 +130,8 @@ public class DefaultRequestedDate extend
 
     /**
      * Returns the latest date and time collection must be completed.
+     *
+     * @return Latest date and time, or {@code null}.
      */
     @Override
     @XmlElement(name = "latestAcceptableDate", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -154,6 +154,8 @@ public class DefaultRequirement extends 
     /**
      * Returns the identification of reference or guidance material for the requirement.
      * {@code null} if unspecified.
+     *
+     * @return Identification of reference or guidance material, or {@code null}.
      */
     @Override
     @XmlElement(name = "citation")
@@ -173,6 +175,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the unique name, or code, for the requirement.
+     *
+     * @return Unique name or code, or {@code null}.
      */
     @Override
     @XmlElement(name = "identifier", required = true)
@@ -193,6 +197,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the origin of requirement.
+     *
+     * @return Origin of requirement.
      */
     @Override
     @XmlElement(name = "requestor", required = true)
@@ -211,6 +217,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the person(s), or body(ies), to receive results of requirement.
+     *
+     * @return Person(s), or body(ies), to receive results.
      */
     @Override
     @XmlElement(name = "recipient", required = true)
@@ -229,6 +237,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the relative ordered importance, or urgency, of the requirement.
+     *
+     * @return Relative ordered importance, or urgency, or {@code null}.
      */
     @Override
     @XmlElement(name = "priority", required = true)
@@ -248,6 +258,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the required or preferred acquisition date and time.
+     *
+     * @return Required or preferred acquisition date and time, or {@code null}.
      */
     @Override
     @XmlElement(name = "requestedDate", required = true)
@@ -267,6 +279,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the date and time after which collection is no longer valid.
+     *
+     * @return Date and time after which collection is no longer valid, or {@code null}.
      */
     @Override
     @XmlElement(name = "expiryDate", required = true)
@@ -286,6 +300,8 @@ public class DefaultRequirement extends 
 
     /**
      * Returns the plan that identifies solution to satisfy the requirement.
+     *
+     * @return Plan that identifies solution to satisfy the requirement.
      */
     @Override
     @XmlElement(name = "satisfiedPlan")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -134,6 +134,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Return the state, province of the location.
+     *
+     * @return State, province of the location, or {@code null}.
      */
     @Override
     @XmlElement(name = "administrativeArea")
@@ -153,6 +155,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Returns the city of the location.
+     *
+     * @return The city of the location, or {@code null}.
      */
     @Override
     @XmlElement(name = "city")
@@ -172,6 +176,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Returns the country of the physical address.
+     *
+     * @return Country of the physical address, or {@code null}.
      */
     @Override
     @XmlElement(name = "country")
@@ -191,6 +197,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Returns the address line for the location (as described in ISO 11180, Annex A).
+     *
+     * @return Address line for the location.
      */
     @Override
     @XmlElement(name = "deliveryPoint")
@@ -209,6 +217,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Returns the address of the electronic mailbox of the responsible organization or individual.
+     *
+     * @return Address of the electronic mailbox of the responsible organization or individual.
      */
     @Override
     @XmlElement(name = "electronicMailAddress")
@@ -227,6 +237,8 @@ public class DefaultAddress extends ISOM
 
     /**
      * Returns ZIP or other postal code.
+     *
+     * @return ZIP or other postal code, or {@code null}.
      */
     @Override
     @XmlElement(name = "postalCode")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -257,6 +257,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the name by which the cited resource is known.
+     *
+     * @return The cited resource name, or {@code null}.
      */
     @Override
     @XmlElement(name = "title", required = true)
@@ -277,6 +279,8 @@ public class DefaultCitation extends ISO
     /**
      * Returns the short name or other language name by which the cited information is known.
      * Example: "DCW" as an alternative title for "<cite>Digital Chart of the World</cite>".
+     *
+     * @return Other names for the resource, or an empty collection if none.
      */
     @Override
     @XmlElement(name = "alternateTitle")
@@ -295,6 +299,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the reference date for the cited resource.
+     *
+     * @return The reference date.
      */
     @Override
     @XmlElement(name = "date", required = true)
@@ -313,6 +319,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the version of the cited resource.
+     *
+     * @return The version, or {@code null} if none.
      */
     @Override
     @XmlElement(name = "edition")
@@ -332,6 +340,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the date of the edition.
+     *
+     * @return The edition date, or {@code null} if none.
      */
     @Override
     @XmlElement(name = "editionDate")
@@ -363,6 +373,8 @@ public class DefaultCitation extends ISO
      *        all the above cited identifiers, for ISO 19139 compliance. Those identifiers
      *        will appear in other XML elements or attributes.}
      *
+     * @return The identifiers, or an empty collection if none.
+     *
      * @see #getISBN()
      * @see #getISSN()
      * @see #getIdentifierMap()
@@ -398,6 +410,8 @@ public class DefaultCitation extends ISO
     /**
      * Returns the name and position information for an individual or organization that is
      * responsible for the resource.
+     *
+     * @return The individual or organization that is responsible, or an empty collection if none.
      */
     @Override
     @XmlElement(name = "citedResponsibleParty")
@@ -417,6 +431,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the mode in which the resource is represented.
+     *
+     * @return The presentation modes, or an empty collection if none.
      */
     @Override
     @XmlElement(name = "presentationForm")
@@ -435,6 +451,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns the information about the series, or aggregate dataset, of which the dataset is a part.
+     *
+     * @return The series of which the dataset is a part, or {@code null} if none.
      */
     @Override
     @XmlElement(name = "series")
@@ -454,6 +472,8 @@ public class DefaultCitation extends ISO
 
     /**
      * Returns other information required to complete the citation that is not recorded elsewhere.
+     *
+     * @return Other details, or {@code null} if none.
      */
     @Override
     @XmlElement(name = "otherCitationDetails")
@@ -472,9 +492,10 @@ public class DefaultCitation extends ISO
     }
 
     /**
-     * Returns the common title with holdings note. Note: title identifies elements of a series
-     * collectively, combined with information about what volumes are available at the
-     * source cited.
+     * Returns the common title with holdings note. Note: title identifies elements of a series collectively,
+     * combined with information about what volumes are available at the source cited.
+     *
+     * @return The common title, or {@code null} if none.
      */
     @Override
     @XmlElement(name = "collectiveTitle")
@@ -483,8 +504,8 @@ public class DefaultCitation extends ISO
     }
 
     /**
-     * Sets the common title with holdings note. This title identifies elements of a series
-     * collectively, combined with information about what volumes are available at the source cited.
+     * Sets the common title with holdings note. This title identifies elements of a series collectively,
+     * combined with information about what volumes are available at the source cited.
      *
      * @param newValue The new collective title, or {@code null} if none.
      */
@@ -501,6 +522,8 @@ public class DefaultCitation extends ISO
      *   return getIdentifierMap().getSpecialized(Citations.ISBN);
      * }
      *
+     * @return The ISBN, or {@code null} if none.
+     *
      * @see #getIdentifiers()
      * @see Citations#ISBN
      */
@@ -538,6 +561,8 @@ public class DefaultCitation extends ISO
      *   return getIdentifierMap().getSpecialized(Citations.ISSN);
      * }
      *
+     * @return The ISSN, or {@code null} if none.
+     *
      * @see #getIdentifiers()
      * @see Citations#ISSN
      */

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -120,6 +120,8 @@ public class DefaultCitationDate extends
 
     /**
      * Returns the reference date for the cited resource.
+     *
+     * @return Reference date for the cited resource, or {@code null}.
      */
     @Override
     @XmlElement(name = "date", required = true)
@@ -139,6 +141,8 @@ public class DefaultCitationDate extends
 
     /**
      * Returns the event used for reference date.
+     *
+     * @return Event used for reference date, or {@code null}.
      */
     @Override
     @XmlElement(name = "dateType", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -139,6 +139,8 @@ public class DefaultContact extends ISOM
 
     /**
      * Returns telephone numbers at which the organization or individual may be contacted.
+     *
+     * @return Telephone numbers at which the organization or individual may be contacted, or {@code null}.
      */
     @Override
     @XmlElement(name = "phone")
@@ -158,6 +160,8 @@ public class DefaultContact extends ISOM
 
     /**
      * Returns the physical and email address at which the organization or individual may be contacted.
+     *
+     * @return Physical and email address at which the organization or individual may be contacted, or {@code null}.
      */
     @Override
     @XmlElement(name = "address")
@@ -177,6 +181,8 @@ public class DefaultContact extends ISOM
 
     /**
      * Return on-line information that can be used to contact the individual or organization.
+     *
+     * @return On-line information that can be used to contact the individual or organization, or {@code null}.
      */
     @Override
     @XmlElement(name = "onlineResource")
@@ -195,8 +201,9 @@ public class DefaultContact extends ISOM
     }
 
     /**
-     * Returns the time period (including time zone) when individuals can contact the organization
-     * or individual.
+     * Returns the time period (including time zone) when individuals can contact the organization or individual.
+     *
+     * @return Time period when individuals can contact the organization or individual, or {@code null}.
      */
     @Override
     @XmlElement(name = "hoursOfService")
@@ -205,8 +212,7 @@ public class DefaultContact extends ISOM
     }
 
     /**
-     * Sets time period (including time zone) when individuals can contact the organization or
-     * individual.
+     * Sets time period (including time zone) when individuals can contact the organization or individual.
      *
      * @param newValue The new hours of service, or {@code null} if none.
      */
@@ -217,6 +223,8 @@ public class DefaultContact extends ISOM
 
     /**
      * Returns supplemental instructions on how or when to contact the individual or organization.
+     *
+     * @return Supplemental instructions on how or when to contact the individual or organization, or {@code null}.
      */
     @Override
     @XmlElement(name = "contactInstructions")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -148,6 +148,8 @@ public class DefaultOnlineResource exten
     /**
      * Returns the name of an application profile that can be used with the online resource.
      * Returns {@code null} if none.
+     *
+     * @return Application profile that can be used with the online resource, or {@code null}.
      */
     @Override
     @XmlElement(name = "applicationProfile")
@@ -167,6 +169,8 @@ public class DefaultOnlineResource exten
 
     /**
      * Name of the online resource. Returns {@code null} if none.
+     *
+     * @return Name of the online resource, or {@code null}.
      */
     @Override
     @XmlElement(name = "name")
@@ -186,6 +190,8 @@ public class DefaultOnlineResource exten
 
     /**
      * Returns the detailed text description of what the online resource is/does.
+     *
+     * @return Text description of what the online resource is/does, or {@code null}.
      */
     @Override
     @XmlElement(name = "description")
@@ -205,6 +211,8 @@ public class DefaultOnlineResource exten
 
     /**
      * Returns the code for function performed by the online resource.
+     *
+     * @return Function performed by the online resource, or {@code null}.
      */
     @Override
     @XmlElement(name = "function")
@@ -225,6 +233,8 @@ public class DefaultOnlineResource exten
     /**
      * Returns the location (address) for on-line access using a Uniform Resource Locator address or
      * similar addressing scheme such as "{@code http://www.statkart.no/isotc211}".
+     *
+     * @return Location for on-line access using a Uniform Resource Locator address or similar scheme, or {@code null}.
      */
     @Override
     @XmlElement(name = "linkage", required = true)
@@ -245,6 +255,8 @@ public class DefaultOnlineResource exten
 
     /**
      * Returns the connection protocol to be used.
+     *
+     * @return Connection protocol to be used, or {@code null}.
      */
     @Override
     @XmlElement(name = "protocol")

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -138,8 +138,10 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the name of the responsible person- surname, given name, title separated by a delimiter.
-     * Only one of {@code individualName}, {@link #getOrganisationName organisationName}
-     * and {@link #getPositionName positionName} should be provided.
+     * Only one of {@code individualName}, {@link #getOrganisationName() organisationName}
+     * and {@link #getPositionName() positionName} shall be provided.
+     *
+     * @return Name, surname, given name and title of the responsible person, or {@code null}.
      */
     @Override
     @XmlElement(name = "individualName")
@@ -149,8 +151,8 @@ public class DefaultResponsibleParty ext
 
     /**
      * Sets the name of the responsible person- surname, given name, title separated by a delimiter.
-     * Only one of {@code individualName}, {@link #getOrganisationName organisationName}
-     * and {@link #getPositionName positionName} should be provided.
+     * Only one of {@code individualName}, {@link #getOrganisationName() organisationName}
+     * and {@link #getPositionName() positionName} shall be provided.
      *
      * @param newValue The new individual name, or {@code null} if none.
      */
@@ -161,8 +163,10 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the name of the responsible organization. Only one of
-     * {@link #getIndividualName individualName}, {@code organisationName}
-     * and {@link #getPositionName positionName} should be provided.
+     * {@link #getIndividualName() individualName}, {@code organisationName}
+     * and {@link #getPositionName() positionName} shall be provided.
+     *
+     * @return Name of the responsible organization, or {@code null}.
      */
     @Override
     @XmlElement(name = "organisationName")
@@ -172,10 +176,10 @@ public class DefaultResponsibleParty ext
 
     /**
      * Sets the name of the responsible organization. Only one of
-     * {@link #getIndividualName individualName}, {@code organisationName}
-     * and {@link #getPositionName positionName} should be provided.
+     * {@link #getIndividualName() individualName}, {@code organisationName}
+     * and {@link #getPositionName() positionName} shall be provided.
      *
-     * @param newValue The new organisation name, or {@code null} if none.
+     * @param newValue The new organization name, or {@code null} if none.
      */
     public void setOrganisationName(final InternationalString newValue) {
         checkWritePermission();
@@ -184,8 +188,10 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the role or position of the responsible person Only one of
-     * {@link #getIndividualName individualName}, {@link #getOrganisationName organisationName}
-     * and {@code positionName} should be provided.
+     * {@link #getIndividualName() individualName}, {@link #getOrganisationName() organisationName}
+     * and {@code positionName} shall be provided.
+     *
+     * @return Role or position of the responsible person, or {@code null}
      */
     @Override
     @XmlElement(name = "positionName")
@@ -195,8 +201,8 @@ public class DefaultResponsibleParty ext
 
     /**
      * set the role or position of the responsible person Only one of
-     * {@link #getIndividualName individualName}, {@link #getOrganisationName organisationName}
-     * and {@code positionName} should be provided.
+     * {@link #getIndividualName() individualName}, {@link #getOrganisationName() organisationName}
+     * and {@code positionName} shall be provided.
      *
      * @param newValue The new position name, or {@code null} if none.
      */
@@ -207,6 +213,8 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the address of the responsible party.
+     *
+     * @return Address of the responsible party, or {@code null}.
      */
     @Override
     @XmlElement(name = "contactInfo")
@@ -226,6 +234,8 @@ public class DefaultResponsibleParty ext
 
     /**
      * Returns the function performed by the responsible party.
+     *
+     * @return Function performed by the responsible party, or {@code null}.
      */
     @Override
     @XmlElement(name = "role", required = true)

Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java?rev=1501150&r1=1501149&r2=1501150&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java [UTF-8] Tue Jul  9 09:14:55 2013
@@ -121,6 +121,8 @@ public class DefaultSeries extends ISOMe
 
     /**
      * Returns the name of the series, or aggregate dataset, of which the dataset is a part.
+     *
+     * @return The name of the series or aggregate dataset, or {@code null}.
      */
     @Override
     @XmlElement(name = "name")
@@ -140,6 +142,8 @@ public class DefaultSeries extends ISOMe
 
     /**
      * Returns information identifying the issue of the series.
+     *
+     * @return Information identifying the issue of the series, or {@code null}.
      */
     @Override
     @XmlElement(name = "issueIdentification")
@@ -159,6 +163,8 @@ public class DefaultSeries extends ISOMe
 
     /**
      * Returns details on which pages of the publication the article was published.
+     *
+     * @return Details on which pages of the publication the article was published, or {@code null}.
      */
     @Override
     @XmlElement(name = "page")



Mime
View raw message