sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1533083 - in /sis/branches/JDK7/core: sis-metadata/src/main/java/org/apache/sis/metadata/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/ sis-referencing/src/main/...
Date Thu, 17 Oct 2013 13:55:03 GMT
Author: desruisseaux
Date: Thu Oct 17 13:55:02 2013
New Revision: 1533083

URL: http://svn.apache.org/r1533083
Log:
Minor javadoc rephrasing and compiler warning fixes.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java

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=1533083&r1=1533082&r2=1533083&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] Thu Oct 17 13:55:02 2013
@@ -609,7 +609,7 @@ public abstract class ModifiableMetadata
             return EnumSet.noneOf((Class) elementType);
         }
         if (CodeList.class.isAssignableFrom(elementType) && Modifier.isFinal(elementType.getModifiers()))
{
-            return new CodeListSet((Class) elementType);
+            return new CodeListSet(elementType);
         }
         return new CheckedHashSet<>(elementType, capacity);
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -141,8 +141,8 @@ public class ImmutableIdentifier impleme
         codeSpace = identifier.getCodeSpace();
         authority = identifier.getAuthority();
         version   = identifier.getVersion();
-        if (identifier instanceof ImmutableIdentifier) {
-            remarks = ((ImmutableIdentifier) identifier).getRemarks();
+        if (identifier instanceof Deprecable) {
+            remarks = ((Deprecable) identifier).getRemarks();
         } else {
             remarks = null;
         }
@@ -197,7 +197,7 @@ public class ImmutableIdentifier impleme
     }
 
     /**
-     * Constructs an identifier from a set of properties. Keys are strings from the table
below.
+     * Constructs an identifier from the given properties. Keys are strings from the table
below.
      * The map given in argument shall contain an entry at least for the
      * {@value org.opengis.metadata.Identifier#CODE_KEY} key.
      * Other properties listed in the table below are optional.

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -17,6 +17,7 @@
 package org.apache.sis.metadata.iso.maintenance;
 
 import java.util.Set;
+import java.util.Collection;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -145,12 +146,12 @@ public class DefaultScopeDescription ext
                     switch (i) {
                         case ATTRIBUTES:
                         case ATTRIBUTE_INSTANCES: {
-                            candidate = copySet((Set<AttributeType>) candidate, AttributeType.class);
+                            candidate = copySet((Collection<AttributeType>) candidate,
AttributeType.class);
                             break;
                         }
                         case FEATURES:
                         case FEATURE_INSTANCES: {
-                            candidate = copySet((Set<FeatureType>) candidate, FeatureType.class);
+                            candidate = copySet((Collection<FeatureType>) candidate,
FeatureType.class);
                             break;
                         }
                     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -31,7 +31,6 @@ import javax.xml.bind.annotation.adapter
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.referencing.ObjectFactory;
 import org.opengis.referencing.AuthorityFactory;
@@ -158,7 +157,7 @@ public class AbstractIdentifiedObject ex
     private transient int hashCode;
 
     /**
-     * Constructs an object from a set of properties. Keys are strings from the table below.
+     * Constructs an object from the given properties. Keys are strings from the table below.
      * The map given in argument shall contain an entry at least for the
      * {@value org.opengis.referencing.IdentifiedObject#NAME_KEY} key.
      * Other properties listed in the table below are optional.
@@ -578,7 +577,7 @@ public class AbstractIdentifiedObject ex
      * <code>{@linkplain #equals(Object, ComparisonMode) equals}(object, IGNORE_METADATA)</code>.
      * This feature allows users to implement metadata-insensitive {@link java.util.HashMap}.
      *
-     * @param  mode Specifies the set of properties that can be used for hash code computation.
+     * @param  mode Specifies the properties that can be used for hash code computation.
      * @return The hash code value. This value may change between different execution of
the Apache SIS library.
      * @throws IllegalArgumentException If the given {@code mode} is not one of {@code STRICT},
{@code BY_CONTRACT}
      *         or {@code IGNORE_METADATA} enumeration values.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -91,7 +91,7 @@ public class AbstractReferenceSystem ext
     }
 
     /**
-     * Constructs a reference system from a set of properties.
+     * Constructs a reference system from the given properties.
      * The properties given in argument follow the same rules than for the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      * Additionally, the following properties are understood by this constructor:

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -98,7 +98,7 @@ public class NamedIdentifier extends Imm
     }
 
     /**
-     * Constructs an identifier from a set of properties. The content of the properties map
is used as
+     * Constructs an identifier from the given properties. The content of the properties
map is used as
      * described in the {@linkplain ImmutableIdentifier#ImmutableIdentifier(Map) super-class
constructor}.
      *
      * @param  properties The properties to be given to this identifier.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -97,7 +97,7 @@ public class AbstractDatum extends Abstr
     private final InternationalString scope;
 
     /**
-     * Creates a datum from a set of properties.
+     * Creates a datum from the given properties.
      * The properties given in argument follow the same rules than for the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      * Additionally, the following properties are understood by this constructor:

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -182,7 +182,7 @@ public class DefaultEllipsoid extends Ab
      * The properties map is given unchanged to the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      *
-     * @param properties        Set of properties. Should contains at least {@code "name"}.
+     * @param  properties       The properties to be given to the identified object.
      * @param semiMajorAxis     The equatorial radius.
      * @param semiMinorAxis     The polar radius.
      * @param inverseFlattening The inverse of the flattening value.
@@ -254,7 +254,7 @@ public class DefaultEllipsoid extends Ab
      * The properties map is given unchanged to the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      *
-     * @param properties    Set of properties. Should contains at least {@code "name"}.
+     * @param properties    The properties to be given to the identified object.
      * @param semiMajorAxis The equatorial radius in the given unit.
      * @param semiMinorAxis The polar radius in the given unit.
      * @param unit          The units of the semi-major and semi-minor axis values.
@@ -296,7 +296,7 @@ public class DefaultEllipsoid extends Ab
      * The properties map is given unchanged to the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      *
-     * @param properties        Set of properties. Should contains at least {@code "name"}.
+     * @param  properties       The properties to be given to the identified object.
      * @param semiMajorAxis     The equatorial radius in the given unit.
      * @param inverseFlattening The inverse flattening value.
      * @param unit              The units of the semi-major and semi-minor axis values.
@@ -687,6 +687,8 @@ public class DefaultEllipsoid extends Ab
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -58,10 +58,10 @@ public class DefaultEngineeringDatum ext
     }
 
     /**
-     * Creates an engineering datum from a set of properties. The properties map is given
+     * Creates an engineering datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      *
-     * @param properties Set of properties. Shall contains at least {@code "name"}.
+     * @param properties The properties to be given to the identified object.
      */
     public DefaultEngineeringDatum(final Map<String,?> properties) {
         super(properties);
@@ -116,6 +116,8 @@ public class DefaultEngineeringDatum ext
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -69,11 +69,11 @@ public class DefaultImageDatum extends A
     }
 
     /**
-     * Creates an image datum from a set of properties. The properties map is given
+     * Creates an image datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      *
-     * @param properties  Set of properties. Should contains at least {@code "name"}.
-     * @param pixelInCell the way the image grid is associated with the image data attributes.
+     * @param properties  The properties to be given to the identified object.
+     * @param pixelInCell The way the image grid is associated with the image data attributes.
      */
     public DefaultImageDatum(final Map<String,?> properties, final PixelInCell pixelInCell)
{
         super(properties);
@@ -154,6 +154,8 @@ public class DefaultImageDatum extends A
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -111,11 +111,11 @@ public class DefaultPrimeMeridian extend
     }
 
     /**
-     * Creates a prime meridian from a set of properties. The properties map is given
+     * Creates a prime meridian from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map)
      * super-class constructor}.
      *
-     * @param properties          Set of properties. Should contains at least {@code "name"}.
+     * @param properties          The properties to be given to the identified object.
      * @param greenwichLongitude  The longitude value relative to the Greenwich Meridian.
      * @param angularUnit         The angular unit of the longitude.
      */
