sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779142 - in /sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal: converter/ jaxb/
Date Tue, 17 Jan 2017 06:34:53 GMT
Author: desruisseaux
Date: Tue Jan 17 06:34:52 2017
New Revision: 1779142

URL: http://svn.apache.org/viewvc?rev=1779142&view=rev
Log:
Javadoc formatting and minor warning fixes.

Modified:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/AngleConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -35,34 +35,61 @@ import org.apache.sis.math.FunctionPrope
  * @module
  */
 public final class AngleConverter extends SystemConverter<Angle,Double> {
-    /** For cross-version compatibility. */
+    /**
+     * For cross-version compatibility.
+     */
     private static final long serialVersionUID = -5124032874967170238L;
 
-    /** The unique instance. */
+    /**
+     * The unique instance.
+     */
     static final AngleConverter INSTANCE = new AngleConverter();
 
-    /** Creates a new converter. */
-    public AngleConverter() { // Instantiated by ServiceLoader.
+    /**
+     * Creates a new converter.
+     */
+    public AngleConverter() {                           // Instantiated by ServiceLoader.
         super(Angle.class, Double.class);
     }
 
-    /** Returns the unique instance. */
-    @Override public ObjectConverter<Angle,Double> unique() {
+    /**
+     * Returns the unique instance.
+     *
+     * @return unique instance.
+     */
+    @Override
+    public ObjectConverter<Angle,Double> unique() {
         return INSTANCE;
     }
 
-    /** Returns the inverse converter. */
-    @Override public ObjectConverter<Double,Angle> inverse() {
+    /**
+     * Returns the inverse converter.
+     *
+     * @return {@link Inverse}.
+     */
+    @Override
+    public ObjectConverter<Double,Angle> inverse() {
         return Inverse.INSTANCE;
     }
 
-    /** Declares that the converter is bijective. */
-    @Override public Set<FunctionProperty> properties() {
+    /**
+     * Declares that the converter is bijective.
+     *
+     * @return injective and surjective function properties (among others).
+     */
+    @Override
+    public Set<FunctionProperty> properties() {
         return bijective();
     }
 
-    /** Converts the given angle. */
-    @Override public Double apply(final Angle object) {
+    /**
+     * Converts the given angle.
+     *
+     * @param   object  the angle to convert.
+     * @return  angular value in degrees.
+     */
+    @Override
+    public Double apply(final Angle object) {
         return object.degrees();
     }
 
@@ -74,34 +101,61 @@ public final class AngleConverter extend
      * This class is immutable, and thus inherently thread-safe.
      */
     public static final class Inverse extends SystemConverter<Double,Angle> {
-        /** For cross-version compatibility. */
+        /**
+         * For cross-version compatibility.
+         */
         private static final long serialVersionUID = -1736966474591258159L;
 
-        /** The unique instance. */
+        /**
+         * The unique instance.
+         */
         static final Inverse INSTANCE = new Inverse();
 
-        /** Creates a new converter. */
-        public Inverse() { // Instantiated by ServiceLoader.
+        /**
+         * Creates a new converter.
+         */
+        public Inverse() {                              // Instantiated by ServiceLoader.
             super(Double.class, Angle.class);
         }
 
-        /** Returns the unique instance. */
-        @Override public ObjectConverter<Double,Angle> unique() {
+        /**
+         * Returns the unique instance.
+         *
+         * @return the unique instance.
+         */
+        @Override
+        public ObjectConverter<Double,Angle> unique() {
             return INSTANCE;
         }
 
-        /** Returns the inverse converter. */
-        @Override public ObjectConverter<Angle,Double> inverse() {
+        /**
+         * Returns the inverse converter.
+         *
+         * @return {@link AngleConverter}.
+         */
+        @Override
+        public ObjectConverter<Angle,Double> inverse() {
             return AngleConverter.INSTANCE;
         }
 
-        /** Declares that the converter is bijective. */
-        @Override public Set<FunctionProperty> properties() {
+        /**
+         * Declares that the converter is bijective.
+         *
+         * @return injective and surjective function properties (among others).
+         */
+        @Override
+        public Set<FunctionProperty> properties() {
             return bijective();
         }
 
-        /** Converts the given angle. */
-        @Override public Angle apply(final Double object) {
+        /**
+         * Converts the given angle.
+         *
+         * @param  object  angular value in degrees.
+         * @return the angle object for the given value.
+         */
+        @Override
+        public Angle apply(final Double object) {
             return new Angle(object);
         }
     }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CharSequenceConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -55,8 +55,8 @@ final class CharSequenceConverter<T> ext
     /**
      * Creates a new converter from {@link CharSequence} to the given target type.
      *
-     * @param targetClass The target class requested by the user.
-     * @param next The converter to apply after this one.
+     * @param  targetClass  the target class requested by the user.
+     * @param  next         the converter to apply after this one.
      */
     CharSequenceConverter(final Class<T> targetClass, final ObjectConverter<? super String, ? extends T> next) {
         super(CharSequence.class, targetClass);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ClassPair.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -34,8 +34,8 @@ import org.apache.sis.util.Debug;
  * for {@link ConverterRegistry}. Subclasses should also be immutable, but this requirement is not as strong
  * as for {@code ClassPair} (because subclasses are not used as keys in hash map).
  *
- * @param <S> The base type of source objects.
- * @param <T> The base type of converted objects.
+ * @param  <S>  the base type of source objects.
+ * @param  <T>  the base type of converted objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -61,8 +61,8 @@ class ClassPair<S,T> implements Serializ
     /**
      * Creates an entry for the given source and target classes.
      *
-     * @param sourceClass The {@linkplain ObjectConverter#getSourceClass() source class}.
-     * @param targetClass The {@linkplain ObjectConverter#getTargetClass() target class}.
+     * @param  sourceClass  the {@linkplain ObjectConverter#getSourceClass() source class}.
+     * @param  targetClass  the {@linkplain ObjectConverter#getTargetClass() target class}.
      */
     ClassPair(final Class<S> sourceClass, final Class<T> targetClass) {
         this.sourceClass = sourceClass;
@@ -84,7 +84,7 @@ class ClassPair<S,T> implements Serializ
      *
      * The target class is left unchanged.
      *
-     * @return A key for the parent source, or {@code null}.
+     * @return a key for the parent source, or {@code null}.
      */
     final ClassPair<? super S, T> parentSource() {
         final Class<? super S> source;
@@ -94,7 +94,7 @@ class ClassPair<S,T> implements Serializ
             if (interfaces.length == 0) {
                 return null;
             }
-            source = interfaces[0]; // Take only the first interface declaration; ignore others.
+            source = interfaces[0];         // Take only the first interface declaration; ignore others.
         } else {
             source = sourceClass.getSuperclass();
             if (source == null) {
@@ -133,7 +133,7 @@ class ClassPair<S,T> implements Serializ
      * doing the same conversions. However the {@link SystemConverter} subclass overrides this
      * method with an additional safety check.</p>
      *
-     * @param  other The object to compare with this {@code ClassPair}.
+     * @param  other  the object to compare with this {@code ClassPair}.
      * @return {@code true} if the given object is a {@code ClassPair}
      *         having the same source and target classes.
      */

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/CollectionConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -66,7 +66,7 @@ abstract class CollectionConverter<T> ex
         private static final long serialVersionUID = -8680976097058177832L;
 
         @SuppressWarnings("unchecked")
-        public List() { // Instantiated by ServiceLoader.
+        public List() {                                 // Instantiated by ServiceLoader.
             super((Class) java.util.List.class);
         }
 
@@ -90,7 +90,7 @@ abstract class CollectionConverter<T> ex
         private static final long serialVersionUID = -1065360595793529078L;
 
         @SuppressWarnings("unchecked")
-        public Set() { // Instantiated by ServiceLoader.
+        public Set() {                                  // Instantiated by ServiceLoader.
             super((Class) java.util.Set.class);
         }
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -155,11 +155,11 @@ public class ConverterRegistry {
      * If {@code existing} or one of its children is equals to the given {@code converter},
      * returns it. Otherwise returns {@code null}.
      *
-     * @param  <S> The {@code converter} source class.
-     * @param  <T> The {@code converter} target class.
-     * @param  converter The converter to replace by an existing converter, if possible.
-     * @param  existing Existing converter to test.
-     * @return A converter equals to {@code converter}, or {@code null} if none.
+     * @param  <S>        the {@code converter} source class.
+     * @param  <T>        the {@code converter} target class.
+     * @param  converter  the converter to replace by an existing converter, if possible.
+     * @param  existing   existing converter to test.
+     * @return a converter equals to {@code converter}, or {@code null} if none.
      */
     @SuppressWarnings("unchecked")
     private static <S,T> ObjectConverter<S,T> findEquals(ObjectConverter<S,T> converter,
@@ -182,10 +182,10 @@ public class ConverterRegistry {
     /**
      * Returns a converter equals to the given {@code converter}, or {@code null} if none.
      *
-     * @param  <S> The {@code converter} source class.
-     * @param  <T> The {@code converter} target class.
-     * @param  converter The converter to replace by an existing converter, if possible.
-     * @return A converter equals to {@code converter}, or {@code null} if none.
+     * @param  <S>        the {@code converter} source class.
+     * @param  <T>        the {@code converter} target class.
+     * @param  converter  the converter to replace by an existing converter, if possible.
+     * @return a converter equals to {@code converter}, or {@code null} if none.
      */
     @SuppressWarnings("unchecked")
     final <S,T> ObjectConverter<S,T> findEquals(final SystemConverter<S,T> converter) {
@@ -239,9 +239,9 @@ public class ConverterRegistry {
      * {@link #find(Class, Class)} is invoked, because we can not know the set of all
      * sub-classes in advance (and would not necessarily want to register all of them anyway).
      *
-     * @param <S> The class of source value.
-     * @param <T> The class of target (converted) values.
-     * @param converter The converter to register.
+     * @param  <S>        the class of source value.
+     * @param  <T>        the class of target (converted) values.
+     * @param  converter  the converter to register.
      */
     public <S,T> void register(final ObjectConverter<S,T> converter) {
         ArgumentChecks.ensureNonNull("converter", converter);
@@ -334,8 +334,8 @@ public class ConverterRegistry {
      *       chain of fallbacks.</li>
      * </ul>
      *
-     * @param key The key under which to register the converter.
-     * @param converter The converter to register.
+     * @param  key        the key under which to register the converter.
+     * @param  converter  the converter to register.
      */
     @SuppressWarnings("unchecked")
     private <S,T> void register(final ClassPair<S,T> key, ObjectConverter<S, ? extends T> converter) {
@@ -403,11 +403,11 @@ public class ConverterRegistry {
      * ensures that the converter source and target classes are the same ones
      * than the classes given in argument to this method.
      *
-     * @param  <S> The source class.
-     * @param  <T> The target class.
-     * @param  sourceClass The source class.
-     * @param  targetClass The target class, or {@code Object.class} for any.
-     * @return The converter from the specified source class to the target class.
+     * @param  <S>          the source class.
+     * @param  <T>          the target class.
+     * @param  sourceClass  the source class.
+     * @param  targetClass  the target class, or {@code Object.class} for any.
+     * @return the converter from the specified source class to the target class.
      * @throws UnconvertibleObjectException if no converter is found for the given classes.
      */
     @SuppressWarnings("unchecked")
@@ -428,11 +428,11 @@ public class ConverterRegistry {
      * This method may return a converter accepting more generic sources or
      * converting to more specific targets.
      *
-     * @param  <S> The source class.
-     * @param  <T> The target class.
-     * @param  sourceClass The source class.
-     * @param  targetClass The target class, or {@code Object.class} for any.
-     * @return The converter from the specified source class to the target class.
+     * @param  <S>          the source class.
+     * @param  <T>          the target class.
+     * @param  sourceClass  the source class.
+     * @param  targetClass  the target class, or {@code Object.class} for any.
+     * @return the converter from the specified source class to the target class.
      * @throws UnconvertibleObjectException if no converter is found for the given classes.
      */
     public <S,T> ObjectConverter<? super S, ? extends T> find(final Class<S> sourceClass, final Class<T> targetClass)
@@ -450,7 +450,7 @@ public class ConverterRegistry {
              * found on the classpath and try again.
              */
             if (!isInitialized) {
-                isInitialized = true; // Before 'initialize()' for preventing infinite recursivity.
+                isInitialized = true;       // Before 'initialize()' for preventing infinite recursivity.
                 initialize();
                 converter = get(key);
                 if (converter != null) {
@@ -509,11 +509,11 @@ public class ConverterRegistry {
      * would fit, and returns {@code null} in all other cases.
      * Subclasses can override this method in order to generate some converters dynamically.</p>
      *
-     * @param  <S> The source class.
-     * @param  <T> The target class.
-     * @param  sourceClass The source class.
-     * @param  targetClass The target class, or {@code Object.class} for any.
-     * @return A newly generated converter from the specified source class to the target class,
+     * @param  <S>          the source class.
+     * @param  <T>          the target class.
+     * @param  sourceClass  the source class.
+     * @param  targetClass  the target class, or {@code Object.class} for any.
+     * @return a newly generated converter from the specified source class to the target class,
      *         or {@code null} if none.
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -530,7 +530,7 @@ public class ConverterRegistry {
      * of those leafs are {@link FallbackConverter}s which delegate their work to the
      * leafs.
      *
-     * @return A string representation of registered converters.
+     * @return a string representation of registered converters.
      */
     @Debug
     @Override

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -51,8 +51,8 @@ import org.apache.sis.util.Debug;
  * This class is immutable, and thus inherently thread-safe,
  * if the converters given to the static factory method are also immutable.
  *
- * @param <S> The base type of source objects.
- * @param <T> The base type of converted objects.
+ * @param  <S>  the base type of source objects.
+ * @param  <T>  the base type of converted objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -83,10 +83,10 @@ final class FallbackConverter<S,T> exten
      * Creates a converter using the given primary and fallback converters. This method may
      * interchange the two converters in order to meet the {@linkplain #fallback} contract.
      *
-     * @param sourceClass The {@linkplain #getSourceClass() source class}.
-     * @param targetClass The {@linkplain #getTargetClass() target class}.
-     * @param primary     A first converter.
-     * @param fallback    A second converter.
+     * @param  sourceClass  the {@linkplain #getSourceClass() source class}.
+     * @param  targetClass  the {@linkplain #getTargetClass() target class}.
+     * @param  primary      a first converter.
+     * @param  fallback     a second converter.
      *
      * @see #create(ObjectConverter, ObjectConverter)
      */
@@ -108,8 +108,8 @@ final class FallbackConverter<S,T> exten
      * Returns {@code true} if the given primary and fallback converters should be interchanged.
      * This method may invoke itself recursively.
      *
-     * @param  primary The primary converter to test.
-     * @param  fallbackClass The target class of the fallback converter to test.
+     * @param  primary        the primary converter to test.
+     * @param  fallbackClass  the target class of the fallback converter to test.
      * @return {@code true} if the given primary and fallback converters should be interchanged.
      */
     private static <S> boolean needSwap(final ObjectConverter<S,?> primary, final Class<?> fallbackClass) {
@@ -145,11 +145,11 @@ final class FallbackConverter<S,T> exten
      * This restriction exists because the tree built in such case would probably not be the
      * desired one. It should be okay if only SIS code deal with {@code FallbackConverter}.
      *
-     * @param  <S> The base type of source objects.
-     * @param  <T> The base type of converted objects.
-     * @param  primary The first converter, which may be a {@code Fallback} tree.
-     * @param  fallback A new fallback to insert in the converters tree.
-     * @return A tree of converters which contains the given {@code converter}. May be either
+     * @param  <S>       the base type of source objects.
+     * @param  <T>       the base type of converted objects.
+     * @param  primary   the first converter, which may be a {@code Fallback} tree.
+     * @param  fallback  a new fallback to insert in the converters tree.
+     * @return a tree of converters which contains the given {@code converter}. May be either
      *         {@code existing}, {@code converter} or a new {@code FallbackConverter} instance.
      */
     public static <S,T> ObjectConverter<S, ? extends T> merge(
@@ -210,12 +210,12 @@ final class FallbackConverter<S,T> exten
      * <strong>not</strong> a {@code FallbackConverter} instance.
      * See {@link #merge(ObjectConverter, ObjectConverter)} javadoc for more information.</p>
      *
-     * @param  <S> The source class of the {@code branch} converter.
-     * @param  <T> The target class of the {@code branch} converter
-     * @param  branch The converter to eventually merge with {@code converter}.
-     * @param  converter The converter to eventually merge with {@code branch}.
-     * @param  parentTarget To be given verbatim to {@link #merge(ObjectConverter, Class)}.
-     * @return The merged converter, or {@code null} if the {@code converter}
+     * @param  <S>           the source class of the {@code branch} converter.
+     * @param  <T>           the target class of the {@code branch} converter
+     * @param  branch        the converter to eventually merge with {@code converter}.
+     * @param  converter     the converter to eventually merge with {@code branch}.
+     * @param  parentTarget  to be given verbatim to {@link #merge(ObjectConverter, Class)}.
+     * @return the merged converter, or {@code null} if the {@code converter}
      *         target class is not a subtype of the {@code branch} target class.
      */
     private static <S,T> ObjectConverter<S, ? extends T> mergeIfSubtype(
@@ -258,10 +258,10 @@ final class FallbackConverter<S,T> exten
      * other {@code FallbackConverter} instances, then this method will follow those
      * branches.
      *
-     * @param  converter The converter to merge with {@code this}.
-     * @param  parentTarget If this method is invoked recursively, the target class
+     * @param  converter     the converter to merge with {@code this}.
+     * @param  parentTarget  if this method is invoked recursively, the target class
      *         of the parent {@code FallbackConverter}. Otherwise {@code null}.
-     * @return The merged converter.
+     * @return the merged converter.
      */
     private ObjectConverter<S, ? extends T> merge(final ObjectConverter<S, ? extends T> converter,
             final Class<? super T> parentTarget)
@@ -330,8 +330,8 @@ final class FallbackConverter<S,T> exten
      * Creates a node for the given converter and adds it to the given tree.
      * This method invokes itself recursively for scanning through fallbacks.
      *
-     * @param converter The converter for which to create a tree.
-     * @param addTo The node in which to add the converter.
+     * @param  converter  the converter for which to create a tree.
+     * @param  addTo      the node in which to add the converter.
      */
     private void toTree(final ObjectConverter<?,?> converter, TreeTable.Node addTo) {
         if (converter instanceof FallbackConverter<?,?>) {
@@ -346,11 +346,10 @@ final class FallbackConverter<S,T> exten
     }
 
     /**
-     * Adds a simplified tree representation of this {@code FallbackConverter}
-     * to the given node.
+     * Adds a simplified tree representation of this {@code FallbackConverter} to the given node.
      *
-     * @param addTo The node in which to add the converter.
-     * @param isNew {@code true} if {@code addTo} is a newly created node.
+     * @param  addTo  the node in which to add the converter.
+     * @param  isNew  {@code true} if {@code addTo} is a newly created node.
      */
     final void toTree(final TreeTable.Node addTo, final boolean isNew) {
         if (isNew) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/IdentityConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -28,8 +28,8 @@ import org.apache.sis.math.FunctionPrope
  * <div class="section">Immutability and thread safety</div>
  * This class is immutable and thus inherently thread-safe.
  *
- * @param <S> The base type of source objects.
- * @param <T> The base type of converted objects.
+ * @param  <S>  the base type of source objects.
+ * @param  <T>  the base type of converted objects.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
@@ -52,9 +52,9 @@ public final class IdentityConverter<S e
     /**
      * Creates a new identity converter.
      *
-     * @param sourceClass The {@linkplain #getSourceClass() source class}.
-     * @param targetClass The {@linkplain #getTargetClass() target class}.
-     * @param inverse     The inverse converter, or {@code null} if none.
+     * @param  sourceClass  the {@linkplain #getSourceClass() source class}.
+     * @param  targetClass  the {@linkplain #getTargetClass() target class}.
+     * @param  inverse      the inverse converter, or {@code null} if none.
      */
     @SuppressWarnings("unchecked")
     public IdentityConverter(final Class<S> sourceClass, final Class<T> targetClass,
@@ -74,7 +74,7 @@ public final class IdentityConverter<S e
      * for bulk operations between {@code EnumSet} instances. Those optimizations are lost (at
      * least on JDK6) is we wrap the {@code EnumSet} in a {@code Collections.unmodifiableSet} view.
      *
-     * @return The manners in which source values are mapped to target values.
+     * @return the manners in which source values are mapped to target values.
      */
     @Override
     public Set<FunctionProperty> properties() {
@@ -88,7 +88,7 @@ public final class IdentityConverter<S e
     /**
      * Returns the inverse converter, if any.
      *
-     * @return A converter for converting instances of <var>T</var> back to instances of <var>S</var>.
+     * @return a converter for converting instances of <var>T</var> back to instances of <var>S</var>.
      */
     @Override
     public ObjectConverter<T,S> inverse() throws UnsupportedOperationException {
@@ -98,8 +98,8 @@ public final class IdentityConverter<S e
     /**
      * Returns the given object unchanged.
      *
-     * @param source The value to convert.
-     * @return The given value unchanged.
+     * @param  source  the value to convert.
+     * @return the given value unchanged.
      */
     @Override
     public T apply(final S source) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/NumberConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -43,8 +43,8 @@ import org.apache.sis.util.resources.Err
  * <div class="section">Immutability and thread safety</div>
  * This class and all inner classes are immutable, and thus inherently thread-safe.
  *
- * @param <S> The source number type.
- * @param <T> The target number type.
+ * @param  <S>  the source number type.
+ * @param  <T>  the target number type.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -80,8 +80,10 @@ final class NumberConverter<S extends Nu
      */
     @Override
     public ObjectConverter<T,S> inverse() throws UnsupportedOperationException {
-        // No need to synchronize. This is not a big deal if the same object is fetched twice.
-        // The ConverterRegistry clas provides the required synchronization.
+        /*
+         * No need to synchronize. This is not a big deal if the same object is fetched twice.
+         * The ConverterRegistry clas provides the required synchronization.
+         */
         ObjectConverter<T,S> candidate = inverse;
         if (candidate == null) try {
             inverse = candidate = SystemRegistry.INSTANCE.findExact(targetClass, sourceClass);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ObjectToString.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -37,7 +37,7 @@ import org.apache.sis.math.FunctionPrope
  * <div class="section">Immutability and thread safety</div>
  * This base class and all inner classes are immutable, and thus inherently thread-safe.
  *
- * @param <S> The source type.
+ * @param  <S>  the source type.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -94,7 +94,7 @@ class ObjectToString<S> extends SystemCo
     @Override
     public final ObjectConverter<S, String> unique() {
         if (inverse != null) {
-            return inverse.unique().inverse(); // Will typically delegate to StringConverter.
+            return inverse.unique().inverse();              // Will typically delegate to StringConverter.
         }
         return this;
     }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -19,6 +19,8 @@ package org.apache.sis.internal.converte
 import java.util.Set;
 import java.util.EnumSet;
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.net.URL;
 import java.net.URI;
 import java.net.MalformedURLException;
@@ -27,10 +29,6 @@ import org.apache.sis.math.FunctionPrope
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.UnconvertibleObjectException;
 
-// Branch-specific import
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 
 /**
  * Handles conversions between {@link Path}, {@link File}, {@link URI} and {@link URL} objects.
@@ -69,9 +67,9 @@ abstract class PathConverter<S,T> extend
      * This method verifies that the given path is non-null,
      * then delegates to {@link #doConvert(S)}.
      *
-     * @param  source The path to convert, or {@code null}.
-     * @return The converted value, or {@code null} if the given path was null.
-     * @throws UnconvertibleObjectException If an error occurred during the conversion.
+     * @param  source  the path to convert, or {@code null}.
+     * @return the converted value, or {@code null} if the given path was null.
+     * @throws UnconvertibleObjectException if an error occurred during the conversion.
      */
     @Override
     public final T apply(final S source) throws UnconvertibleObjectException {
@@ -89,9 +87,9 @@ abstract class PathConverter<S,T> extend
      * Invoked by {@link #apply(Object)} for converting the given path to the target
      * type of this converter.
      *
-     * @param  source The path to convert, guaranteed to be non-null.
-     * @return The converted path.
-     * @throws Exception If an error occurred during the conversion.
+     * @param  source  the path to convert, guaranteed to be non-null.
+     * @return the converted path.
+     * @throws Exception if an error occurred during the conversion.
      */
     abstract T doConvert(S source) throws Exception;
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -124,7 +124,7 @@ abstract class StringConverter<T> extend
      *
      * @param  source  the string to convert, or {@code null}.
      * @return The converted value, or {@code null} if the given string was null or empty.
-     * @throws UnconvertibleObjectException If an error occurred during the conversion.
+     * @throws UnconvertibleObjectException if an error occurred during the conversion.
      */
     @Override
     public final T apply(String source) throws UnconvertibleObjectException {
@@ -147,7 +147,7 @@ abstract class StringConverter<T> extend
      *
      * @param  source  the string to convert, guaranteed to be non-null and non-empty.
      * @return The converted value.
-     * @throws Exception If an error occurred during the conversion.
+     * @throws Exception if an error occurred during the conversion.
      */
     abstract T doConvert(String source) throws Exception;
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -35,8 +35,8 @@ import org.apache.sis.util.resources.Err
  * <p>This base class is stateless. Consequently sub-classes that choose to implement
  * {@link java.io.Serializable} do not need to care about this base class.</p>
  *
- * @param <S> The type of objects to convert.
- * @param <T> The type of converted objects.
+ * @param  <S>  the type of objects to convert.
+ * @param  <T>  the type of converted objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -32,8 +32,8 @@ import org.apache.sis.util.resources.Err
  * This base class is immutable, and thus inherently thread-safe. Subclasses should be immutable
  * and thread-safe too if they are intended to be cached in {@link ConverterRegistry}.
  *
- * @param <S> The base type of source objects.
- * @param <T> The base type of converted objects.
+ * @param  <S>  the base type of source objects.
+ * @param  <T>  the base type of converted objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -141,7 +141,7 @@ public final class SystemRegistry extend
      *       many of them, and a generic code is available for all of them.</li>
      * </ul>
      *
-     * @return A newly generated converter from the specified source class to the target class,
+     * @return a newly generated converter from the specified source class to the target class,
      *         or {@code null} if none.
      */
     @Override
@@ -158,7 +158,7 @@ public final class SystemRegistry extend
          * to java.util.Date was created by the super class, that conversion would not contain
          * an inverse conversion from java.util.Date to java.sql.Date.
          */
-        if (tryInverse(targetClass) && !tryInverse(sourceClass)) { // The ! is for preventing infinite recursivity.
+        if (tryInverse(targetClass) && !tryInverse(sourceClass)) {     // The ! is for preventing infinite recursivity.
             try {
                 return findExact(targetClass, sourceClass).inverse();
             } catch (UnconvertibleObjectException e) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/AdapterReplacement.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -54,7 +54,7 @@ public interface AdapterReplacement {
      * }
      *
      * @param  marshaller The marshaller to be configured.
-     * @throws JAXBException If the given marshaller can not be configured.
+     * @throws JAXBException if the given marshaller can not be configured.
      */
     void register(Marshaller marshaller) throws JAXBException;
 
@@ -67,7 +67,7 @@ public interface AdapterReplacement {
      * }
      *
      * @param  unmarshaller The unmarshaller to be configured.
-     * @throws JAXBException If the given unmarshaller can not be configured.
+     * @throws JAXBException if the given unmarshaller can not be configured.
      */
     void register(Unmarshaller unmarshaller) throws JAXBException;
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -33,6 +33,7 @@ import org.apache.sis.util.Debug;
 import org.apache.sis.xml.XLink;
 import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
+import org.apache.sis.internal.util.Utilities;
 import org.apache.sis.internal.util.SetOfUnknownSize;
 
 import static org.apache.sis.util.collection.Containers.hashMapCapacity;
@@ -395,7 +396,7 @@ public class IdentifierMapAdapter extend
      * @version 0.7
      * @module
      */
-    @SuppressWarnings("serial") // Not intended to be serialized.
+    @SuppressWarnings("serial")                 // Not intended to be serialized.
     private static final class Iter extends HashMap<Citation,Boolean> implements Iterator<Entry<Citation,String>> {
         /**
          * An iterator over the {@link IdentifierMapAdapter#identifiers} collection,
@@ -510,6 +511,24 @@ public class IdentifierMapAdapter extend
             it.remove();
             put(authority, Boolean.TRUE);
         }
+
+        /**
+         * Iterators are not intended to be cloned.
+         */
+        @Override
+        @SuppressWarnings("CloneDoesntCallSuperClone")
+        public Object clone() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Returns the next value to be returned, for debugging purpose only.
+         */
+        @Debug
+        @Override
+        public String toString() {
+            return Utilities.toString(Iter.class, "next", next);
+        }
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -67,7 +67,7 @@ final class IdentifierMapEntry extends A
     /**
      * Infers a code space from the authority.
      *
-     * @return The code space, or {@code null} if none.
+     * @return the code space, or {@code null} if none.
      *
      * @since 0.5
      */

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMap.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.internal.jaxb;
 
 import java.net.URI;
+import java.util.Objects;
 import java.util.Iterator;
 import java.util.Collection;
 import java.net.URISyntaxException;
@@ -27,9 +28,6 @@ import org.apache.sis.xml.IdentifierSpac
 import org.apache.sis.xml.ValueConverter;
 import org.apache.sis.xml.XLink;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * A map of identifiers which support {@code put} and {@code remove} operations.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -60,7 +60,7 @@ import org.apache.sis.xml.IdentifierSpac
  *     }
  * }
  *
- * @param <T> The type of object used as identifier values.
+ * @param  <T>  the type of object used as identifier values.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/PrimitiveTypeProperties.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -81,8 +81,8 @@ public final class PrimitiveTypeProperti
      * The {@code primitive} argument shall be a specific instance created by the {@code new} keyword, not
      * a shared instance link {@link Boolean#FALSE} or the values returned by {@link Integer#valueOf(int)}.
      *
-     * @param primitive The {@link Boolean}, {@link Integer}, {@link Double} or {@link String} specific instance.
-     * @param property  The {@link NilReason} or other property to associate to the given instance.
+     * @param  primitive  the {@link Boolean}, {@link Integer}, {@link Double} or {@link String} specific instance.
+     * @param  property   the {@link NilReason} or other property to associate to the given instance.
      */
     public static void associate(final Object primitive, final Object property) {
         assert isValidKey(primitive) : primitive;
@@ -98,8 +98,8 @@ public final class PrimitiveTypeProperti
     /**
      * Returns the property of the given primitive type, or {@code null} if none.
      *
-     * @param  primitive The {@link Boolean}, {@link Integer}, {@link Double} or {@link String} specific instance.
-     * @return The property associated to the given instance, or {@code null} if none.
+     * @param  primitive  the {@link Boolean}, {@link Integer}, {@link Double} or {@link String} specific instance.
+     * @return the property associated to the given instance, or {@code null} if none.
      */
     public static Object property(final Object primitive) {
         // No 'assert isValidKey(primitive)' because this method is sometime invoked

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java?rev=1779142&r1=1779141&r2=1779142&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] Tue Jan 17 06:34:52 2017
@@ -70,7 +70,7 @@ public abstract class TypeRegistration {
      * Adds to the given collection every types that should be given to
      * the initial JAXB context.
      *
-     * @param addTo The collection in which to add new types.
+     * @param  addTo  the collection in which to add new types.
      */
     public abstract void getTypes(final Collection<Class<?>> addTo);
 
@@ -82,7 +82,7 @@ public abstract class TypeRegistration {
      * <p>The list of classes is determined dynamically from the SIS modules found on
      * the classpath.</p>
      *
-     * @return The default set of classes to be bound to the {@code JAXBContext}.
+     * @return the default set of classes to be bound to the {@code JAXBContext}.
      */
     private static Class<?>[] defaultClassesToBeBound() {
         /*
@@ -103,8 +103,8 @@ public abstract class TypeRegistration {
      * Note that the {@code JAXBContext} class is thread safe, but the {@code Marshaller},
      * {@code Unmarshaller}, and {@code Validator} classes are not thread safe.
      *
-     * @return The shared JAXB context.
-     * @throws JAXBException If an error occurred while creating the JAXB context.
+     * @return the shared JAXB context.
+     * @throws JAXBException if an error occurred while creating the JAXB context.
      */
     public static synchronized JAXBContext getSharedContext() throws JAXBException {
         final Reference<JAXBContext> c = context;



Mime
View raw message