sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779555 [5/13] - in /sis/branches/JDK7: ./ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/ cor...
Date Fri, 20 Jan 2017 03:49:54 GMT
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] Fri Jan 20 03:49:52 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/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -761,8 +761,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;

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -31,14 +31,12 @@ import java.sql.Types;
 public final class TypeMapper {
     /**
      * A list of Java classes to be mapped to SQL types. We do not want to map every SQL types,
-     * but only the ones which is of interest for the Apache SIS metadata implementation.
+     * but only the ones which are of interest for the Apache SIS metadata implementation.
      * The types will be tested in the order they are declared, so the last declarations are fallbacks.
      *
      * <p>The types declared here matches both the JavaDB and PostgreSQL mapping.</p>
      */
     private static final TypeMapper[] TYPES = {
-        // Note: JavaDB does not supports BOOLEAN as of Derby 10.5.
-        // See http://issues.apache.org/jira/browse/DERBY-499
         new TypeMapper(Boolean.class, Types.BOOLEAN,   "BOOLEAN"),
         new TypeMapper(Date   .class, Types.TIMESTAMP, "TIMESTAMP"),
         new TypeMapper(Double .class, Types.DOUBLE,    "DOUBLE PRECISION"),

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -141,8 +141,8 @@ public class Colors implements Cloneable
     /**
      * Returns the color for the given syntactic element.
      *
-     * @param key The syntactic element for which to get the color.
-     * @return The color of the specified element, or {@code null} if none.
+     * @param  key  the syntactic element for which to get the color.
+     * @return the color of the specified element, or {@code null} if none.
      */
     public final String getName(final ElementKind key) {      // Declared final for consistency with getAnsiSequence(…)
         final X364 color = map.get(key);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -148,8 +148,8 @@ public enum ElementKind {
      * The given type can be any sub-type of the above types. If an object implements more
      * than one of the above interfaces, then the selected {@code ElementKind} is arbitrary.
      *
-     * @param  type The object type, or {@code null}.
-     * @return The element kind of the given type, or {@code null} if none match.
+     * @param  type  the object type, or {@code null}.
+     * @return the element kind of the given type, or {@code null} if none match.
      */
     public static ElementKind forType(final Class<?> type) {
         if (type != null) {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -97,8 +97,8 @@ public abstract class FormattableObject
      *
      * <p>By default this method formats this object according the {@link Convention#WKT2} rules.</p>
      *
-     * @return The default Well Know Text representation of this object.
-     * @throws UnformattableObjectException If this object can not be formatted as a standard WKT.
+     * @return the default Well Know Text representation of this object.
+     * @throws UnformattableObjectException if this object can not be formatted as a standard WKT.
      *
      * @see org.opengis.referencing.IdentifiedObject#toWKT()
      */
@@ -116,7 +116,7 @@ public abstract class FormattableObject
      * Consequently the WKT is not guaranteed to be ISO 19162 compliant.
      * For stricter conformance, use {@link #toWKT()} instead.</p>
      *
-     * @return The Well Known Text (WKT) or an alternative representation of this object.
+     * @return the Well Known Text (WKT) or an alternative representation of this object.
      */
     @Override
     public String toString() {
@@ -131,8 +131,8 @@ public abstract class FormattableObject
      *
      * <p>For stricter conformance to ISO 19162 standard, use {@link #toWKT()} or {@link WKTFormat} instead.</p>
      *
-     * @param  convention The WKT convention to use.
-     * @return The Well Known Text (WKT) or a pseudo-WKT representation of this object.
+     * @param  convention  the WKT convention to use.
+     * @return the Well Known Text (WKT) or a pseudo-WKT representation of this object.
      */
     public String toString(final Convention convention) {
         ArgumentChecks.ensureNonNull("convention", convention);
@@ -165,12 +165,12 @@ public abstract class FormattableObject
      * If {@code strict} is true, then an exception is thrown if the WKT is not standard-compliant.
      * If {@code strict} if false, then warnings are appended after the WKT instead.
      *
-     * @param  convention  The convention for choosing WKT element names.
+     * @param  convention  the convention for choosing WKT element names.
      * @param  colorize    {@code true} for applying syntax coloring, or {@code false} otherwise.
      * @param  strict      {@code true} if an exception shall be thrown for unformattable objects,
      *                     or {@code false} for providing a non-standard formatting instead.
-     * @return The Well Known Text (WKT) or a pseudo-WKT representation of this object.
-     * @throws UnformattableObjectException If {@code strict} is {@code true} and this object can not be formatted.
+     * @return the Well Known Text (WKT) or a pseudo-WKT representation of this object.
+     * @throws UnformattableObjectException if {@code strict} is {@code true} and this object can not be formatted.
      */
     private String formatWKT(final Convention convention, final boolean colorize, final boolean strict)
              throws UnformattableObjectException
@@ -239,8 +239,8 @@ public abstract class FormattableObject
      * while the keyword needs to be defined by the concrete subclasses.
      * In such case, the method in the abstract class shall return {@code null}.</p>
      *
-     * @param  formatter The formatter where to format the inner content of this WKT element.
-     * @return The {@linkplain KeywordCase#CAMEL_CASE CamelCase} keyword for the WKT element, or {@code null} if unknown.
+     * @param  formatter  the formatter where to format the inner content of this WKT element.
+     * @return the {@linkplain KeywordCase#CAMEL_CASE CamelCase} keyword for the WKT element, or {@code null} if unknown.
      *
      * @see #toWKT()
      * @see #toString()

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -49,8 +49,8 @@ public interface Parser {
      * {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference Systems} or
      * {@linkplain org.apache.sis.referencing.operation.transform.AbstractMathTransform Math Transforms}.
      *
-     * @param  text Object encoded in Well-Known Text format (version 1 or 2).
-     * @return The result of parsing the given text.
+     * @param  text  object encoded in Well-Known Text format (version 1 or 2).
+     * @return the result of parsing the given text.
      * @throws FactoryException if the object creation failed.
      */
     Object createFromWKT(String text) throws FactoryException;

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -366,7 +366,7 @@ public class Symbols implements Localize
      * Returns the number of paired quotes. For example if the WKT parser accepts both the
      * {@code "…"} and {@code “…”} quote pairs, then this method returns 2.
      *
-     * @return The number of quote pairs.
+     * @return the number of quote pairs.
      *
      * @see #getOpeningQuote(int)
      * @see #getClosingQuote(int)

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -54,7 +54,7 @@ public class UnformattableObjectExceptio
     /**
      * Constructs a new exception with the specified detail message.
      *
-     * @param message The detail message, or {@code null} if none.
+     * @param message  the detail message, or {@code null} if none.
      */
     public UnformattableObjectException(final String message) {
         super(message);
@@ -63,8 +63,8 @@ public class UnformattableObjectExceptio
     /**
      * Constructs a new exception with the specified detail message and cause.
      *
-     * @param message The detail message, or {@code null} if none.
-     * @param cause The cause, or {@code null} if none.
+     * @param message  the detail message, or {@code null} if none.
+     * @param cause    the cause, or {@code null} if none.
      */
     public UnformattableObjectException(final String message, final Throwable cause) {
         super(message, cause);
@@ -73,7 +73,7 @@ public class UnformattableObjectExceptio
     /**
      * Constructs a new exception with the specified cause.
      *
-     * @param cause The cause, or {@code null} if none.
+     * @param cause  the cause, or {@code null} if none.
      */
     public UnformattableObjectException(final Throwable cause) {
         super(cause);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -81,10 +81,10 @@ final class VerticalInfo {
     /**
      * Adds to the chained list a new {@code DefaultVerticalExtent} instance pending completion.
      *
-     * @param next    The existing {@code VerticalInfo} instance. Will become the next instance
-     *                to process after {@code this} in a chain of {@code VerticalInfo}.
-     * @param extents Where to add the vertical extent.
-     * @param unit    The unit to assign to the {@code extent}. Can not be null.
+     * @param next     the existing {@code VerticalInfo} instance. Will become the next instance
+     *                 to process after {@code this} in a chain of {@code VerticalInfo}.
+     * @param extents  where to add the vertical extent.
+     * @param unit     the unit to assign to the {@code extent}. Can not be null.
      */
     VerticalInfo(final VerticalInfo next, final DefaultExtent extents, final double minimum, final double maximum, final Unit<Length> unit) {
         this.next   = next;
@@ -105,7 +105,7 @@ final class VerticalInfo {
      *
      * This method processes also all other {@code VerticalInfo} instances in the chained list.
      *
-     * @return The new head of the chained list (may be {@code this}), or {@code null} if the list
+     * @return the new head of the chained list (may be {@code this}), or {@code null} if the list
      *         became empty as a result of this operation.
      */
     final VerticalInfo resolve(final VerticalCRS crs) {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -28,7 +28,7 @@ import org.apache.sis.measure.ValueRange
  * in order to make possible to return this range from the {@link PropertyInformation#getDomainValue()}
  * method.
  *
- * @param <E> The type of range elements as a subclass of {@link Number}.
+ * @param  <E>  the type of range elements as a subclass of {@link Number}.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -38,8 +38,8 @@ final class InformationMap extends Prope
     /**
      * Creates an information map for the specified accessor.
      *
-     * @param accessor  The accessor to use for the metadata.
-     * @param keyPolicy Determines the string representation of keys in the map.
+     * @param accessor   the accessor to use for the metadata.
+     * @param keyPolicy  determines the string representation of keys in the map.
      */
     InformationMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy) {
         super(accessor, keyPolicy);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -485,8 +485,10 @@ public class MetadataStandard implements
                 if (!it.hasNext()) {
                     return candidate;
                 }
-                // Found more than one interface; we don't know which one to pick.
-                // Returns 'null' for now; the caller will thrown an exception.
+                /*
+                 * Found more than one interface; we don't know which one to pick.
+                 * Returns 'null' for now; the caller will thrown an exception.
+                 */
             } else if (IMPLEMENTATION_CAN_ALTER_API && isPendingAPI(key.type)) {
                 /*
                  * Found no interface. According to our method contract we should return null.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -97,6 +97,7 @@ public abstract class ModifiableMetadata
     /**
      * A null implementation for the {@link #FREEZING} constant.
      */
+    @SuppressWarnings("CloneableClassWithoutClone")
     private static final class Null extends ModifiableMetadata {
         @Override public MetadataStandard getStandard() {
             return null;
@@ -185,8 +186,10 @@ public abstract class ModifiableMetadata
                 return this;
             }
             candidate.freeze();
-            // Set the field only after success. The 'unmodifiable' field must
-            // stay null if an exception occurred during clone() or freeze().
+            /*
+             * Set the field only after success. The 'unmodifiable' field must
+             * stay null if an exception occurred during clone() or freeze().
+             */
             unmodifiable = candidate;
         }
         assert !unmodifiable.isModifiable();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -40,9 +40,9 @@ final class NameMap extends PropertyMap<
     /**
      * Creates a name map for the specified accessor.
      *
-     * @param accessor    The accessor to use for the metadata.
-     * @param keyPolicy   Determines the string representation of keys in the map.
-     * @param valuePolicy Determines the string representation of values in this map.
+     * @param accessor     the accessor to use for the metadata.
+     * @param keyPolicy    determines the string representation of keys in the map.
+     * @param valuePolicy  determines the string representation of values in this map.
      */
     NameMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy, final KeyNamePolicy valuePolicy) {
         super(accessor, keyPolicy);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -377,7 +377,7 @@ class PropertyAccessor {
                             Classes.getShortName(type) + '.' + name));
                 }
                 if (deprecated) {
-                    mapping.put(name, old); // Restore the undeprecated method.
+                    mapping.put(name, old);                 // Restore the undeprecated method.
                 }
             }
         }
@@ -413,7 +413,7 @@ class PropertyAccessor {
         for (Method candidate : getters) {
             if (Classes.isPossibleGetter(candidate)) {
                 final String name = candidate.getName();
-                if (name.startsWith(SET)) { // Paranoiac check.
+                if (name.startsWith(SET)) {                         // Paranoiac check.
                     continue;
                 }
                 /*
@@ -424,13 +424,13 @@ class PropertyAccessor {
                 if (MetadataStandard.IMPLEMENTATION_CAN_ALTER_API) {
                     if (type == implementation) {
                         if (!type.isInterface() && !candidate.isAnnotationPresent(UML.class)) {
-                            continue; // @UML considered optional only for interfaces.
+                            continue;           // @UML considered optional only for interfaces.
                         }
                     } else try {
                         candidate = type.getMethod(name, (Class[]) null);
                     } catch (NoSuchMethodException e) {
                         if (!candidate.isAnnotationPresent(UML.class)) {
-                            continue; // Not a method from an interface, and no @UML in implementation.
+                            continue;           // Not a method from an interface, and no @UML in implementation.
                         }
                     }
                 }
@@ -446,7 +446,7 @@ class PropertyAccessor {
                     final Class<?> pt = getters[pi].getReturnType();
                     final Class<?> ct = candidate  .getReturnType();
                     if (ct.isAssignableFrom(pt)) {
-                        continue; // Previous type was more accurate.
+                        continue;                       // Previous type was more accurate.
                     }
                     if (pt.isAssignableFrom(ct)) {
                         getters[pi] = candidate;
@@ -494,7 +494,7 @@ class PropertyAccessor {
      *
      * @param  name       the name of the property to search.
      * @param  mandatory  whether this method shall throw an exception or return {@code -1}
-     *         if the given name is not found.
+     *                    if the given name is not found.
      * @return the index of the given name, or -1 if none and {@code mandatory} is {@code false}.
      * @throws IllegalArgumentException if the name is not found and {@code mandatory} is {@code true}.
      */
@@ -588,8 +588,10 @@ class PropertyAccessor {
                     if (implementation != type) try {
                         getter = implementation.getMethod(getter.getName(), (Class<?>[]) null);
                     } catch (NoSuchMethodException error) {
-                        // Should never happen, since the implementation class
-                        // implements the interface where the getter come from.
+                        /*
+                         * Should never happen, since the implementation class
+                         * implements the interface where the getter come from.
+                         */
                         throw new AssertionError(error);
                     }
                     return getter.getDeclaringClass();
@@ -800,8 +802,10 @@ class PropertyAccessor {
                 if (changed == null) {
                     changed = (mode == RETURN_NULL) || (newValues[0] != oldValue);
                     if (changed && mode == APPEND && !ValueExistencePolicy.isNullOrEmpty(oldValue)) {
-                        // If 'convert' did not added the value in a collection and if a value already
-                        // exists, do not modify the existing value. Exit now with "no change" status.
+                        /*
+                         * If 'convert' did not added the value in a collection and if a value already
+                         * exists, do not modify the existing value. Exit now with "no change" status.
+                         */
                         return null;
                     }
                 }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -91,7 +91,7 @@ final class PropertyComparator implement
     /**
      * Creates a new comparator for the given implementation class.
      *
-     * @param implementation The implementation class, or the interface if the implementation class is unknown.
+     * @param implementation  the implementation class, or the interface if the implementation class is unknown.
      */
     PropertyComparator(Class<?> implementation) {
         this.implementation = implementation;
@@ -123,8 +123,8 @@ final class PropertyComparator implement
      * when the implementation has been updated for a new standard, while the interface is still reflecting the
      * old standard.
      *
-     * @param  implementation The implementation class, or the interface is the implementation class is unknown.
-     * @param  method The method to check for deprecation.
+     * @param  implementation  the implementation class, or the interface is the implementation class is unknown.
+     * @param  method          the method to check for deprecation.
      * @return {@code true} if the method is deprecated.
      */
     static boolean isDeprecated(final Class<?> implementation, Method method) {
@@ -140,8 +140,10 @@ final class PropertyComparator implement
         try {
             method = implementation.getMethod(method.getName(), (Class[]) null);
         } catch (NoSuchMethodException e) {
-            // Should never happen since the implementation is supposed to implement
-            // the interface that declare the method given in argument.
+            /*
+             * Should never happen since the implementation is supposed to implement
+             * the interface that declare the method given in argument.
+             */
             throw new AssertionError(e);
         }
         return method.isAnnotationPresent(Deprecated.class);
@@ -156,23 +158,22 @@ final class PropertyComparator implement
         if (deprecated != isDeprecated(implementation, m2)) {
             return deprecated ? +1 : -1;
         }
-        int c = indexOf(m2) - indexOf(m1); // indexOf(…) are sorted in descending order.
+        int c = indexOf(m2) - indexOf(m1);                          // indexOf(…) are sorted in descending order.
         if (c == 0) {
             final UML a1 = m1.getAnnotation(UML.class);
             final UML a2 = m2.getAnnotation(UML.class);
             if (a1 != null) {
-                if (a2 == null) return +1;   // Sort annotated elements first.
-                c = order(a1) - order(a2);   // Mandatory elements must be first.
+                if (a2 == null) return +1;                          // Sort annotated elements first.
+                c = order(a1) - order(a2);                          // Mandatory elements must be first.
                 if (c == 0) {
                     // Fallback on alphabetical order.
                     c = a1.identifier().compareToIgnoreCase(a2.identifier());
                 }
                 return c;
             } else if (a2 != null) {
-                return -1; // Sort annotated elements first.
+                return -1;                                          // Sort annotated elements first.
             }
-            // Fallback on alphabetical order.
-            c = m1.getName().compareToIgnoreCase(m2.getName());
+            c = m1.getName().compareToIgnoreCase(m2.getName());     // Fallback on alphabetical order.
         }
         return c;
     }
@@ -270,9 +271,9 @@ final class PropertyComparator implement
      * by the property name {@code "title"}. We will perform this operation only if there is
      * at least 1 character after the prefix.
      *
-     * @param  name The method name (can not be {@code null}).
-     * @param  base Must be the result of {@code prefix(name).length()}.
-     * @return The property name (never {@code null}).
+     * @param  name  the method name (can not be {@code null}).
+     * @param  base  must be the result of {@code prefix(name).length()}.
+     * @return the property name (never {@code null}).
      */
     static String toPropertyName(String name, final int base) {
         final int length = name.length();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -92,6 +92,7 @@ abstract class PropertyMap<V> extends Ab
      * if they define a different entries set class than the default {@link Entries} inner class.
      */
     @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")         // Intentionally modifiable set.
     public Set<Map.Entry<String,V>> entrySet() {
         if (entrySet == null) {
             entrySet = new Entries();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -34,7 +34,7 @@ import java.util.IdentityHashMap;
  * would not suit since it invokes {@code equals(Object)} and {@code hashCode()}, which are precisely
  * the methods that we want to avoid invoking twice.
  *
- * @param <V> The kind of values to store in the maps.
+ * @param  <V>  the kind of values to store in the maps.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -499,13 +499,14 @@ class TreeNode implements Node {
             final Collection<?> values = (Collection<?>) super.getUserObject();
             if (!(values instanceof List<?>)) {
                 // 'setValue' is the public method which invoked this one.
-                throw new UnsupportedOperationException(Errors.format(
-                        Errors.Keys.UnsupportedOperation_1, "setValue"));
+                throw new UnsupportedOperationException(Errors.format(Errors.Keys.UnsupportedOperation_1, "setValue"));
             }
             final Class<?> targetType;
             if (values instanceof CheckedContainer<?>) {
-                // Typically the same than getElementType(), but let be safe
-                // in case some implementations have stricter requirements.
+                /*
+                 * Typically the same than getElementType(), but let be safe
+                 * in case some implementations have stricter requirements.
+                 */
                 targetType = ((CheckedContainer<?>) values).getElementType();
             } else {
                 targetType = baseType;

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -40,9 +40,9 @@ final class TypeMap extends PropertyMap<
     /**
      * Creates a type map for the specified accessor.
      *
-     * @param accessor    The accessor to use for the metadata.
-     * @param keyPolicy   Determines the string representation of keys in the map..
-     * @param valuePolicy The kind of values in this map.
+     * @param accessor     the accessor to use for the metadata.
+     * @param keyPolicy    determines the string representation of keys in the map..
+     * @param valuePolicy  the kind of values in this map.
      */
     TypeMap(final PropertyAccessor accessor, final KeyNamePolicy keyPolicy, final TypeValuePolicy valuePolicy) {
         super(accessor, keyPolicy);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -42,7 +42,7 @@ public class UnmodifiableMetadataExcepti
     /**
      * Creates a new exception with the specified detail message.
      *
-     * @param message The detail message.
+     * @param message  the detail message.
      */
     public UnmodifiableMetadataException(final String message) {
         super(message);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -51,10 +51,10 @@ final class ValueMap extends PropertyMap
     /**
      * Creates a map of values for the specified metadata and accessor.
      *
-     * @param metadata    The metadata object to wrap.
-     * @param accessor    The accessor to use for the metadata.
-     * @param keyPolicy   Determines the string representation of keys in the map..
-     * @param valuePolicy The behavior of this map toward null or empty values.
+     * @param metadata     the metadata object to wrap.
+     * @param accessor     the accessor to use for the metadata.
+     * @param keyPolicy    determines the string representation of keys in the map..
+     * @param valuePolicy  the behavior of this map toward null or empty values.
      */
     ValueMap(final Object metadata, final PropertyAccessor accessor,
             final KeyNamePolicy keyPolicy, final ValueExistencePolicy valuePolicy)

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java?rev=1779555&r1=1779554&r2=1779555&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java [UTF-8] Fri Jan 20 03:49:52 2017
@@ -43,6 +43,7 @@ import org.opengis.metadata.citation.Onl
  * @version 0.5
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(name = "MD_ApplicationSchemaInformation_Type", propOrder = {
     "name",
     "schemaLanguage",
@@ -53,9 +54,7 @@ import org.opengis.metadata.citation.Onl
     "softwareDevelopmentFileFormat"
 })
 @XmlRootElement(name = "MD_ApplicationSchemaInformation")
-public class DefaultApplicationSchemaInformation extends ISOMetadata
-        implements ApplicationSchemaInformation
-{
+public class DefaultApplicationSchemaInformation extends ISOMetadata implements ApplicationSchemaInformation {
     /**
      * Serial number for inter-operability with different versions.
      */
@@ -105,9 +104,9 @@ public class DefaultApplicationSchemaInf
     /**
      * Creates a application schema information initialized to the specified values.
      *
-     * @param name               The name of the application schema used.
-     * @param schemaLanguage     The the identification of the schema language used.
-     * @param constraintLanguage The formal language used in application schema.
+     * @param name                the name of the application schema used.
+     * @param schemaLanguage      the the identification of the schema language used.
+     * @param constraintLanguage  the formal language used in application schema.
      */
     public DefaultApplicationSchemaInformation(final Citation name,
                                                final String schemaLanguage,
@@ -123,7 +122,7 @@ public class DefaultApplicationSchemaInf
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(ApplicationSchemaInformation)
      */
@@ -154,8 +153,8 @@ public class DefaultApplicationSchemaInf
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultApplicationSchemaInformation castOrCopy(final ApplicationSchemaInformation object) {
@@ -168,7 +167,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Name of the application schema used.
      *
-     * @return Name of the application schema, or {@code null}.
+     * @return name of the application schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "name", required = true)
@@ -179,7 +178,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the name of the application schema used.
      *
-     * @param newValue The new name.
+     * @param  newValue  the new name.
      */
     public void setName(final Citation newValue) {
         checkWritePermission();
@@ -189,7 +188,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Identification of the schema language used.
      *
-     * @return The schema language used, or {@code null}.
+     * @return the schema language used, or {@code null}.
      */
     @Override
     @XmlElement(name = "schemaLanguage", required = true)
@@ -200,7 +199,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the identification of the schema language used.
      *
-     * @param newValue The new schema language.
+     * @param  newValue  the new schema language.
      */
     public void setSchemaLanguage(final String newValue) {
         checkWritePermission();
@@ -210,7 +209,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Formal language used in Application Schema.
      *
-     * @return Formal language used in Application Schema, or {@code null}.
+     * @return formal language used in Application Schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "constraintLanguage", required = true)
@@ -221,7 +220,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the formal language used in application schema.
      *
-     * @param newValue The new constraint language.
+     * @param  newValue  the new constraint language.
      */
     public void setConstraintLanguage(final String newValue) {
         checkWritePermission();
@@ -231,7 +230,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Full application schema given as an ASCII file.
      *
-     * @return Application schema as an ASCII file, or {@code null}.
+     * @return application schema as an ASCII file, or {@code null}.
      */
     @Override
 /// @XmlElement(name = "schemaAscii")
@@ -242,7 +241,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the full application schema given as an ASCII file.
      *
-     * @param newValue The new ASCII file.
+     * @param  newValue  the new ASCII file.
      */
     public void setSchemaAscii(final CharSequence newValue) {
         checkWritePermission();
@@ -252,7 +251,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Full application schema given as a graphics file.
      *
-     * @return Application schema as a graphics file, or {@code null}.
+     * @return application schema as a graphics file, or {@code null}.
      */
     @Override
 /// @XmlElement(name = "graphicsFile")
@@ -263,7 +262,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the full application schema given as a graphics file.
      *
-     * @param newValue The new graphics file.
+     * @param  newValue  the new graphics file.
      */
     public void setGraphicsFile(final OnlineResource newValue) {
         checkWritePermission();
@@ -273,7 +272,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Full application schema given as a software development file.
      *
-     * @return Application schema as a software development file, or {@code null}.
+     * @return application schema as a software development file, or {@code null}.
      */
     @Override
 /// @XmlElement(name = "softwareDevelopmentFile")
@@ -284,7 +283,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the full application schema given as a software development file.
      *
-     * @param newValue The new software development file.
+     * @param  newValue  the new software development file.
      */
     public void setSoftwareDevelopmentFile(final OnlineResource newValue) {
         checkWritePermission();
@@ -294,7 +293,7 @@ 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}.
+     * @return format used for the application schema software file, or {@code null}.
      */
     @Override
     @XmlElement(name = "softwareDevelopmentFileFormat")
@@ -305,7 +304,7 @@ public class DefaultApplicationSchemaInf
     /**
      * Sets the software dependent format used for the application schema software dependent file.
      *
-     * @param newValue The new software development file format.
+     * @param  newValue  the new software development file format.
      */
     public void setSoftwareDevelopmentFileFormat(final String newValue) {
         checkWritePermission();



Mime
View raw message