@@ -242,6 +242,8 @@ public class DefaultPrimeMeridian extend
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Thu Oct 17 13:55:02 2013
@@ -55,7 +55,7 @@ import java.util.Objects;
  * <b>Example:</b> the following code gets a temporal datum having its origin
at January 1st, 4713 BC at 12:00 UTC:
  *
  * {@preformat java
- *     TemporalDatum pm = GeodeticObjects.Temporal.JULIAN.datum();
+ *     TemporalDatum datum = GeodeticObjects.Temporal.JULIAN.datum();
  * }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
@@ -92,10 +92,10 @@ public class DefaultTemporalDatum extend
     }
 
     /**
-     * Creates a temporal datum from a set of properties. The properties map is given
+     * Creates a temporal datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      *
-     * @param properties Set of properties. Should contains at least {@code "name"}.
+     * @param properties The properties to be given to the identified object.
      * @param origin The date and time origin of this temporal datum.
      */
     public DefaultTemporalDatum(final Map<String,?> properties, final Date origin)
{
@@ -177,6 +177,8 @@ public class DefaultTemporalDatum extend
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -62,7 +62,7 @@ import java.util.Objects;
  * <b>Example:</b> the following code gets a vertical datum for height above
the geoid:
  *
  * {@preformat java
- *     VerticalDatum pm = GeodeticObjects.Vertical.GEOID.datum();
+ *     VerticalDatum datum = GeodeticObjects.Vertical.GEOID.datum();
  * }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
@@ -100,10 +100,10 @@ public class DefaultVerticalDatum extend
     }
 
     /**
-     * Creates a vertical datum from a set of properties. The properties map is given
+     * Creates a vertical datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      *
-     * @param properties Set of properties. Should contains at least {@code "name"}.
+     * @param properties The properties to be given to the identified object.
      * @param type       The type of this vertical datum.
      */
     public DefaultVerticalDatum(final Map<String,?> properties, final VerticalDatumType
type) {
@@ -233,6 +233,8 @@ public class DefaultVerticalDatum extend
 
     /**
      * Computes a hash value consistent with the given comparison mode.
+     *
+     * @return The hash code value for the given comparison mode.
      */
     @Override
     public int hashCode(final ComparisonMode mode) throws IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -45,7 +45,7 @@ final class Sphere extends DefaultEllips
     /**
      * Creates a new sphere using the specified radius.
      *
-     * @param properties    Set of properties. Should contains at least {@code "name"}.
+     * @param properties    The properties to be given to the identified object.
      * @param radius        The equatorial and polar radius.
      * @param ivfDefinitive {@code true} if the inverse flattening is definitive.
      * @param unit          The units of the radius value.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -144,7 +144,7 @@ public enum FunctionProperty {
      *
      * @see #isBijective(Set)
      */
-    private static EnumSet<FunctionProperty> BIJECTIVE = EnumSet.of(INJECTIVE, SURJECTIVE);
+    private static final EnumSet<FunctionProperty> BIJECTIVE = EnumSet.of(INJECTIVE,
SURJECTIVE);
 
     /**
      * Returns {@code true} if a function having the given set of properties is <cite>bijective</cite>.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -183,6 +183,8 @@ public class CodeListSet<E extends CodeL
 
     /**
      * Returns {@code true} if this set does not contains any element.
+     *
+     * @return {@code true} if this set is empty.
      */
     @Override
     public boolean isEmpty() {
@@ -522,7 +524,9 @@ public class CodeListSet<E extends CodeL
     }
 
     /**
-     * Returns a clone of this set.
+     * Returns a new set of the same class containing the same elements than this set.
+     *
+     * @return A clone of this set.
      */
     @Override
     @SuppressWarnings("unchecked")

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java?rev=1533083&r1=1533082&r2=1533083&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/MarshallerPool.java
[UTF-8] Thu Oct 17 13:55:02 2013
@@ -154,7 +154,7 @@ public class MarshallerPool {
      * for the {@code Unmarshaller}, then consider overriding the {@link #createMarshaller()}
      * or {@link #createUnmarshaller()} methods instead.</p>
      *
-     * @param  properties The set of properties to be given to the (un)marshaller, or {@code
null} if none.
+     * @param  properties The properties to be given to the (un)marshaller, or {@code null}
if none.
      * @throws JAXBException If the JAXB context can not be created.
      */
     public MarshallerPool(final Map<String,?> properties) throws JAXBException {
@@ -172,7 +172,7 @@ public class MarshallerPool {
      * or {@link #createUnmarshaller()} methods instead.</p>
      *
      * @param  context The JAXB context.
-     * @param  properties The set of properties to be given to the (un)marshaller, or {@code
null} if none.
+     * @param  properties The properties to be given to the (un)marshaller, or {@code null}
if none.
      * @throws JAXBException If the marshaller pool can not be created.
      */
     @SuppressWarnings({"unchecked", "rawtypes"}) // Generic array creation



Mime
View raw message