sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1789948 [18/23] - in /sis/branches/JDK7: ./ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-console/src/test/java/org/apache/sis/console/ application/sis-console/src/test/java/org/apache/sis/test/suite/ applic...
Date Mon, 03 Apr 2017 10:58:07 GMT
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -77,17 +77,18 @@ import org.apache.sis.util.Numbers;
  * and thus inherently thread-safe. Other subclasses may or may not be immutable, at implementation choice.
  * But implementors are encouraged to make sure that all subclasses remain immutable for more predictable behavior.
  *
- * @param  <E>  the type of range elements, typically a {@link Number} subclass or {@link java.util.Date}.
- *
  * @author  Joe White
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Jody Garnett (for parameterized type inspiration)
- * @since   0.3
  * @version 0.8
- * @module
+ *
+ * @param <E>  the type of range elements, typically a {@link Number} subclass or {@link java.util.Date}.
  *
  * @see RangeFormat
  * @see org.apache.sis.util.collection.RangeSet
+ *
+ * @since 0.3
+ * @module
  */
 public class Range<E extends Comparable<? super E>> implements CheckedContainer<E>, Formattable, Emptiable, Serializable {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/RangeFormat.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -89,12 +89,13 @@ import org.apache.sis.internal.util.Loca
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.8
- * @module
  *
  * @see Range#toString()
  * @see <a href="http://en.wikipedia.org/wiki/ISO_31-11">Wikipedia: ISO 31-11</a>
+ *
+ * @since 0.3
+ * @module
  */
 public class RangeFormat extends Format {
     /**
@@ -128,8 +129,8 @@ public class RangeFormat extends Format
      * {@link RangeFormat#formatToCharacterIterator(Object)}.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     public static final class Field extends FormatField {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SexagesimalConverter.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -41,8 +41,8 @@ import static org.apache.sis.math.MathFu
  * This class and all inner classes are immutable, and thus inherently thread-safe.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 class SexagesimalConverter extends AbstractConverter {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -40,11 +40,12 @@ import org.apache.sis.math.Fraction;
  * units otherwise. No other type is allowed since {@code SystemUnit} is always a combination of fundamental units
  * without scale factor or offset.
  *
- * @param  <Q>  the kind of quantity to be measured using this units.
- *
  * @author  Martin Desruisseaux (MPO, Geomatys)
- * @since   0.8
  * @version 0.8
+ *
+ * @param <Q>  the kind of quantity to be measured using this units.
+ *
+ * @since 0.8
  * @module
  */
 final class SystemUnit<Q extends Quantity<Q>> extends AbstractUnit<Q> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -58,8 +58,8 @@ import org.apache.sis.internal.jdk8.BiFu
  * All {@code UnitDimension} instances are immutable and thus inherently thread-safe.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.8
  * @version 0.8
+ * @since   0.8
  * @module
  */
 final class UnitDimension implements Dimension, Serializable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitFormat.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -71,11 +71,12 @@ import org.apache.sis.util.iso.DefaultNa
  * different threads.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.8
  * @version 0.8
- * @module
  *
  * @see Units#valueOf(String)
+ *
+ * @since 0.8
+ * @module
  */
 public class UnitFormat extends Format implements javax.measure.format.UnitFormat, Localized {
     /**
@@ -130,11 +131,11 @@ public class UnitFormat extends Format i
      * </ul>
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.8
      * @version 0.8
+     * @since   0.8
      * @module
      */
-    public static enum Style {
+    public enum Style {
         /**
          * Format unit symbols using Unicode characters. Units formatted in this style use superscript digits
          * for exponents (as in “m³”), the dot operator (“⋅”) for multiplications, specialized characters when

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitRegistry.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -37,8 +37,8 @@ import org.apache.sis.util.collection.We
  * rather uses the static methods directly since we define all units in terms of SI.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.8
  * @version 0.8
+ * @since   0.8
  * @module
  */
 final class UnitRegistry implements SystemOfUnits, Serializable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -43,8 +43,8 @@ import org.apache.sis.util.Characters;
  * without direct dependency. A {@code UnitServices} instance can be obtained by call to {@link #current()}.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.8
  * @version 0.8
+ * @since   0.8
  * @module
  */
 public class UnitServices extends ServiceProvider implements SystemOfUnitsService, UnitFormatService {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -73,8 +73,8 @@ import static org.apache.sis.measure.Sex
  * </table>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 public final class Units extends Static {
@@ -450,9 +450,9 @@ public final class Units extends Static
      *   <tr><td>Derived units:</td>    <td style="word-spacing:1em">{@link #METRES_PER_SECOND}, {@link #HERTZ}.</td></tr>
      * </table></div>
      *
-     * @since 0.3
-     *
      * @see java.util.concurrent.TimeUnit#MILLISECONDS
+     *
+     * @since 0.3
      */
     public static final Unit<Time> MILLISECOND;
 
@@ -1698,9 +1698,9 @@ public final class Units extends Static
      * @param  inAxis {@code true} for a unit used in Coordinate System Axis definition.
      * @return the EPSG code of the given units, or {@code null} if unknown.
      *
-     * @since 0.4
-     *
      * @see org.apache.sis.referencing.cs.CoordinateSystems#getEpsgCode(Unit, AxisDirection...)
+     *
+     * @since 0.4
      */
     public static Integer getEpsgCode(Unit<?> unit, final boolean inAxis) {
         if (unit != null) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -68,11 +68,12 @@ import java.lang.annotation.RetentionPol
  * classes.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see NumberRange#NumberRange(Class, ValueRange)
+ *
+ * @since 0.3
+ * @module
  */
 @Documented
 @Target({ElementType.FIELD, ElementType.METHOD})

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/package-info.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -60,8 +60,8 @@
  * </ul>
  *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 package org.apache.sis.measure;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/About.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/About.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/About.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/About.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -80,8 +80,8 @@ import static org.apache.sis.internal.ut
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 public enum About {
@@ -601,7 +601,7 @@ pathTree:   for (int j=0; ; j++) {
             }
             final File file = entry.getKey();
             if (file.isFile() && file.canRead()) {
-                try (final JarFile jar = new JarFile(file)) {
+                try (JarFile jar = new JarFile(file)) {
                     final Manifest manifest = jar.getManifest();
                     if (manifest != null) {
                         final Attributes attributes = manifest.getMainAttributes();

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -53,8 +53,8 @@ import java.io.BufferedReader;
  * for writing the database; see above-cited web page for more information).
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.7
  * @version 0.7
+ * @since   0.7
  * @module
  */
 public abstract class InstallationResources {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -60,11 +60,12 @@ import org.apache.sis.internal.system.Mo
  *     }
  * }
  *
- * @param  <T>  the type of option values.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.8
+ *
+ * @param <T>  the type of option values.
+ *
+ * @since 0.3
  * @module
  */
 public class OptionKey<T> implements Serializable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/package-info.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -19,8 +19,8 @@
  * Provides information and some controls about SIS configuration.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.7
+ * @since   0.3
  * @module
  */
 package org.apache.sis.setup;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -80,8 +80,8 @@ import org.apache.sis.util.resources.Err
  * in the {@linkplain java.util.Locale#getDefault() default locale} if the check failed.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.6
+ * @since   0.3
  * @module
  */
 public final class ArgumentChecks extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -67,11 +67,12 @@ import java.lang.reflect.Array;
  * objects.
  *
  * @author Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.4
- * @module
  *
  * @see Arrays
+ *
+ * @since 0.3
+ * @module
  */
 @SuppressWarnings("ReturnOfCollectionOrArrayField")     // Array constants in this class are immutable empty arrays.
 public final class ArraysExt extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -72,11 +72,12 @@ import static java.lang.Character.*;
  * {@code 0} or {@code false} primitive type calculated as if the input was an empty string.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.7
- * @module
  *
  * @see StringBuilders
+ *
+ * @since 0.3
+ * @module
  */
 public final class CharSequences extends Static {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Characters.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.util.resources.Err
  * symbols. For those symbols, constants are declared in this class.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.6
+ * @since   0.3
  * @module
  */
 public final class Characters extends Static {
@@ -306,13 +306,14 @@ public final class Characters extends St
      * left are {@linkplain #LETTERS_AND_DIGITS letters and digits}.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
-     * @module
      *
      * @see java.lang.Character.Subset
      * @see Character#getType(int)
      * @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#139">WKT 2 specification §B.5</a>
+     *
+     * @since 0.3
+     * @module
      */
     public static class Filter extends Character.Subset {
         /*

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -50,8 +50,8 @@ import static org.apache.sis.util.collec
  * </ul>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.5
+ * @since   0.3
  * @module
  */
 public final class Classes extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ComparisonMode.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -41,12 +41,13 @@ package org.apache.sis.util;
  * {@link #IGNORE_METADATA} level but not necessarily at the {@link #STRICT} level.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.7
- * @module
  *
  * @see LenientComparable#equals(Object, ComparisonMode)
  * @see Utilities#deepEquals(Object, Object, ComparisonMode)
+ *
+ * @since 0.3
+ * @module
  */
 public enum ComparisonMode {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Configuration.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -28,8 +28,8 @@ import java.lang.annotation.RetentionPol
  * See <cite>"Use"</cite> javadoc link for a list of annotated methods.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 @Documented

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -58,8 +58,8 @@ import org.opengis.referencing.Identifie
  * ignored by the user.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
  * @version 0.6
+ * @since   0.5
  * @module
  */
 public class CorruptedObjectException extends RuntimeException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Debug.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Debug.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Debug.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Debug.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -37,8 +37,8 @@ import java.lang.annotation.RetentionPol
  * developers and may change in any future version.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 @Documented

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Deprecable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -41,8 +41,8 @@ import org.opengis.util.InternationalStr
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public interface Deprecable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Disposable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -45,13 +45,14 @@ package org.apache.sis.util;
  * Error during {@code dispose()} execution should not result in any lost of data.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see java.awt.Graphics#dispose()
  * @see javax.imageio.ImageReader#dispose()
  * @see javax.imageio.ImageWriter#dispose()
+ *
+ * @since 0.3
+ * @module
  */
 public interface Disposable {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -36,8 +36,8 @@ package org.apache.sis.util;
  * {@code isEmpty()} methods when the caller need to check for both {@code Collection} and {@code Emptiable} interfaces.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.4
  * @version 0.4
+ * @since   0.4
  * @module
  */
 public interface Emptiable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -28,8 +28,8 @@ import org.apache.sis.util.resources.Voc
  * Static methods working with {@link Exception} instances.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 public final class Exceptions extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -98,8 +98,8 @@ package org.apache.sis.util;
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public interface LenientComparable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -46,8 +46,8 @@ import static org.apache.sis.util.collec
  * }
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.4
+ * @since   0.3
  * @module
  */
 public final class Locales extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -24,8 +24,8 @@ import java.util.Locale;
  * Those classes are often parsers or formatters.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public interface Localized {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LocalizedException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LocalizedException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LocalizedException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/LocalizedException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -46,12 +46,13 @@ import org.opengis.util.InternationalStr
  * other exception usually lost their localization capability.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.8
  * @version 0.8
- * @module
  *
  * @see Exceptions#getLocalizedMessage(Throwable, Locale)
  * @see org.apache.sis.storage.DataStore#setLocale(Locale)
+ *
+ * @since 0.8
+ * @module
  */
 public interface LocalizedException {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -18,7 +18,7 @@ package org.apache.sis.util;
 
 
 /**
- * Throws when a null argument has been given to a method that doesn't accept them.
+ * Thrown when a null argument has been given to a method that doesn't accept them.
  * This exception extends {@link NullPointerException} in order to stress out that
  * the error is an illegal argument rather than an unexpected usage of a null pointer
  * inside a method body.
@@ -29,11 +29,12 @@ package org.apache.sis.util;
  * is now the recommended one in the <cite>Effective Java</cite> book.</div>
  *
  * @author Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see ArgumentChecks#ensureNonNull(String, Object)
+ *
+ * @since 0.3
+ * @module
  */
 public class NullArgumentException extends NullPointerException {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -37,11 +37,12 @@ import static java.lang.Double.doubleToL
  * Static methods working with {@link Number} objects, and a few primitive types by extension.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see org.apache.sis.math.MathFunctions
+ *
+ * @since 0.3
+ * @module
  */
 @SuppressWarnings({
     "UnnecessaryBoxing",

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -71,15 +71,16 @@ import org.apache.sis.internal.jdk8.Func
  *       can be declared as an injective function if the other values meet the criteria.
  * </ul>
  *
- * @param <S> The type of objects to convert.
- * @param <T> The type of converted objects.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
+ *
+ * @param <S>  the type of objects to convert.
+ * @param <T>  the type of converted objects.
  *
  * @see ObjectConverters
+ *
+ * @since 0.3
+ * @module
  */
 public interface ObjectConverter<S,T> extends Function<S,T> {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -59,11 +59,12 @@ import org.apache.sis.internal.converter
  * </div>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see ObjectConverter
+ *
+ * @since 0.3
+ * @module
  */
 public final class ObjectConverters extends Static {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -99,8 +99,8 @@ package org.apache.sis.util;
  * </table>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public class Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -34,11 +34,12 @@ import static java.lang.Character.*;
  * the <cite>Basic Multilingual Plane</cite> (BMP).
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.8
- * @module
  *
  * @see CharSequences
+ *
+ * @since 0.3
+ * @module
  */
 public final class StringBuilders extends Static {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -27,8 +27,8 @@ package org.apache.sis.util;
  * will be an arbitrary item of this list.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public class UnconvertibleObjectException extends IllegalArgumentException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnknownNameException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnknownNameException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnknownNameException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnknownNameException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -27,8 +27,8 @@ package org.apache.sis.util;
  * the exception for unrecognized identifiers is rather {@link org.opengis.util.NoSuchIdentifierException}.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
  * @version 0.5
+ * @since   0.5
  * @module
  */
 public class UnknownNameException extends RuntimeException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -26,8 +26,8 @@ import org.apache.sis.util.resources.Err
  * <a href="http://www.geoapi.org">GeoAPI</a> interface.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public class UnsupportedImplementationException extends UnsupportedOperationException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -30,8 +30,8 @@ import org.apache.sis.util.collection.Ch
  * Static methods for object comparisons in different ways (deeply, approximatively, <i>etc</i>).
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public final class Utilities extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Version.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Version.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -41,8 +41,8 @@ import static org.apache.sis.internal.sy
  * encouraged to make sure that subclasses remain immutable for more predictable behavior.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.4
+ * @since   0.3
  * @module
  */
 public class Version implements CharSequence, Comparable<Version>, Serializable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -34,8 +34,8 @@ import java.lang.annotation.RetentionPol
  * part.</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 @Documented

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -49,8 +49,8 @@ import java.sql.SQLException;
  * of exceptions for robustness.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public class BackingStoreException extends RuntimeException {
@@ -98,10 +98,8 @@ public class BackingStoreException exten
      * or re-throw the exception. More specifically, this method makes the following choices:
      *
      * <ul>
-     *   <li>If the cause {@linkplain Class#isInstance(Object) is an instance} of the given
-     *       type, returns the cause.</li>
-     *   <li>Otherwise if the cause is an instance of {@link RuntimeException}, throws
-     *       that exception.</li>
+     *   <li>If the cause {@linkplain Class#isInstance(Object) is an instance} of the given type, returns the cause.</li>
+     *   <li>Otherwise if the cause is an instance of {@link RuntimeException}, throws that exception.</li>
      *   <li>Otherwise re-throws {@code this}.</li>
      * </ul>
      *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -129,12 +129,13 @@ import org.apache.sis.internal.jdk8.Supp
  * then creating <var>B</var> is not allowed to implies (directly or indirectly) the creation of
  * <var>A</var>. If this rule is not meet, deadlock may occur randomly.
  *
- * @param  <K>  the type of key objects.
- * @param  <V>  the type of value objects.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.4
+ *
+ * @param <K>  the type of key objects.
+ * @param <V>  the type of value objects.
+ *
+ * @since 0.3
  * @module
  */
 public class Cache<K,V> extends AbstractMap<K,V> {
@@ -184,7 +185,7 @@ public class Cache<K,V> extends Abstract
     /**
      * A view over the entries in the cache.
      */
-    private volatile transient Set<Entry<K,V>> entries;
+    private transient volatile Set<Entry<K,V>> entries;
 
     /**
      * Creates a new cache with a default initial capacity and cost limit of 100.
@@ -561,8 +562,8 @@ public class Cache<K,V> extends Abstract
      * @param  <V>  the type of value objects.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     public interface Handler<V> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -35,12 +35,13 @@ import java.lang.ref.Reference;
  * <div class="section">Thread safety</div>
  * This class is thread-safe if and only if the {@code Set} given to the constructor is thread-safe.
  *
- * @param  <K>  the type of key objects.
- * @param  <V>  the type of value objects.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <K>  the type of key objects.
+ * @param <V>  the type of value objects.
+ *
+ * @since 0.3
  * @module
  */
 final class CacheEntries<K,V> extends AbstractSet<Map.Entry<K,V>> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedContainer.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -31,11 +31,12 @@ import java.util.Collection;
  *     class MyList<E> extends AbstractList<E> implements CheckedContainer<E> { ... }
  * }
  *
- * @param  <E>  the base type of elements in the container.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <E>  the base type of elements in the container.
+ *
+ * @since 0.3
  * @module
  */
 public interface CheckedContainer<E> {

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=1789948&r1=1789947&r2=1789948&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] Mon Apr  3 10:57:47 2017
@@ -50,14 +50,15 @@ import org.apache.sis.internal.util.Chec
  *   Collections.addAll(codes, AxisDirection.EAST, AxisDirection.NORTH, AxisDirection.UP),
  * }
  *
- * @param <E> The type of code list elements in the set.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.4
- * @module
+ *
+ * @param <E>  the type of code list elements in the set.
  *
  * @see java.util.EnumSet
+ *
+ * @since 0.3
+ * @module
  */
 public class CodeListSet<E extends CodeList<E>> extends AbstractSet<E>
         implements CheckedContainer<E>, Cloneable, Serializable

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -33,8 +33,8 @@ import org.apache.sis.internal.util.Unmo
  * in this class implement the {@code CheckedContainer} interface.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.4
+ * @since   0.3
  * @module
  */
 public final class Containers extends Static {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -64,12 +64,13 @@ import static org.apache.sis.util.collec
  * implementation provided in the {@link Node} inner class.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see Node
  * @see TableColumn
+ *
+ * @since 0.3
+ * @module
  */
 public class DefaultTreeTable implements TreeTable, Cloneable, Serializable {
     /**
@@ -317,8 +318,8 @@ public class DefaultTreeTable implements
      * {@link #equals(Object)} and {@link #hashCode()} methods.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      *
      * @see DefaultTreeTable

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -25,12 +25,13 @@ import org.apache.sis.util.ObjectConvert
  * If a value is converted into a null value, then this iterator skips that value.
  * Consequently this iterator can not returns null value.
  *
- * @param  <S>  the type of elements in the storage collection.
- * @param  <E>  the type of elements in this set.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <S>  the type of elements in the storage collection.
+ * @param <E>  the type of elements in this set.
+ *
+ * @since 0.3
  * @module
  */
 final class DerivedIterator<S,E> implements Iterator<E> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -55,14 +55,15 @@ import org.apache.sis.math.FunctionPrope
  * If the storage map is known to be immutable, then sub-classes may consider to cache some values,
  * especially the result of the {@link #size()} method.
  *
- * @param  <SK>  the type of keys in the storage map.
- * @param  <SV>  the type of values in the storage map.
- * @param  <K>   the type of keys in this map.
- * @param  <V>   the type of values in this map.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <SK>  the type of keys in the storage map.
+ * @param <SV>  the type of values in the storage map.
+ * @param <K>   the type of keys in this map.
+ * @param <V>   the type of values in this map.
+ *
+ * @since 0.3
  * @module
  */
 class DerivedMap<SK,SV,K,V> extends AbstractMap<K,V> implements

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -53,12 +53,13 @@ import org.apache.sis.internal.util.SetO
  * If the storage set is known to be immutable, then sub-classes may consider to cache some values,
  * especially the result of the {@link #size()} method.
  *
- * @param  <S>  the type of elements in the storage set.
- * @param  <E>  the type of elements in this set.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ *
+ * @param <S>  the type of elements in the storage set.
+ * @param <E>  the type of elements in this set.
+ *
+ * @since 0.3
  * @module
  */
 class DerivedSet<S,E> extends SetOfUnknownSize<E> implements CheckedContainer<E>, Serializable {
@@ -171,8 +172,8 @@ class DerivedSet<S,E> extends SetOfUnkno
      * allows us to delegate the {@link #contains(Object)} and {@linkplain #remove(Object)}
      * operations to the {@linkplain #storage} set instead than iterating over all elements.
      *
-     * @param  <S>  the type of elements in the storage set.
-     * @param  <E>  the type of elements in this set.
+     * @param <S>  the type of elements in the storage set.
+     * @param <E>  the type of elements in this set.
      */
     private static class Invertible<S,E> extends DerivedSet<S,E> {
         /**
@@ -248,8 +249,8 @@ class DerivedSet<S,E> extends SetOfUnkno
      * The bijection allows us to query the {@linkplain #storage} set size directly
      * instead than iterating over all elements.
      *
-     * @param  <S>  the type of elements in the storage set.
-     * @param  <E>  the type of elements in this set.
+     * @param <S>  the type of elements in the storage set.
+     * @param <E>  the type of elements in this set.
      */
     private static final class Bijective<S,E> extends Invertible<S,E> {
         /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -34,11 +34,12 @@ import org.apache.sis.util.ArgumentCheck
  * <p>This class is <strong>not</strong> thread-safe. Synchronizations (if wanted) are user's responsibility.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.7
  * @version 0.7
- * @module
  *
  * @see org.apache.sis.math.Vector
+ *
+ * @since 0.7
+ * @module
  */
 public class IntegerList extends AbstractList<Integer> implements RandomAccess, Serializable, Cloneable {
     /**
@@ -115,13 +116,13 @@ public class IntegerList extends Abstrac
     /**
      * Returns the array length required for holding a list of the given size.
      *
-     * @param  size  the list size.
+     * @param  capacity  the desired list size.
      * @return the array length for holding a list of the given size.
      */
-    private int length(int size) {
-        size *= bitCount;
-        int length = size >>> BASE_SHIFT;
-        if ((size & OFFSET_MASK) != 0) {
+    private int length(int capacity) {
+        capacity *= bitCount;
+        int length = capacity >>> BASE_SHIFT;
+        if ((capacity & OFFSET_MASK) != 0) {
             length++;
         }
         return length;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -99,15 +99,16 @@ import static org.apache.sis.util.Number
  * use {@code RangeSet<Long>} with millisecond values because {@code RangeSet} will internally
  * use {@code long[]} arrays in the later case.</p>
  *
- * @param <E> The type of range elements.
- *
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Rémi Maréchal (Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
+ *
+ * @param <E>  the type of range elements.
  *
  * @see Range
+ *
+ * @since 0.3
+ * @module
  */
 public class RangeSet<E extends Comparable<? super E>> extends AbstractSet<Range<E>>
         implements CheckedContainer<Range<E>>, SortedSet<Range<E>>, Cloneable, Serializable
@@ -128,12 +129,7 @@ public class RangeSet<E extends Comparab
      * comparator throws an exception. Such ambiguities should not happen in sequences
      * of ranges created by {@code RangeSet}.</p>
      *
-     * @param  <E>  the type of range elements.
-     *
-     * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
-     * @version 0.3
-     * @module
+     * @param <E>  the type of range elements.
      */
     private static final class Compare<E extends Comparable<? super E>>
             implements Comparator<Range<E>>, Serializable
@@ -440,12 +436,12 @@ public class RangeSet<E extends Comparab
     final int binarySearch(final E value, final int lower, final int upper) {
         switch (elementCode) {
             case DOUBLE:    return Arrays.binarySearch((double[]) array, lower, upper, (Double)    value);
-            case FLOAT:     return Arrays.binarySearch((float []) array, lower, upper, (Float)     value);
-            case LONG:      return Arrays.binarySearch((long  []) array, lower, upper, (Long)      value);
-            case INTEGER:   return Arrays.binarySearch((int   []) array, lower, upper, (Integer)   value);
-            case SHORT:     return Arrays.binarySearch((short []) array, lower, upper, (Short)     value);
-            case BYTE:      return Arrays.binarySearch((byte  []) array, lower, upper, (Byte)      value);
-            case CHARACTER: return Arrays.binarySearch((char  []) array, lower, upper, (Character) value);
+            case FLOAT:     return Arrays.binarySearch((float[])  array, lower, upper, (Float)     value);
+            case LONG:      return Arrays.binarySearch((long[])   array, lower, upper, (Long)      value);
+            case INTEGER:   return Arrays.binarySearch((int[])    array, lower, upper, (Integer)   value);
+            case SHORT:     return Arrays.binarySearch((short[])  array, lower, upper, (Short)     value);
+            case BYTE:      return Arrays.binarySearch((byte[])   array, lower, upper, (Byte)      value);
+            case CHARACTER: return Arrays.binarySearch((char[])   array, lower, upper, (Character) value);
             default:        return Arrays.binarySearch((Object[]) array, lower, upper,             value);
         }
     }
@@ -993,11 +989,6 @@ public class RangeSet<E extends Comparab
      * A view over a subset of {@link RangeSet}.
      * Instances of this class are created by the {@link RangeSet#intersect(Range)} method.
      *
-     * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
-     * @version 0.3
-     * @module
-     *
      * @see RangeSet#intersect(Range)
      */
     private final class SubSet extends AbstractSet<Range<E>> implements SortedSet<Range<E>>, Serializable {
@@ -1232,8 +1223,8 @@ public class RangeSet<E extends Comparab
      * </ul>
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     private final class SubIter extends Iter {
@@ -1312,8 +1303,8 @@ public class RangeSet<E extends Comparab
      * All elements are {@link Range} objects.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     private class Iter implements Iterator<Range<E>> {
@@ -1580,12 +1571,12 @@ public class RangeSet<E extends Comparab
             final Object a2 = that.array;
             switch (elementCode) {
                 case DOUBLE:    return Arrays.equals((double[]) a1, (double[]) a2);
-                case FLOAT:     return Arrays.equals((float []) a1, ( float[]) a2);
-                case LONG:      return Arrays.equals((long  []) a1, (  long[]) a2);
-                case INTEGER:   return Arrays.equals((int   []) a1, (   int[]) a2);
-                case SHORT:     return Arrays.equals((short []) a1, ( short[]) a2);
-                case BYTE:      return Arrays.equals((byte  []) a1, (  byte[]) a2);
-                case CHARACTER: return Arrays.equals((char  []) a1, (  char[]) a2);
+                case FLOAT:     return Arrays.equals((float[])  a1, (float[])  a2);
+                case LONG:      return Arrays.equals((long[])   a1, (long[])   a2);
+                case INTEGER:   return Arrays.equals((int[])    a1, (int[])    a2);
+                case SHORT:     return Arrays.equals((short[])  a1, (short[])  a2);
+                case BYTE:      return Arrays.equals((byte[])   a1, (byte[])   a2);
+                case CHARACTER: return Arrays.equals((char[])   a1, (char[])   a2);
                 default:        return Arrays.equals((Object[]) a1, (Object[]) a2);
             }
         }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -91,11 +91,12 @@ import org.apache.sis.util.resources.Voc
  *
  * The constants defined in this class use a similar approach for providing serialization support.
  *
- * @param  <V>  base type of all values in the column identified by this instance.
- *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <V>  base type of all values in the column identified by this instance.
+ *
+ * @since 0.3
  * @module
  */
 public class TableColumn<V> implements CheckedContainer<V> {
@@ -182,11 +183,6 @@ public class TableColumn<V> implements C
      * and resolves deserialized instances to the singleton instances.
      *
      * @param  <V>  base type of all values in the column identified by this instance.
-     *
-     * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
-     * @version 0.3
-     * @module
      */
     private static final class Constant<V> extends TableColumn<V> implements Serializable {
         /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeNodeList.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -58,8 +58,8 @@ import org.apache.sis.util.resources.Err
  * creating new copy on deserialization. So the parents should not be mixed.</div>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 abstract class TreeNodeList extends AbstractList<TreeTable.Node>

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTable.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -63,8 +63,8 @@ import java.util.List;
  * this column list does not provide the above type-safety.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public interface TreeTable {
@@ -118,11 +118,11 @@ public interface TreeTable {
      * {@link #getUserObject()} method. This object is not used directly by the tree tables.
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
-     * @since   0.3
      * @version 0.8
+     * @since   0.3
      * @module
      */
-    public static interface Node {
+    public interface Node {
         /**
          * Returns the parent node, or {@code null} if this node is the root of the tree.
          *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -100,8 +100,8 @@ import static org.apache.sis.util.Charac
  * than the user object of a parent node <var>A</var>, then the children of the <var>C</var> node will not be formatted.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.8
+ * @since   0.3
  * @module
  */
 public class TreeTableFormat extends TabularFormat<TreeTable> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -99,11 +99,12 @@ import org.apache.sis.util.ArgumentCheck
  * }
  *
  * @author  Martin Desruisseaux
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see TreeTable
+ *
+ * @since 0.3
+ * @module
  */
 public final class TreeTables extends Static {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -35,11 +35,12 @@ import org.apache.sis.math.MathFunctions
  * This is an element in a linked list. When the reference is disposed, it is removed
  * from the enclosing collection.
  *
- * @param  <E>  the type of elements in the collection.
- *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ *
+ * @param <E>  the type of elements in the collection.
+ *
+ * @since 0.3
  * @module
  */
 abstract class WeakEntry<E> extends WeakReference<E> implements Disposable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -67,14 +67,15 @@ import static org.apache.sis.util.collec
  * the caller. But if a sequence of two or more method calls need to appear atomic from other threads perspective,
  * then the caller can synchronize on {@code this}.
  *
- * @param  <E>  the type of elements in the set.
- *
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
+ *
+ * @param <E>  the type of elements in the set.
  *
  * @see java.util.WeakHashMap
+ *
+ * @since 0.3
+ * @module
  */
 public class WeakHashSet<E> extends AbstractSet<E> implements CheckedContainer<E> {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -73,17 +73,18 @@ import static org.apache.sis.util.collec
  * of the caller. But if a sequence of two or more method calls need to appear atomic from other threads perspective,
  * then the caller can synchronize on {@code this}.
  *
- * @param  <K>  the class of key elements.
- * @param  <V>  the class of value elements.
- *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.7
- * @module
+ *
+ * @param <K>  the class of key elements.
+ * @param <V>  the class of value elements.
  *
  * @see java.util.WeakHashMap
  * @see WeakHashSet
  * @see Cache
+ *
+ * @since 0.3
+ * @module
  */
 public class WeakValueHashMap<K,V> extends AbstractMap<K,V> {
     /**
@@ -510,8 +511,8 @@ public class WeakValueHashMap<K,V> exten
      * The set of entries.
      *
      * @author  Martin Desruisseaux (Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     private final class EntrySet extends AbstractSet<Map.Entry<K,V>> {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -51,8 +51,8 @@
  * </ul>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 package org.apache.sis.util.collection;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.apache.sis.internal.simple.Si
  * Base class of factories provided in the Apache SIS library.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public abstract class AbstractFactory implements Factory {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -47,8 +47,8 @@ import org.apache.sis.util.CharSequences
  * </ul>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 public abstract class AbstractInternationalString implements InternationalString, Formattable {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -59,14 +59,15 @@ import org.apache.sis.util.resources.Err
  * and do not change any public {@code GenericName} state.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
  *
  * @see org.apache.sis.referencing.NamedIdentifier
  * @see org.apache.sis.storage.FeatureNaming
  * @see org.apache.sis.feature.AbstractIdentifiedType#getName()
  * @see org.apache.sis.referencing.AbstractIdentifiedObject#getAlias()
+ *
+ * @since 0.3
+ * @module
  */
 
 /*
@@ -343,8 +344,8 @@ public abstract class AbstractName imple
      * This class is immutable is the list given to the constructor is immutable.
      *
      * @author  Martin Desruisseaux (IRD, Geomatys)
-     * @since   0.3
      * @version 0.3
+     * @since   0.3
      * @module
      */
     private static final class International extends SimpleInternationalString {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/CodeListFilter.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.apache.sis.util.Characters.Fi
  * The filters used by {@link Types#forCodeName(Class, String, boolean)}.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.3
+ * @since   0.3
  * @module
  */
 final class CodeListFilter implements CodeList.Filter {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -51,11 +51,12 @@ import org.apache.sis.internal.system.Mo
  * SIS typically references them as if they were immutable because of their <cite>add-only</cite> behavior.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see Types#toInternationalString(Map, String)
+ *
+ * @since 0.3
+ * @module
  */
 public class DefaultInternationalString extends AbstractInternationalString implements Serializable {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -55,12 +55,13 @@ import org.apache.sis.internal.jaxb.gco.
  * remain safe to call from multiple threads and do not change any public {@code LocalName} state.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
  *
  * @see DefaultNameSpace
  * @see DefaultScopedName
+ *
+ * @since 0.3
+ * @module
  */
 
 /*

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -43,13 +43,14 @@ import static org.apache.sis.util.Argume
  * state.
  *
  * @author  Guilhem Legal (Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
  *
  * @see DefaultTypeName
  * @see DefaultNameFactory
  * @see DefaultRecordType
+ *
+ * @since 0.3
+ * @module
  */
 @XmlType(name = "MemberName_Type")
 @XmlRootElement(name = "MemberName")

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameFactory.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -69,9 +69,7 @@ import static org.apache.sis.util.iso.De
  * from multiple threads.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
  *
  * @see Names
  * @see DefaultNameSpace
@@ -79,6 +77,9 @@ import static org.apache.sis.util.iso.De
  * @see DefaultLocalName
  * @see DefaultTypeName
  * @see DefaultMemberName
+ *
+ * @since 0.3
+ * @module
  */
 public class DefaultNameFactory extends AbstractFactory implements NameFactory {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -51,15 +51,16 @@ import static org.apache.sis.util.Argume
  * remain safe to call from multiple threads and do not change any public {@code NameSpace} state.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.3
- * @module
  *
  * @see DefaultScopedName
  * @see DefaultLocalName
  * @see DefaultTypeName
  * @see DefaultMemberName
  * @see DefaultNameFactory
+ *
+ * @since 0.3
+ * @module
  */
 public class DefaultNameSpace implements NameSpace, Serializable {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -53,12 +53,13 @@ import org.apache.sis.internal.util.Abst
  * </ul>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
  * @version 0.5
- * @module
  *
  * @see DefaultRecordType
  * @see DefaultRecordSchema
+ *
+ * @since 0.5
+ * @module
  */
 public class DefaultRecord implements Record, Serializable {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -71,12 +71,13 @@ import org.apache.sis.internal.converter
  * {@link java.io.Serializable} interface) returning a system-wide static constant for their schema.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.5
  * @version 0.5
- * @module
  *
  * @see DefaultRecordType
  * @see DefaultRecord
+ *
+ * @since 0.5
+ * @module
  */
 public class DefaultRecordSchema implements RecordSchema {
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java [UTF-8] Mon Apr  3 10:57:47 2017
@@ -86,13 +86,14 @@ import org.apache.sis.internal.converter
  * so users wanting serialization may need to provide their own schema.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3
  * @version 0.5
- * @module
  *
  * @see DefaultRecord
  * @see DefaultRecordSchema
  * @see DefaultMemberName
+ *
+ * @since 0.3
+ * @module
  */
 @XmlType(name = "RecordType")
 public class DefaultRecordType extends RecordDefinition implements RecordType, Serializable {
@@ -233,11 +234,11 @@ public class DefaultRecordType extends R
     /**
      * Invoked on serialization for writing the member names and their type.
      *
-     * @serialData the number of members as an {@code int}, followed by a
-     *             ({@code MemberName}, {@code Type}) pair for each member.
-     *
      * @param  out  the output stream where to serialize this object.
      * @throws IOException if an I/O error occurred while writing.
+     *
+     * @serialData the number of members as an {@code int}, followed by a
+     *             ({@code MemberName}, {@code Type}) pair for each member.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         final int size = size();



Mime
View raw message