sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779295 [4/5] - in /sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal: jaxb/code/ jaxb/geometry/ jaxb/gmi/ jaxb/gts/ jaxb/metadata/ jaxb/metadata/direct/ jaxb/metadata/replace/ metadata/ metadata/sql/
Date Wed, 18 Jan 2017 06:37:03 GMT
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -67,8 +67,8 @@ public final class RS_Identifier extends
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gmd:RS_Identifier>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected RS_Identifier wrap(Identifier metadata) {
@@ -80,7 +80,7 @@ public final class RS_Identifier extends
      * inside the {@code <gmd:RS_Identifier>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public ImmutableIdentifier getElement() {
@@ -97,7 +97,7 @@ public final class RS_Identifier extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final ImmutableIdentifier metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -53,7 +53,7 @@ public final class RS_ReferenceSystem ex
     /**
      * Wraps a Reference System value in a {@code MD_ReferenceSystem} element at marshalling-time.
      *
-     * @param metadata The metadata value to marshal.
+     * @param  metadata  the metadata value to marshal.
      */
     protected RS_ReferenceSystem(final ReferenceSystem metadata) {
         super(metadata);
@@ -63,8 +63,8 @@ public final class RS_ReferenceSystem ex
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <gmd:RS_ReferenceSystem>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected RS_ReferenceSystem wrap(ReferenceSystem metadata) {
@@ -76,7 +76,7 @@ public final class RS_ReferenceSystem ex
      * inside the {@code <gmd:RS_ReferenceSystem>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public ReferenceSystemMetadata getElement() {
@@ -93,7 +93,7 @@ public final class RS_ReferenceSystem ex
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final ReferenceSystemMetadata metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -61,8 +61,8 @@ public final class SV_CoupledResource ex
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_CoupledResource>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected SV_CoupledResource wrap(final CoupledResource metadata) {
@@ -74,7 +74,7 @@ public final class SV_CoupledResource ex
      * inside the {@code <srv:SV_CoupledResource>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public DefaultCoupledResource getElement() {
@@ -84,7 +84,7 @@ public final class SV_CoupledResource ex
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final DefaultCoupledResource metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -61,8 +61,8 @@ public final class SV_OperationChainMeta
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_OperationChainMetadata>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected SV_OperationChainMetadata wrap(final OperationChainMetadata metadata) {
@@ -74,7 +74,7 @@ public final class SV_OperationChainMeta
      * inside the {@code <srv:SV_OperationChainMetadata>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public DefaultOperationChainMetadata getElement() {
@@ -84,7 +84,7 @@ public final class SV_OperationChainMeta
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final DefaultOperationChainMetadata metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -61,8 +61,8 @@ public final class SV_OperationMetadata
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_OperationMetadata>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected SV_OperationMetadata wrap(final OperationMetadata metadata) {
@@ -74,7 +74,7 @@ public final class SV_OperationMetadata
      * inside the {@code <srv:SV_OperationMetadata>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public DefaultOperationMetadata getElement() {
@@ -84,7 +84,7 @@ public final class SV_OperationMetadata
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final DefaultOperationMetadata metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -62,8 +62,8 @@ public final class SV_Parameter extends
      * Invoked by {@link PropertyType} at marshalling time for wrapping the given metadata value
      * in a {@code <srv:SV_Parameter>} XML element.
      *
-     * @param  metadata The metadata element to marshall.
-     * @return A {@code PropertyType} wrapping the given the metadata element.
+     * @param  metadata  the metadata element to marshall.
+     * @return a {@code PropertyType} wrapping the given the metadata element.
      */
     @Override
     protected SV_Parameter wrap(final ParameterDescriptor<?> metadata) {
@@ -75,7 +75,7 @@ public final class SV_Parameter extends
      * inside the {@code <srv:SV_Parameter>} XML element.
      * This is the value or a copy of the value given in argument to the {@code wrap} method.
      *
-     * @return The metadata to be marshalled.
+     * @return the metadata to be marshalled.
      */
     @XmlElementRef
     public ServiceParameter getElement() {
@@ -85,7 +85,7 @@ public final class SV_Parameter extends
     /**
      * Invoked by JAXB at unmarshalling time for storing the result temporarily.
      *
-     * @param metadata The unmarshalled metadata.
+     * @param  metadata  the unmarshalled metadata.
      */
     public void setElement(final ServiceParameter metadata) {
         this.metadata = metadata;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -33,8 +33,8 @@ public final class CI_OnlineResource ext
     /**
      * Converts a GeoAPI interface to the SIS implementation for XML marshalling.
      *
-     * @param  value The bound type value, here the GeoAPI interface.
-     * @return The adapter for the given value, here the SIS implementation.
+     * @param  value  the bound type value, here the GeoAPI interface.
+     * @return the adapter for the given value, here the SIS implementation.
      */
     @Override
     public DefaultOnlineResource marshal(final OnlineResource value) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -33,8 +33,8 @@ public final class GO_MemberName extends
     /**
      * Converts a GeoAPI interface to the SIS implementation for XML marshalling.
      *
-     * @param  value The bound type value, here the GeoAPI interface.
-     * @return The adapter for the given value, here the SIS implementation.
+     * @param  value  the bound type value, here the GeoAPI interface.
+     * @return the adapter for the given value, here the SIS implementation.
      */
     @Override
     public DefaultMemberName marshal(MemberName value) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -37,8 +37,8 @@ public final class GO_ScopedName extends
     /**
      * Converts a GeoAPI interface to the SIS implementation for XML marshalling.
      *
-     * @param  name The bound type value, here the GeoAPI interface.
-     * @return The adapter for the given value, here the SIS implementation.
+     * @param  name  the bound type value, here the GeoAPI interface.
+     * @return the adapter for the given value, here the SIS implementation.
      */
     @Override
     public CodeType.ScopedName marshal(final ScopedName name) {
@@ -53,8 +53,8 @@ public final class GO_ScopedName extends
     /**
      * Returns the scope name from the given string.
      *
-     * @param  code The metadata value.
-     * @return The value to marshal (which is the same).
+     * @param  code  the metadata value.
+     * @return the value to marshal (which is the same).
      */
     @Override
     public ScopedName unmarshal(final CodeType.ScopedName code) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -33,8 +33,8 @@ public final class MD_Keywords extends M
     /**
      * Converts a GeoAPI interface to the SIS implementation for XML marshalling.
      *
-     * @param  value The bound type value, here the GeoAPI interface.
-     * @return The adapter for the given value, here the SIS implementation.
+     * @param  value  the bound type value, here the GeoAPI interface.
+     * @return the adapter for the given value, here the SIS implementation.
      */
     @Override
     public DefaultKeywords marshal(final Keywords value) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -22,8 +22,8 @@ import javax.xml.bind.annotation.adapter
 /**
  * Base class for adapters from GeoAPI interfaces to their SIS implementation.
  *
- * @param <BoundType> The GeoAPI interface being adapted.
- * @param <ValueType> The SIS class implementing the interface.
+ * @param  <BoundType>  the GeoAPI interface being adapted.
+ * @param  <ValueType>  the SIS class implementing the interface.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -42,8 +42,8 @@ public abstract class MetadataAdapter<Bo
     /**
      * Returns the given object unchanged, to be marshalled directly.
      *
-     * @param  value The metadata value.
-     * @return The value to marshal (which is the same).
+     * @param  value  the metadata value.
+     * @return the value to marshal (which is the same).
      */
     @Override
     public final BoundType unmarshal(final ValueType value) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.internal.jaxb.metadata.replace;
 
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import org.opengis.metadata.Identifier;
@@ -23,9 +24,6 @@ import org.opengis.referencing.Reference
 import org.apache.sis.internal.simple.SimpleIdentifiedObject;
 import org.apache.sis.util.ComparisonMode;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An implementation of {@link ReferenceSystem} marshalled as specified in ISO 19115.
@@ -62,7 +60,7 @@ public class ReferenceSystemMetadata ext
     /**
      * Creates a new reference system from the given one.
      *
-     * @param crs The reference system to partially copy.
+     * @param  crs  the reference system to partially copy.
      */
     public ReferenceSystemMetadata(final ReferenceSystem crs) {
         super(crs);
@@ -71,7 +69,7 @@ public class ReferenceSystemMetadata ext
     /**
      * Creates a new reference system from the given identifier.
      *
-     * @param name The primary name by which this object is identified.
+     * @param  name  the primary name by which this object is identified.
      */
     public ReferenceSystemMetadata(final Identifier name) {
         super(name);
@@ -80,7 +78,7 @@ public class ReferenceSystemMetadata ext
     /**
      * Returns the primary name by which this object is identified.
      *
-     * @return The identifier given at construction time.
+     * @return the identifier given at construction time.
      */
     @Override
     @XmlElement(name = "referenceSystemIdentifier")
@@ -91,7 +89,7 @@ public class ReferenceSystemMetadata ext
     /**
      * Sets the primary name by which this object is identified.
      *
-     * @param name The new primary name.
+     * @param  name  the new primary name.
      */
     public final void setName(final Identifier name) {
         this.name = name;
@@ -100,8 +98,8 @@ public class ReferenceSystemMetadata ext
     /**
      * Compares this object with the given one for equality.
      *
-     * @param  object The object to compare with this reference system.
-     * @param  mode The strictness level of the comparison.
+     * @param  object  the object to compare with this reference system.
+     * @param  mode    the strictness level of the comparison.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.internal.jaxb.metadata.replace;
 
 import java.util.Set;
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -42,9 +43,6 @@ import static org.apache.sis.util.Utilit
 import static org.apache.sis.internal.util.CollectionsExt.nonNull;
 import static org.apache.sis.internal.jaxb.gco.PropertyType.LEGACY_XML;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Parameter information conform to the ISO 19115:2014 specification.
@@ -69,7 +67,7 @@ import java.util.Objects;
  * @since   0.5
  * @module
  */
-@SuppressWarnings("rawtypes") // For the omission of <T> in ParameterDescriptor<T> - see javadoc.
+@SuppressWarnings("rawtypes")               // For the omission of <T> in ParameterDescriptor<T> - see javadoc.
 @XmlType(name = "SV_Parameter_Type", namespace = Namespaces.SRV, propOrder = {
     "memberName",
     "direction",
@@ -156,8 +154,8 @@ public final class ServiceParameter exte
     /**
      * Returns the given parameter as an instance of {@code ServiceParameter}.
      *
-     * @param  parameter The parameter (may be {@code null}).
-     * @return The service parameter, or {@code null} if the given argument was null.
+     * @param  parameter  the parameter (may be {@code null}).
+     * @return the service parameter, or {@code null} if the given argument was null.
      */
     public static ServiceParameter castOrCopy(final ParameterDescriptor<?> parameter) {
         if (parameter == null || parameter instanceof ServiceParameter) {
@@ -171,8 +169,8 @@ public final class ServiceParameter exte
      * {@code MemberName}. If not, this method searches for the first alias which is an instance of {@code MemberName}.
      * If none is found, then this method tries to build a member name from the primary name and value class.
      *
-     * @param  parameter The parameter from which to get the name (may be {@code null}).
-     * @return The member name, or {@code null} if none.
+     * @param  parameter  the parameter from which to get the name (may be {@code null}).
+     * @return the member name, or {@code null} if none.
      */
     public static MemberName getMemberName(final ParameterDescriptor<?> parameter) {
         if (parameter != null) {
@@ -204,7 +202,7 @@ public final class ServiceParameter exte
      *
      * This method is the converse of {@link #getMemberName(ParameterDescriptor)}.
      *
-     * @return The parameter name as an identifier (the type specified by ISO 19111).
+     * @return the parameter name as an identifier (the type specified by ISO 19111).
      */
     @Override
     public synchronized Identifier getName() {
@@ -224,7 +222,7 @@ public final class ServiceParameter exte
      * (see <cite>Note about raw-type usage</cite> in class javadoc), since there is no way we
      * can ensure that the returned class is really for type {@code <T>}.
      *
-     * @return The value class inferred from the attribute type, or {@code null} if unknown.
+     * @return the value class inferred from the attribute type, or {@code null} if unknown.
      */
     @Override
     public Class<?> getValueClass() {
@@ -244,7 +242,7 @@ public final class ServiceParameter exte
     /**
      * Returns an indication if the parameter is an input to the service, an output or both.
      *
-     * @return Indication if the parameter is an input or output to the service, or {@code null} if unspecified.
+     * @return indication if the parameter is an input or output to the service, or {@code null} if unspecified.
      */
     @Override
     public ParameterDirection getDirection() {
@@ -254,7 +252,7 @@ public final class ServiceParameter exte
     /**
      * Returns a narrative explanation of the role of the parameter.
      *
-     * @return A narrative explanation of the role of the parameter, or {@code null} if none.
+     * @return a narrative explanation of the role of the parameter, or {@code null} if none.
      */
     @Override
     public InternationalString getDescription() {
@@ -282,7 +280,7 @@ public final class ServiceParameter exte
     /**
      * The minimum number of times that values for this parameter group or parameter are required.
      *
-     * @return The minimum occurrence.
+     * @return the minimum occurrence.
      */
     @Override
     public int getMinimumOccurs() {
@@ -292,7 +290,7 @@ public final class ServiceParameter exte
     /**
      * The maximum number of times that values for this parameter group or parameter can be included.
      *
-     * @return The maximum occurrence.
+     * @return the maximum occurrence.
      */
     @Override
     public int getMaximumOccurs() {
@@ -303,7 +301,7 @@ public final class ServiceParameter exte
      * Optional properties.
      * @return {@code null}.
      */
-    @Override public Set<?>        getValidValues()  {return null;} // Really null, not an empty set. See method contract.
+    @Override public Set<?>        getValidValues()  {return null;}     // Really null, not an empty set. See method contract.
     @Override public Comparable<?> getMinimumValue() {return null;}
     @Override public Comparable<?> getMaximumValue() {return null;}
     @Override public Object        getDefaultValue() {return null;}
@@ -314,7 +312,7 @@ public final class ServiceParameter exte
      * This method delegates the work to {@link org.apache.sis.parameter.DefaultParameterDescriptor}
      * since this {@code ServiceParameter} class is not a full-featured parameter descriptor implementation.
      *
-     * @return A new instance of {@code ParameterValue}.
+     * @return a new instance of {@code ParameterValue}.
      */
     @Override
     public ParameterValue<?> createValue() {
@@ -331,8 +329,8 @@ public final class ServiceParameter exte
     /**
      * Compares this object with the given one for equality.
      *
-     * @param  object The object to compare with this reference system.
-     * @param  mode The strictness level of the comparison.
+     * @param  object  the object to compare with this reference system.
+     * @param  mode    the strictness level of the comparison.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -174,9 +174,9 @@ public final class AxisNames {
     /**
      * Returns the given axis name in upper case without punctuation characters.
      *
-     * @param  name   The axis name to return in upper-case.
-     * @param  buffer A temporary buffer to use. Must be initially empty.
-     * @return The given name converted to upper-case.
+     * @param  name    the axis name to return in upper-case.
+     * @param  buffer  a temporary buffer to use. Must be initially empty.
+     * @return the given name converted to upper-case.
      */
     private static String toUpperCase(final String name, final StringBuilder buffer) {
         for (int i=0; i<name.length(); i++) {
@@ -197,8 +197,8 @@ public final class AxisNames {
      * SIS does not put restriction on axis names, but we nevertheless try to use a unique
      * name when we recognize it.</div>
      *
-     * @param  name The name in any case.
-     * @return The given name in camel case.
+     * @param  name  the name in any case.
+     * @return the given name in camel case.
      */
     public static String toCamelCase(final String name) {
         return VALUES.getOrDefault(toUpperCase(name, new StringBuilder(name.length())), name);

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -28,7 +28,7 @@ import org.apache.sis.util.resources.Err
  * method. This set is used only for mutually exclusive properties, when a collection can not have
  * elements because the other property is set.
  *
- * @param  <E> The type of elements that the collection would have if it was non-empty.
+ * @param  <E>  the type of elements that the collection would have if it was non-empty.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -51,8 +51,8 @@ public final class ExcludedSet<E> extend
     /**
      * Creates a new empty set.
      *
-     * @param name1 The name of the first mutually exclusive property.
-     * @param name2 The name of the second mutually exclusive property.
+     * @param name1  the name of the first mutually exclusive property.
+     * @param name2  the name of the second mutually exclusive property.
      */
     public ExcludedSet(final String name1, final String name2) {
         this.name1 = name1;
@@ -82,7 +82,7 @@ public final class ExcludedSet<E> extend
     /**
      * Returns the empty iterator.
      *
-     * @return Empty iterator.
+     * @return empty iterator.
      */
     @Override
     public Iterator<E> iterator() {
@@ -93,8 +93,8 @@ public final class ExcludedSet<E> extend
      * Unconditionally throws a {@link UnsupportedOperationException} with a message
      * saying which properties are mutually exclusive.
      *
-     * @param  e Ignored.
-     * @return Never return.
+     * @param  e  ignored.
+     * @return never return.
      */
     @Override
     public boolean add(final E e) {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -20,23 +20,21 @@ import java.util.AbstractCollection;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Objects;
 import org.apache.sis.metadata.AbstractMetadata;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.util.AbstractIterator;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.ArgumentChecks;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An adapter for collections of a legacy type replaced by an other collection.
  * This adapter is used for implementation of deprecated methods in the {@link org.apache.sis.metadata.iso}
  * sub-packages, usually when the deprecation is the result of upgrading from an older to a newer ISO standard.
  *
- * @param <L> The legacy type.
- * @param <N> The new type.
+ * @param  <L>  the legacy type.
+ * @param  <N>  the new type.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.5
@@ -57,7 +55,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Creates a new adapter.
      *
-     * @param elements The collection where to store the elements (may be {@code null}).
+     * @param elements  the collection where to store the elements (may be {@code null}).
      */
     protected LegacyPropertyAdapter(final Collection<N> elements) {
         this.elements = elements;
@@ -66,25 +64,25 @@ public abstract class LegacyPropertyAdap
     /**
      * Wraps a legacy value in its new type.
      *
-     * @param  value The legacy value.
-     * @return The new type.
+     * @param  value  the legacy value.
+     * @return the new type.
      */
     protected abstract N wrap(final L value);
 
     /**
      * Extracts a legacy value from the new type.
      *
-     * @param  container The new type.
-     * @return The legacy value, or {@code null}.
+     * @param  container  the new type.
+     * @return the legacy value, or {@code null}.
      */
     protected abstract L unwrap(final N container);
 
     /**
      * Update a new value with the given legacy value.
      *
-     * @param  container The new value to be used as a container for the old value.
-     * @param  value     The value to update in the container.
-     * @return Whether this method has been able to perform the update.
+     * @param  container  the new value to be used as a container for the old value.
+     * @param  value      the value to update in the container.
+     * @return whether this method has been able to perform the update.
      */
     protected abstract boolean update(final N container, final L value);
 
@@ -109,7 +107,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Sets the values from the given collection.
      *
-     * @param newValues The values to set (may be {@code null}).
+     * @param  newValues  the values to set (may be {@code null}).
      */
     public final void setValues(Collection<? extends L> newValues) {
         if (newValues == null) {
@@ -141,13 +139,13 @@ public abstract class LegacyPropertyAdap
      * Returns the singleton value of the given collection, or {@code null} if the given collection is null or empty.
      * If the given collection contains more than one element, then a warning is emitted.
      *
-     * @param  <L>           The kind of legacy values to be returned.
-     * @param  values        The collection from which to get the value.
-     * @param  valueClass    The value class, used in case of warning only.
-     * @param  caller        Either {@code this} or {@code null}.
-     * @param  callerClass   The caller class, used in case of warning only.
-     * @param  callerMethod  The caller method, used in case of warning only.
-     * @return The first value, or {@code null} if none.
+     * @param  <L>           the kind of legacy values to be returned.
+     * @param  values        the collection from which to get the value.
+     * @param  valueClass    the value class, used in case of warning only.
+     * @param  caller        either {@code this} or {@code null}.
+     * @param  callerClass   the caller class, used in case of warning only.
+     * @param  callerMethod  the caller method, used in case of warning only.
+     * @return the first value, or {@code null} if none.
      */
     public static <L> L getSingleton(final Collection<? extends L> values, final Class<L> valueClass,
             final LegacyPropertyAdapter<L,?> caller, final Class<?> callerClass, final String callerMethod)
@@ -174,9 +172,9 @@ public abstract class LegacyPropertyAdap
     /**
      * Emit a warning about extraneous ignored values.
      *
-     * @param  valueClass    The value class (usually a GeoAPI interface).
-     * @param  callerClass   The caller class (usually an Apache SIS implementation of a GeoAPI interface).
-     * @param  callerMethod  The caller method (usually the name of a getter method).
+     * @param  valueClass    the value class (usually a GeoAPI interface).
+     * @param  callerClass   the caller class (usually an Apache SIS implementation of a GeoAPI interface).
+     * @param  callerMethod  the caller method (usually the name of a getter method).
      */
     public static void warnIgnoredExtraneous(final Class<?> valueClass,
             final Class<?> callerClass, final String callerMethod)
@@ -188,9 +186,9 @@ public abstract class LegacyPropertyAdap
     /**
      * Returns the given value as an empty or singleton collection.
      *
-     * @param  <L>   The type of the old value.
-     * @param  value The value, or {@code null} if none.
-     * @return The given value as a collection.
+     * @param  <L>    the type of the old value.
+     * @param  value  the value, or {@code null} if none.
+     * @return the given value as a collection.
      */
     public static <L> Collection<L> asCollection(final L value) {
         return (value != null) ? Collections.singleton(value) : Collections.emptySet();
@@ -224,7 +222,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Counts the number of non-null elements.
      *
-     * @return Number of non-null elements.
+     * @return number of non-null elements.
      */
     @Override
     public final int size() {
@@ -240,7 +238,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Adds a new element.
      *
-     * @param  value The element to add.
+     * @param  value  the element to add.
      * @return {@code true} if the element has been added.
      */
     @Override
@@ -252,7 +250,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Returns an iterator over the legacy elements.
      *
-     * @return Iterator over the legacy elements.
+     * @return iterator over the legacy elements.
      */
     @Override
     public final Iterator<L> iterator() {
@@ -311,7 +309,7 @@ public abstract class LegacyPropertyAdap
      * other kind of {@code Collection} implementations: we can not enforce {@code Collection.equals(Object)}
      * to be symmetric in such cases.</p>
      *
-     * @param  other The other object to compare with this collection, or {@code null}.
+     * @param  other  the other object to compare with this collection, or {@code null}.
      * @return {@code true} if the objects are equal, or {@code false} otherwise.
      */
     @Override
@@ -332,7 +330,7 @@ public abstract class LegacyPropertyAdap
     /**
      * Returns a hash code value for this collection.
      *
-     * @return A hash code value calculated from the content of this collection.
+     * @return a hash code value calculated from the content of this collection.
      */
     @Override
     public final int hashCode() {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -144,11 +144,11 @@ public final class NameMeaning extends S
      * the given values. This method delegates to {@link DefinitionURI#format(String, String, String, String)}
      * after "fixing" the given values using some heuristic knowledge about the meaning of URN.
      *
-     * @param  type      The object type.
-     * @param  authority The authority as one of the values documented in {@link DefinitionURI} javadoc.
-     * @param  version   The code version, or {@code null}. This is the only optional information.
-     * @param  code      The code.
-     * @return An identifier using the URN syntax, or {@code null} if a mandatory information is missing.
+     * @param  type       the object type.
+     * @param  authority  the authority as one of the values documented in {@link DefinitionURI} javadoc.
+     * @param  version    the code version, or {@code null}. This is the only optional information.
+     * @param  code       the code.
+     * @return an identifier using the URN syntax, or {@code null} if a mandatory information is missing.
      *
      * @since 0.7
      *
@@ -194,8 +194,8 @@ public final class NameMeaning extends S
      * Returns the "object type" part of an OGC URN for the given class, or {@code null} if unknown.
      * See {@link org.apache.sis.internal.util.DefinitionURI} javadoc for a list of object types in URN.
      *
-     * @param  type The class for which to get the URN type.
-     * @return The URN type, or {@code null} if unknown.
+     * @param  type  the class for which to get the URN type.
+     * @return the URN type, or {@code null} if unknown.
      */
     public static String toObjectType(final Class<?> type) {
         for (int i=0; i<CLASSES.length; i++) {
@@ -212,8 +212,8 @@ public final class NameMeaning extends S
      * This approach is based on the assumption that the authority is some specification document or reference to
      * a database, not an organization. However this policy may be revisited in any future SIS version.
      *
-     * @param authority The authority from which to get a version, or {@code null}.
-     * @return The version, or {@code null} if none.
+     * @param  authority  the authority from which to get a version, or {@code null}.
+     * @return the version, or {@code null} if none.
      *
      * @since 0.7
      */

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.internal.metadata;
 
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Collection;
 import org.opengis.util.NameSpace;
 import org.opengis.util.GenericName;
@@ -30,9 +31,6 @@ import org.apache.sis.util.CharSequences
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 import static org.apache.sis.util.Characters.Filter.LETTERS_AND_DIGITS;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Does the unobvious mapping between {@link Identifier} properties and {@link GenericName} ones.
@@ -56,7 +54,7 @@ public final class NameToIdentifier impl
     /**
      * Infers the attributes from the given name.
      *
-     * @param name The name from which to infer the identifier properties.
+     * @param  name  the name from which to infer the identifier properties.
      */
     public NameToIdentifier(final GenericName name) {
         ensureNonNull("name", name);
@@ -67,8 +65,8 @@ public final class NameToIdentifier impl
      * Returns the scope of the given name if it is not global.
      * This method is null-safe, including paranoiac checks against null scope.
      *
-     * @param  name The name from which to get the scope, or {@code null}.
-     * @return The scope of the given name, or {@code null} if the given name was null or has a global scope.
+     * @param  name  the name from which to get the scope, or {@code null}.
+     * @return the scope of the given name, or {@code null} if the given name was null or has a global scope.
      */
     private static GenericName scope(final GenericName name) {
         if (name != null) {
@@ -83,7 +81,7 @@ public final class NameToIdentifier impl
     /**
      * Infers the authority from the scope if any, or from the code space otherwise.
      *
-     * @return The authority, or {@code null} if none.
+     * @return the authority, or {@code null} if none.
      */
     @Override
     public Citation getAuthority() {
@@ -100,9 +98,9 @@ public final class NameToIdentifier impl
     /**
      * Takes the element before the tip as the code space.
      *
-     * @param  name The name from which to get the code space, or {@code null}.
-     * @param  locale The locale, or {@code null} for a call to {@code name.toString()}.
-     * @return The code space, or {@code null} if none.
+     * @param  name    the name from which to get the code space, or {@code null}.
+     * @param  locale  the locale, or {@code null} for a call to {@code name.toString()}.
+     * @return the code space, or {@code null} if none.
      */
     public static String getCodeSpace(final GenericName name, final Locale locale) {
         final GenericName scope = scope(name.tip());
@@ -154,7 +152,7 @@ public final class NameToIdentifier impl
     /**
      * Compares this object with the given one for equality.
      *
-     * @param object The object to compare with this identifier.
+     * @param  object  the object to compare with this identifier.
      * @return {@code true} if both objects are equal.
      */
     @Override
@@ -171,7 +169,7 @@ public final class NameToIdentifier impl
     /**
      * Returns the string representation of this identifier.
      *
-     * @return The string representation of this identifier.
+     * @return the string representation of this identifier.
      */
     @Override
     public String toString() {
@@ -188,9 +186,9 @@ public final class NameToIdentifier impl
      * Such null values should never happen since the properties used here are mandatory, but we try to make this class
      * robust to broken implementations.
      *
-     * @param  name   The name from which to get the localized string, or {@code null}.
-     * @param  locale The locale, or {@code null} for a call to {@code name.toString()}.
-     * @return The localized string representation, or {@code null} if the given name was null.
+     * @param  name    the name from which to get the localized string, or {@code null}.
+     * @param  locale  the locale, or {@code null} for a call to {@code name.toString()}.
+     * @return the localized string representation, or {@code null} if the given name was null.
      */
     public static String toString(final GenericName name, final Locale locale) {
         if (name != null) {
@@ -213,11 +211,12 @@ public final class NameToIdentifier impl
      * primary name} or one of the given aliases matches the given name. The comparison ignores case, some Latin
      * diacritical signs and any characters that are not letters or digits.
      *
-     * @param  name       The name of the {@code IdentifiedObject} to check.
-     * @param  aliases    The list of aliases in the {@code IdentifiedObject} (may be {@code null}). This method will never
-     *                    modify that list. Consequently, the given list can be a direct reference to an internal list.
-     * @param  toSearch   The name for which to check for equality.
-     * @param  simplifier A function for simplifying the names before comparison.
+     * @param  name        the name of the {@code IdentifiedObject} to check.
+     * @param  aliases     the list of aliases in the {@code IdentifiedObject} (may be {@code null}).
+     *                     This method will never modify that list, so the given list can be a direct
+     *                     reference to an internal list.
+     * @param  toSearch    the name for which to check for equality.
+     * @param  simplifier  a function for simplifying the names before comparison.
      * @return {@code true} if the primary name or at least one alias matches the given {@code name}.
      */
     public static boolean isHeuristicMatchForName(final Identifier name, final Collection<GenericName> aliases,
@@ -272,8 +271,8 @@ public final class NameToIdentifier impl
         /**
          * Simplifies the given name.
          *
-         * @param name The object name (may be {@code null}).
-         * @return The name to use for comparison purpose, or {@code null}.
+         * @param  name  the object name (may be {@code null}).
+         * @return the name to use for comparison purpose, or {@code null}.
          */
         protected CharSequence apply(final CharSequence name) {
             return CharSequences.toASCII(name);

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -64,8 +64,8 @@ public final class OtherLocales extends
      *
      * <p>The converse of this {@code filter} method is {@link #merge(Locale, Collection)}.</p>
      *
-     * @param  languages The collection containing the default locale followed by the other ones.
-     * @return A collection containing all {@code languages} elements except the first one.
+     * @param  languages  the collection containing the default locale followed by the other ones.
+     * @return a collection containing all {@code languages} elements except the first one.
      */
     public static Collection<Locale> filter(final Collection<Locale> languages) {
         return (languages != null) ? new OtherLocales(languages) : null;
@@ -74,7 +74,7 @@ public final class OtherLocales extends
     /**
      * Returns the number of elements in this collection.
      *
-     * @return Number of other locales.
+     * @return number of other locales.
      */
     @Override
     public int size() {
@@ -86,7 +86,7 @@ public final class OtherLocales extends
     /**
      * Returns an iterator over all elements in this collection except the first one.
      *
-     * @return Iterator over all other locales.
+     * @return iterator over all other locales.
      */
     @Override
     public Iterator<Locale> iterator() {
@@ -105,7 +105,7 @@ public final class OtherLocales extends
      * when unmarshalling a XML document having a {@code otherLocale} property without {@code defaultLocale} property,
      * which is probably invalid.</p>
      *
-     * @param  locale The element to add.
+     * @param  locale  the element to add.
      * @return {@code true} if the "other locales" collection has been modified as a result of this method call.
      */
     @Override
@@ -124,9 +124,9 @@ public final class OtherLocales extends
     /**
      * Returns a collection containing the given {@code defaultLocale} followed by the {@code otherLocales}.
      *
-     * @param  defaultLocale The first element in the collection to be returned, or {@code null} if unspecified.
-     * @param  otherLocales  All remaining elements in the collection to be returned, or {@code null} if none.
-     * @return A collection containing the default locale followed by all other ones.
+     * @param  defaultLocale  the first element in the collection to be returned, or {@code null} if unspecified.
+     * @param  otherLocales   all remaining elements in the collection to be returned, or {@code null} if none.
+     * @return a collection containing the default locale followed by all other ones.
      */
     public static Collection<Locale> merge(Locale defaultLocale, final Collection<? extends Locale> otherLocales) {
         final Collection<Locale> merged;
@@ -137,7 +137,7 @@ public final class OtherLocales extends
             if (defaultLocale == null) {
                 defaultLocale = Locale.getDefault();
                 if (otherLocales.contains(defaultLocale)) {
-                    defaultLocale = Locale.ROOT;  // Same default than add(Locale).
+                    defaultLocale = Locale.ROOT;                            // Same default than add(Locale).
                 }
             }
             merged.add(defaultLocale);
@@ -159,10 +159,10 @@ public final class OtherLocales extends
      * <p><b>Note:</b> while defined in {@code OtherLocales} because the primary use for this method is to
      * get the default locale, this method is also opportunistically used for other legacy properties.</p>
      *
-     * @param  <T>      The type of elements in the collection.
-     * @param  values   The collection where to add the new value, or {@code null}.
-     * @param  newValue The new value to set, or {@code null} for instead removing the first element.
-     * @return The collection (may or may not be the given {@code values} collection).
+     * @param  <T>       the type of elements in the collection.
+     * @param  values    the collection where to add the new value, or {@code null}.
+     * @param  newValue  the new value to set, or {@code null} for instead removing the first element.
+     * @return the collection (may or may not be the given {@code values} collection).
      *
      * @see org.apache.sis.internal.util.CollectionsExt#first(Iterable)
      */

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -164,7 +164,7 @@ public class ReferencingServices extends
     /**
      * Returns the singleton instance.
      *
-     * @return The singleton instance.
+     * @return the singleton instance.
      */
     @SuppressWarnings("DoubleCheckedLocking")
     public static ReferencingServices getInstance() {
@@ -205,8 +205,8 @@ public class ReferencingServices extends
      * to a geographic CRS (without datum shift if possible). Otherwise, the envelope is assumed already
      * in a geographic CRS using (<var>longitude</var>, <var>latitude</var>) axis order.
      *
-     * @param  envelope The source envelope.
-     * @param  target The target bounding box.
+     * @param  envelope  the source envelope.
+     * @param  target    the target bounding box.
      * @throws TransformException if the given envelope can't be transformed.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      */
@@ -218,8 +218,8 @@ public class ReferencingServices extends
      * Sets a vertical extent with the value inferred from the given envelope.
      * Only the vertical ordinates are extracted; all other ordinates are ignored.
      *
-     * @param  envelope The source envelope.
-     * @param  target The target vertical extent.
+     * @param  envelope  the source envelope.
+     * @param  target    the target vertical extent.
      * @throws TransformException if no vertical component can be extracted from the given envelope.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      */
@@ -231,8 +231,8 @@ public class ReferencingServices extends
      * Sets a temporal extent with the value inferred from the given envelope.
      * Only the temporal ordinates are extracted; all other ordinates are ignored.
      *
-     * @param  envelope The source envelope.
-     * @param  target The target temporal extent.
+     * @param  envelope  the source envelope.
+     * @param  target    the target temporal extent.
      * @throws TransformException if no temporal component can be extracted from the given envelope.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      */
@@ -254,8 +254,8 @@ public class ReferencingServices extends
      *   <li>If the given envelope has no temporal component, then the temporal extent is set to {@code null}.</li>
      * </ul>
      *
-     * @param  envelope The source envelope.
-     * @param  target The target spatio-temporal extent.
+     * @param  envelope  the source envelope.
+     * @param  target    the target spatio-temporal extent.
      * @throws TransformException if no temporal component can be extracted from the given envelope.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      */
@@ -266,8 +266,8 @@ public class ReferencingServices extends
     /**
      * Initializes a horizontal, vertical and temporal extent with the values inferred from the given envelope.
      *
-     * @param  envelope The source envelope.
-     * @param  target The target extent.
+     * @param  envelope  the source envelope.
+     * @param  target    the target extent.
      * @throws TransformException if a coordinate transformation was required and failed.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      */
@@ -287,8 +287,8 @@ public class ReferencingServices extends
     /**
      * Returns a fully implemented parameter descriptor.
      *
-     * @param  parameter A partially implemented parameter descriptor, or {@code null}.
-     * @return A fully implemented parameter descriptor, or {@code null} if the given argument was null.
+     * @param  parameter  a partially implemented parameter descriptor, or {@code null}.
+     * @return a fully implemented parameter descriptor, or {@code null} if the given argument was null.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      *
      * @since 0.5
@@ -300,8 +300,8 @@ public class ReferencingServices extends
     /**
      * Converts the given object in a {@code FormattableObject} instance.
      *
-     * @param  object The object to wrap.
-     * @return The given object converted to a {@code FormattableObject} instance.
+     * @param  object  the object to wrap.
+     * @return the given object converted to a {@code FormattableObject} instance.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      *
      * @see org.apache.sis.referencing.AbstractIdentifiedObject#castOrCopy(IdentifiedObject)
@@ -317,9 +317,9 @@ public class ReferencingServices extends
      * object is not already an instance of {@code FormattableObject} before to invoke this method. This method
      * returns {@code null} if it can not convert the object.
      *
-     * @param  object The object to wrap.
+     * @param  object  the object to wrap.
      * @param  internal {@code true} if the formatting convention is {@code Convention.INTERNAL}.
-     * @return The given object converted to a {@code FormattableObject} instance, or {@code null}.
+     * @return the given object converted to a {@code FormattableObject} instance, or {@code null}.
      * @throws UnsupportedOperationException if the {@code "sis-referencing"} module has not been found on the classpath.
      *
      * @since 0.6
@@ -340,7 +340,7 @@ public class ReferencingServices extends
     /**
      * Returns a coordinate reference system for heights above the mean seal level.
      *
-     * @return The "Mean Seal Level (MSL) height" coordinate reference system, or {@code null}.
+     * @return the "Mean Seal Level (MSL) height" coordinate reference system, or {@code null}.
      *
      * @since 0.6
      */
@@ -351,7 +351,7 @@ public class ReferencingServices extends
     /**
      * Returns the Greenwich prime meridian.
      *
-     * @return The Greenwich prime meridian.
+     * @return the Greenwich prime meridian.
      *
      * @since 0.6
      */
@@ -362,8 +362,8 @@ public class ReferencingServices extends
     /**
      * Returns the coordinate system of a geocentric CRS using axes in the given unit of measurement.
      *
-     * @param  unit The unit of measurement for the geocentric CRS axes.
-     * @return The coordinate system for a geocentric CRS with axes using the given unit of measurement.
+     * @param  unit  the unit of measurement for the geocentric CRS axes.
+     * @return the coordinate system for a geocentric CRS with axes using the given unit of measurement.
      *
      * @since 0.6
      */
@@ -375,8 +375,8 @@ public class ReferencingServices extends
      * Converts a geocentric coordinate system from the legacy WKT 1 to the current ISO 19111 standard.
      * This method replaces the (Other, East, North) directions by (Geocentric X, Geocentric Y, Geocentric Z).
      *
-     * @param  cs The geocentric coordinate system to upgrade.
-     * @return The upgraded coordinate system, or {@code cs} if this method can not upgrade the given CS.
+     * @param  cs  the geocentric coordinate system to upgrade.
+     * @return the upgraded coordinate system, or {@code cs} if this method can not upgrade the given CS.
      *
      * @since 0.6
      */
@@ -389,9 +389,9 @@ public class ReferencingServices extends
      * since that legacy format did not specified any information about the coordinate system in use.
      * This method should not need to be invoked for parsing WKT version 2.
      *
-     * @param  properties The coordinate system name, and optionally other properties.
-     * @param  axes The axes of the unknown coordinate system.
-     * @return An "abstract" coordinate system using the given axes.
+     * @param  properties  the coordinate system name, and optionally other properties.
+     * @param  axes        the axes of the unknown coordinate system.
+     * @return an "abstract" coordinate system using the given axes.
      *
      * @since 0.6
      */
@@ -405,12 +405,12 @@ public class ReferencingServices extends
      * Note that this method is needed only for WKT 1 parsing, since WKT provides enough information for using
      * the standard factories.
      *
-     * @param  properties    The properties to be given to the {@code DerivedCRS} and {@code Conversion} objects.
-     * @param  baseCRS       Coordinate reference system to base the derived CRS on.
-     * @param  method        The coordinate operation method (mandatory in all cases).
-     * @param  baseToDerived Transform from positions in the base CRS to positions in this target CRS.
-     * @param  derivedCS     The coordinate system for the derived CRS.
-     * @return The newly created derived CRS, potentially implementing an additional CRS interface.
+     * @param  properties     the properties to be given to the {@code DerivedCRS} and {@code Conversion} objects.
+     * @param  baseCRS        coordinate reference system to base the derived CRS on.
+     * @param  method         the coordinate operation method (mandatory in all cases).
+     * @param  baseToDerived  transform from positions in the base CRS to positions in this target CRS.
+     * @param  derivedCS      the coordinate system for the derived CRS.
+     * @return the newly created derived CRS, potentially implementing an additional CRS interface.
      *
      * @since 0.6
      */
@@ -427,11 +427,11 @@ public class ReferencingServices extends
      * Creates a compound CRS, but we special processing for (two-dimensional Geographic + ellipsoidal heights) tupples.
      * If any such tupple is found, a three-dimensional geographic CRS is created instead than the compound CRS.
      *
-     * @param  crsFactory The factory to use for creating compound or three-dimensional geographic CRS.
-     * @param  csFactory  The factory to use for creating three-dimensional ellipsoidal CS, if needed.
-     * @param  properties Name and other properties to give to the new object.
-     * @param  components ordered array of {@code CoordinateReferenceSystem} objects.
-     * @return The coordinate reference system for the given properties.
+     * @param  crsFactory  the factory to use for creating compound or three-dimensional geographic CRS.
+     * @param  csFactory   the factory to use for creating three-dimensional ellipsoidal CS, if needed.
+     * @param  properties  name and other properties to give to the new object.
+     * @param  components  ordered array of {@code CoordinateReferenceSystem} objects.
+     * @return the coordinate reference system for the given properties.
      * @throws FactoryException if the object creation failed.
      *
      * @since 0.7
@@ -506,10 +506,10 @@ public class ReferencingServices extends
      * Returns an axis direction from a pole along a meridian.
      * The given meridian is usually, but not necessarily, relative to the Greenwich meridian.
      *
-     * @param  baseDirection The base direction, which must be {@link AxisDirection#NORTH} or {@link AxisDirection#SOUTH}.
-     * @param  meridian The meridian in degrees, relative to a unspecified (usually Greenwich) prime meridian.
-     *         Meridians in the East hemisphere are positive and meridians in the West hemisphere are negative.
-     * @return The axis direction along the given meridian.
+     * @param  baseDirection  the base direction, which must be {@link AxisDirection#NORTH} or {@link AxisDirection#SOUTH}.
+     * @param  meridian       the meridian in degrees, relative to a unspecified (usually Greenwich) prime meridian.
+     *                        Meridians in the East hemisphere are positive and meridians in the West hemisphere are negative.
+     * @return the axis direction along the given meridian.
      *
      * @since 0.6
      */
@@ -521,8 +521,8 @@ public class ReferencingServices extends
      * Creates the {@code TOWGS84} element during parsing of a WKT version 1. This is an optional operation:
      * this method is allowed to return {@code null} if the "sis-referencing" module is not in the classpath.
      *
-     * @param  values The 7 Bursa-Wolf parameter values.
-     * @return The {@link org.apache.sis.referencing.datum.BursaWolfParameters}, or {@code null}.
+     * @param  values  the 7 Bursa-Wolf parameter values.
+     * @return the {@link org.apache.sis.referencing.datum.BursaWolfParameters}, or {@code null}.
      *
      * @since 0.6
      */
@@ -534,13 +534,13 @@ public class ReferencingServices extends
      * Creates a single operation from the given properties.
      * This method is provided here because not yet available in GeoAPI interfaces.
      *
-     * @param  properties The properties to be given to the identified object.
-     * @param  sourceCRS  The source CRS.
-     * @param  targetCRS  The target CRS.
-     * @param  interpolationCRS The CRS of additional coordinates needed for the operation, or {@code null} if none.
-     * @param  method     The coordinate operation method (mandatory in all cases).
-     * @param  factory    The factory to use.
-     * @return The coordinate operation created from the given arguments.
+     * @param  properties        the properties to be given to the identified object.
+     * @param  sourceCRS         the source CRS.
+     * @param  targetCRS         the target CRS.
+     * @param  interpolationCRS  the CRS of additional coordinates needed for the operation, or {@code null} if none.
+     * @param  method            the coordinate operation method (mandatory in all cases).
+     * @param  factory           the factory to use.
+     * @return the coordinate operation created from the given arguments.
      * @throws FactoryException if the object creation failed.
      *
      * @since 0.6
@@ -561,11 +561,11 @@ public class ReferencingServices extends
      * If the given properties are empty and the {@code mtFactory} is the system default, then this method
      * returns the system default {@code CoordinateOperationFactory} instead of creating a new one.
      *
-     * @param  properties The default properties.
-     * @param  mtFactory  The math transform factory to use.
-     * @param  crsFactory The factory to use if the operation factory needs to create CRS for intermediate steps.
-     * @param  csFactory  The factory to use if the operation factory needs to create CS for intermediate steps.
-     * @return The coordinate operation factory to use.
+     * @param  properties  the default properties.
+     * @param  mtFactory   the math transform factory to use.
+     * @param  crsFactory  the factory to use if the operation factory needs to create CRS for intermediate steps.
+     * @param  csFactory   the factory to use if the operation factory needs to create CS for intermediate steps.
+     * @return the coordinate operation factory to use.
      *
      * @since 0.7
      */
@@ -588,8 +588,8 @@ public class ReferencingServices extends
     /**
      * Returns the properties of the given object.
      *
-     * @param  object The object from which to get the properties.
-     * @return The properties of the given object.
+     * @param  object  the object from which to get the properties.
+     * @return the properties of the given object.
      *
      * @since 0.6
      */
@@ -602,8 +602,8 @@ public class ReferencingServices extends
      * primary name} or an aliases of the given object matches the given name. The comparison ignores case,
      * some Latin diacritical signs and any characters that are not letters or digits.
      *
-     * @param  object The object for which to check the name or alias.
-     * @param  name The name to compare with the object name or aliases.
+     * @param  object  the object for which to check the name or alias.
+     * @param  name    the name to compare with the object name or aliases.
      * @return {@code true} if the primary name of at least one alias matches the specified {@code name}.
      *
      * @since 0.6
@@ -616,8 +616,8 @@ public class ReferencingServices extends
     /**
      * Returns {@code true} if the name or an identifier of the given method matches the given {@code identifier}.
      *
-     * @param  method     The method to test for a match.
-     * @param  identifier The name or identifier of the operation method to search.
+     * @param  method      the method to test for a match.
+     * @param  identifier  the name or identifier of the operation method to search.
      * @return {@code true} if the given method is a match for the given identifier.
      *
      * @since 0.6
@@ -644,9 +644,9 @@ public class ReferencingServices extends
      * Returns the operation method for the specified name or identifier. The given argument shall be either a
      * method name (e.g. <cite>"Transverse Mercator"</cite>) or one of its identifiers (e.g. {@code "EPSG:9807"}).
      *
-     * @param  methods The method candidates.
-     * @param  identifier The name or identifier of the operation method to search.
-     * @return The coordinate operation method for the given name or identifier, or {@code null} if none.
+     * @param  methods     the method candidates.
+     * @param  identifier  the name or identifier of the operation method to search.
+     * @return the coordinate operation method for the given name or identifier, or {@code null} if none.
      *
      * @see org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory#getOperationMethod(String)
      * @see org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory#getOperationMethod(String)
@@ -681,9 +681,9 @@ public class ReferencingServices extends
      *   <li>{@code "EPSG"}: version of EPSG database.</li>
      * </ul>
      *
-     * @param  key A key identifying the information to return.
-     * @param  locale Language to use if possible.
-     * @return The information, or {@code null} if none.
+     * @param  key     a key identifying the information to return.
+     * @param  locale  language to use if possible.
+     * @return the information, or {@code null} if none.
      *
      * @see org.apache.sis.internal.util.MetadataServices#getInformation(String)
      *

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -55,8 +55,8 @@ public final class SensorType extends Co
      * Constructs an element of the given name. The new element is
      * automatically added to the list returned by {@link #values()}.
      *
-     * @param name The name of the new element.
-     *        This name must not be in use by an other element of this type.
+     * @param  name  the name of the new element.
+     *         This name must not be in use by an other element of this type.
      */
     private SensorType(final String name) {
         super(name, VALUES);
@@ -65,7 +65,7 @@ public final class SensorType extends Co
     /**
      * Returns the list of {@code SensorType}s.
      *
-     * @return The list of codes declared in the current JVM.
+     * @return the list of codes declared in the current JVM.
      */
     public static SensorType[] values() {
         synchronized (VALUES) {
@@ -78,7 +78,7 @@ public final class SensorType extends Co
      * Invoking this method is equivalent to invoking {@link #values()}, except that
      * this method can be invoked on an instance of the parent {@code CodeList} class.
      *
-     * @return All code {@linkplain #values() values} for this code list.
+     * @return all code {@linkplain #values() values} for this code list.
      */
     @Override
     public SensorType[] family() {
@@ -92,8 +92,8 @@ public final class SensorType extends Co
      * returns {@code true}. If no existing instance is found, then a new one is created for
      * the given name.
      *
-     * @param code The name of the code to fetch or to create.
-     * @return A code matching the given name.
+     * @param  code  the name of the code to fetch or to create.
+     * @return a code matching the given name.
      */
     public static SensorType valueOf(String code) {
         return valueOf(SensorType.class, code);

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -67,8 +67,8 @@ public final class TransformationAccurac
      * Creates a positional accuracy for the given value, in metres.
      * This method may return a cached value.
      *
-     * @param accuracy The accuracy in metres.
-     * @return A positional accuracy with the given value.
+     * @param  accuracy  the accuracy in metres.
+     * @return a positional accuracy with the given value.
      */
     public static PositionalAccuracy create(final Double accuracy) {
         PositionalAccuracy p = CACHE.get(accuracy);

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -98,8 +98,8 @@ public final class VerticalDatumTypes im
      * <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html"><cite>Well
      * Known Text</cite></a> format (WKT 1). This method is used for WKT 1 parsing.
      *
-     * @param  code The legacy vertical datum code.
-     * @return The vertical datum type, or {@code null} if the code is unrecognized.
+     * @param  code  the legacy vertical datum code.
+     * @return the vertical datum type, or {@code null} if the code is unrecognized.
      */
     public static VerticalDatumType fromLegacy(int code) {
         code -= 2000;
@@ -110,8 +110,8 @@ public final class VerticalDatumTypes im
      * Returns the legacy code for the datum type, or 0 if unknown.
      * This method is used for WKT 1 formatting.
      *
-     * @param  type The vertical datum type, or {@code null} if unknown.
-     * @return The legacy code for the given datum type, or 0 if unknown.
+     * @param  type  the vertical datum type, or {@code null} if unknown.
+     * @return the legacy code for the given datum type, or 0 if unknown.
      */
     public static int toLegacy(final VerticalDatumType type) {
         if (type != null) {
@@ -131,10 +131,10 @@ public final class VerticalDatumTypes im
      * <p>This method uses heuristic rules and may be changed in any future SIS version.
      * If the type can not be determined, defaults to {@link VerticalDatumType#OTHER_SURFACE}.</p>
      *
-     * @param  name    The name of the datum for which to guess a type, or {@code null} if unknown.
-     * @param  aliases The aliases of the datum for which to guess a type, or {@code null} if unknown.
-     * @param  axis    The vertical axis for which to guess a type, or {@code null} if unknown.
-     * @return A datum type, or {@link VerticalDatumType#OTHER_SURFACE} if none can be guessed.
+     * @param  name     the name of the datum for which to guess a type, or {@code null} if unknown.
+     * @param  aliases  the aliases of the datum for which to guess a type, or {@code null} if unknown.
+     * @param  axis     the vertical axis for which to guess a type, or {@code null} if unknown.
+     * @return a datum type, or {@link VerticalDatumType#OTHER_SURFACE} if none can be guessed.
      */
     public static VerticalDatumType guess(final String name, final Collection<? extends GenericName> aliases,
             final CoordinateSystemAxis axis)
@@ -156,7 +156,7 @@ public final class VerticalDatumTypes im
             if (Units.isLinear(unit)) {
                 final String abbreviation = axis.getAbbreviation();
                 if (abbreviation.length() == 1) {
-                    AxisDirection dir = AxisDirection.UP;   // Expected direction for accepting the type.
+                    AxisDirection dir = AxisDirection.UP;               // Expected direction for accepting the type.
                     switch (abbreviation.charAt(0)) {
                         case 'h': type = ELLIPSOIDAL; break;
                         case 'H': type = VerticalDatumType.GEOIDAL; break;
@@ -178,8 +178,8 @@ public final class VerticalDatumTypes im
      * Guesses the type of a datum of the given name. This method attempts to guess only if the given name
      * contains at least one letter. If the type can not be determined, returns {@code null}.
      *
-     * @param  name Name of the datum for which to guess a type, or {@code null}.
-     * @return A datum type, or {@code null} if none can be guessed.
+     * @param  name  name of the datum for which to guess a type, or {@code null}.
+     * @return a datum type, or {@code null} if none can be guessed.
      */
     private static VerticalDatumType guess(final String name) {
         if (name != null) {
@@ -208,7 +208,7 @@ public final class VerticalDatumTypes im
      * The comparison is case-insensitive and ignores some non-ASCII characters. The exact algorithm applied here is
      * implementation dependent and may change in any future version.
      *
-     * @param name The datum name.
+     * @param  name  the datum name.
      */
     private VerticalDatumTypes(final String name) {
         final int length = name.length();
@@ -228,7 +228,7 @@ public final class VerticalDatumTypes im
      *
      * <p>This method is public as an implementation side-effect and should be ignored.</p>
      *
-     * @param code The code to test.
+     * @param  code  the code to test.
      * @return {@code true} if the code matches the criterion.
       */
     @Override

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -75,8 +75,8 @@ enum Dialect {
     /**
      * Returns the presumed SQL dialect.
      *
-     * @param  metadata The database metadata.
-     * @return The presumed SQL dialect.
+     * @param  metadata  the database metadata.
+     * @return the presumed SQL dialect.
      * @throws SQLException if an error occurred while querying the metadata.
      */
     public static Dialect guess(final DatabaseMetaData metadata) throws SQLException {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -64,7 +64,8 @@ public class SQLBuilder {
     /**
      * Creates a new {@code SQLBuilder} initialized from the given database metadata.
      *
-     * @param  metadata  the database metadata.
+     * @param  metadata     the database metadata.
+     * @param  quoteSchema  whether the schema name should be written between quotes.
      * @throws SQLException if an error occurred while fetching the database metadata.
      */
     public SQLBuilder(final DatabaseMetaData metadata, final boolean quoteSchema) throws SQLException {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java?rev=1779295&r1=1779294&r2=1779295&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] Wed Jan 18 06:37:02 2017
@@ -760,8 +760,8 @@ parseLine:  while (pos < length) {
      * the SQL statement under execution. The main purpose of this method is to provide information about the position
      * where an exception occurred.
      *
-     * @param locale The locale for the message to return.
-     * @return A string representation of the current position, or {@code null} if unknown.
+     * @param  locale  the locale for the message to return.
+     * @return a string representation of the current position, or {@code null} if unknown.
      */
     public String status(final Locale locale) {
         String position = null;



Mime
View raw message