sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779293 [3/8] - in /sis/branches/JDK7: ./ core/sis-utility/src/main/java/org/apache/sis/internal/converter/ core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/ c...
Date Wed, 18 Jan 2017 06:31:09 GMT
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -66,7 +66,7 @@ abstract class Appender implements Appen
     /**
      * Creates a new appender which will send its output to the given stream or buffer.
      *
-     * @param out The underlying character output stream or buffer.
+     * @param out  the underlying character output stream or buffer.
      */
     protected Appender(final Appendable out) {
         ArgumentChecks.ensureNonNull("out", out);
@@ -80,7 +80,7 @@ abstract class Appender implements Appen
      */
     final String lineSeparator(final CharSequence sequence, int start, final int end) {
         if (isHighSurrogate()) {
-            start++; // Skip invalid character.
+            start++;                                        // Skip invalid character.
         }
         while (start < end) {
             final int c = Character.codePointAt(sequence, start);
@@ -109,8 +109,11 @@ abstract class Appender implements Appen
             if (Character.isLowSurrogate(c)) {
                 return Character.toCodePoint(h, c);
             }
-            // Unpaired surrogate.  This is usually an error, but this not the fault of
-            // this class since we are processing data supplied by the user. Be lenient.
+            /*
+             * If we reach this point, we have unpaired surrogate.  This is usually an error,
+             * but this not the fault of this class since we are processing data supplied by
+             * the user. Be lenient.
+             */
         }
         if (Character.isHighSurrogate(c)) {
             highSurrogate = c;
@@ -132,10 +135,10 @@ abstract class Appender implements Appen
      * delegates to {@link #append(char)} and returns {@code start+1}. The intend is to avoid
      * processing a character sequence which starts by an invalid code point.
      *
-     * @param  sequence The character sequence to write.
-     * @param  start    Index of the first character to write by this method or by the caller.
-     * @param  end      Index after the last character to be written by the caller.
-     * @return Index of the first character which need to be written by the caller.
+     * @param  sequence  the character sequence to write.
+     * @param  start     index of the first character to write by this method or by the caller.
+     * @param  end       index after the last character to be written by the caller.
+     * @return index of the first character which need to be written by the caller.
      */
     final int appendSurrogate(final CharSequence sequence, int start, final int end) throws IOException {
         if (start != end && highSurrogate != 0) {
@@ -153,8 +156,8 @@ abstract class Appender implements Appen
     /**
      * Appends the given code point to the underlying {@link #out} stream or buffer.
      *
-     * @param  c The code point to append.
-     * @throws IOException If an error occurred while appending the code point.
+     * @param  c  the code point to append.
+     * @throws IOException if an error occurred while appending the code point.
      */
     final void appendCodePoint(final int c) throws IOException {
         if (Character.isBmpCodePoint(c)) {
@@ -171,9 +174,9 @@ abstract class Appender implements Appen
      * Appends the specified character sequence.
      * The default implementation delegates to {@link #append(CharSequence, int, int)}.
      *
-     * @param  sequence The character sequence to append, or {@code null}.
-     * @return A reference to this {@code Appendable}.
-     * @throws IOException If an I/O error occurred.
+     * @param  sequence  the character sequence to append, or {@code null}.
+     * @return a reference to this {@code Appendable}.
+     * @throws IOException if an I/O error occurred.
      */
     @Override
     public Appendable append(CharSequence sequence) throws IOException {
@@ -187,7 +190,7 @@ abstract class Appender implements Appen
      * Returns the content of this {@code Appendable} as a string if possible,
      * or the localized <cite>"Unavailable content"</cite> string otherwise.
      *
-     * @return The content of this {@code Appendable}, or a localized message for unavailable content.
+     * @return the content of this {@code Appendable}, or a localized message for unavailable content.
      *
      * @see IO#content(Appendable)
      */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -35,6 +35,7 @@ import org.apache.sis.util.Classes;
  * @version 0.3
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")   // Because this class does not contain field that need to be cloned.
 final class ClassFormat extends Format {
     /**
      * For cross-version compatibility.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -42,6 +42,7 @@ import org.apache.sis.internal.util.Loca
  * @version 0.3
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")   // Because this class does not contain field that need to be cloned.
 final class DefaultFormat extends Format {
     /**
      * For cross-version compatibility.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IO.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IO.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IO.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IO.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -49,7 +49,7 @@ public final class IO extends Static {
      * <p>Chains of wrappers are followed until a {@code Flushable} instance is found, if any.
      * The search stops at the first occurrence found.</p>
      *
-     * @param  out The stream or buffer to flush, or {@code null}.
+     * @param  out  the output stream, writer or buffer to flush, or {@code null}.
      * @throws IOException if an error occurred while flushing the given stream.
      */
     public static void flush(Appendable out) throws IOException {
@@ -72,7 +72,7 @@ public final class IO extends Static {
      * if any, is {@linkplain Flushable#flush() flushed}.
      * The search stops at the first {@code Closeable} occurrence found.</p>
      *
-     * @param  out The stream or buffer to close, or {@code null}.
+     * @param  out  the output stream, writer or buffer to close, or {@code null}.
      * @throws IOException if an error occurred while closing the given stream.
      */
     public static void close(Appendable out) throws IOException {
@@ -113,8 +113,8 @@ public final class IO extends Static {
      * to get proper content. In particular, this is necessary if the chain of {@code Appendable}s
      * contains {@link TableAppender} or {@link LineAppender} instances.</p>
      *
-     * @param  out The stream or buffer from which to get the content, or {@code null}.
-     * @return The content of the given stream of buffer, or {@code null} if unavailable.
+     * @param  out  the output stream, writer or buffer from which to get the content, or {@code null}.
+     * @return the content of the given stream of buffer, or {@code null} if unavailable.
      *
      * @see #flush(Appendable)
      */
@@ -153,9 +153,8 @@ public final class IO extends Static {
      * Any write operations performed on the returned writer will be forwarded
      * to the given {@code Appendable}.
      *
-     * @param  out The stream or buffer to view as a {@link Writer}, or {@code null}.
-     * @return A view of this {@code Appendable} as a writer, or {@code null} if the
-     *         given argument was null.
+     * @param  out  the output stream, writer or buffer to view as a {@link Writer}, or {@code null}.
+     * @return a view of this {@code Appendable} as a writer, or {@code null} if the given argument was null.
      */
     public static Writer asWriter(final Appendable out) {
         if (out == null || out instanceof Writer) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -36,6 +36,7 @@ import org.apache.sis.util.resources.Voc
  * @version 0.4
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")   // Because this class does not contain field that need to be cloned.
 final class IdentifiedObjectFormat extends Format {
     /**
      * For cross-version compatibility.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -153,7 +153,7 @@ public class LineAppender extends Append
      *   <li>{@link #setLineSeparator(String)}</li>
      * </ul>
      *
-     * @param out The underlying stream or buffer to write to.
+     * @param out  the underlying stream or buffer to write to.
      */
     public LineAppender(final Appendable out) {
         super(out);
@@ -163,8 +163,8 @@ public class LineAppender extends Append
     /**
      * Constructs a formatter which will replaces line separators by the given string.
      *
-     * @param out                   The underlying stream or buffer to write to.
-     * @param lineSeparator         The line separator to send to {@code out}, or {@code null}
+     * @param out                   the underlying stream or buffer to write to.
+     * @param lineSeparator         the line separator to send to {@code out}, or {@code null}
      *                              for forwarding the EOL sequences unchanged.
      * @param isTabulationExpanded  {@code true} for expanding tabulations into spaces,
      *                              or {@code false} for sending {@code '\t'} characters as-is.
@@ -180,8 +180,8 @@ public class LineAppender extends Append
     /**
      * Constructs a formatter which will wrap the lines at a given maximal length.
      *
-     * @param out                   The underlying stream or buffer to write to.
-     * @param maximalLineLength     The maximal number of Unicode characters per line,
+     * @param out                   the underlying stream or buffer to write to.
+     * @param maximalLineLength     the maximal number of Unicode characters per line,
      *                              or {@link Integer#MAX_VALUE} if there is no limit.
      * @param isTabulationExpanded  {@code true} for expanding tabulations into spaces,
      *                              or {@code false} for forwarding {@code '\t'} characters as-is.
@@ -197,7 +197,7 @@ public class LineAppender extends Append
      * Returns the maximal line length, in unit of Unicode characters (code point count).
      * The default value is no limit.
      *
-     * @return The current maximal number of Unicode characters per line,
+     * @return the current maximal number of Unicode characters per line,
      *         or {@link Integer#MAX_VALUE} if there is no limit.
      */
     public int getMaximalLineLength() {
@@ -207,8 +207,8 @@ public class LineAppender extends Append
     /**
      * Sets the maximal line length, in units of Unicode characters (code point count).
      *
-     * @param length The new maximal number of Unicode characters per line,
-     *               or {@link Integer#MAX_VALUE} if there is no limit.
+     * @param  length  the new maximal number of Unicode characters per line,
+     *                 or {@link Integer#MAX_VALUE} if there is no limit.
      */
     public void setMaximalLineLength(final int length) {
         ArgumentChecks.ensureStrictlyPositive("length", length);
@@ -219,7 +219,7 @@ public class LineAppender extends Append
      * Returns the current tabulation width, in unit of Unicode characters (code point count).
      * The default value is 8.
      *
-     * @return The current tabulation width in number of Unicode characters.
+     * @return the current tabulation width in number of Unicode characters.
      */
     public int getTabulationWidth() {
         return tabulationWidth;
@@ -228,7 +228,7 @@ public class LineAppender extends Append
     /**
      * Sets the tabulation width, in unit of Unicode characters (code point count).
      *
-     * @param  width The new tabulation width. Must be greater than 0.
+     * @param  width  the new tabulation width. Must be greater than 0.
      * @throws IllegalArgumentException if {@code tabWidth} is not greater than 0
      *         or is unreasonably high.
      */
@@ -264,7 +264,7 @@ public class LineAppender extends Append
      * Returns the line separator to be sent to the underlying appendable,
      * or {@code null} if EOL sequences are forwarded unchanged.
      *
-     * @return The current line separator, or {@code null} if EOL are forwarded <i>as-is</i>.
+     * @return the current line separator, or {@code null} if EOL are forwarded <i>as-is</i>.
      */
     public String getLineSeparator() {
         return isEndOfLineReplaced ? lineSeparator : null;
@@ -277,7 +277,7 @@ public class LineAppender extends Append
      * If {@code null} (the default), then the line separators given to the {@code append}
      * methods are forwarded unchanged.
      *
-     * @param  lineSeparator The new line separator, or {@code null} for forwarding EOL <i>as-is</i>.
+     * @param  lineSeparator  the new line separator, or {@code null} for forwarding EOL <i>as-is</i>.
      *
      * @see System#lineSeparator()
      * @see Characters#isLineOrParagraphSeparator(int)
@@ -309,12 +309,12 @@ public class LineAppender extends Append
      * responsibility.
      */
     private void endOfLine() throws IOException {
-        buffer.setLength(printableLength); // Reduce the amount of work for StringBuilder.deleteCharAt(int).
+        buffer.setLength(printableLength);      // Reduce the amount of work for StringBuilder.deleteCharAt(int).
         deleteSoftHyphen(printableLength - 1);
         transfer(printableLength);
         printableLength  = 0;
         codePointCount   = 0;
-        isEscapeSequence = false; // Handle line-breaks as "end of escape sequence".
+        isEscapeSequence = false;               // Handle line-breaks as "end of escape sequence".
         isNewLine        = true;
     }
 
@@ -322,7 +322,7 @@ public class LineAppender extends Append
      * Removes the soft hyphen characters from the given buffer. This is invoked
      * when the buffer is about to be written without being split on two lines.
      *
-     * @param i Index after the last character to check. This is either {@link printableLength}
+     * @param i index after the last character to check. This is either {@link printableLength}
      *          for checking all characters, or {@code printableLength-1} for preserving the last
      *          soft hyphen on the line (while removing all others).
      */
@@ -352,7 +352,7 @@ public class LineAppender extends Append
     /**
      * Writes the specified code point.
      *
-     * @throws IOException If an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     @SuppressWarnings("fallthrough")
     private void write(final int c) throws IOException {
@@ -448,7 +448,7 @@ searchHyp:  for (int i=buffer.length();
                 switch (b) {
                     case '-': {
                         if (i>=n && !Character.isLetter(buffer.codePointBefore(i-n))) {
-                            break; // Continue searching previous characters.
+                            break;                      // Continue searching previous characters.
                         }
                         // fall through
                     }
@@ -483,9 +483,9 @@ searchHyp:  for (int i=buffer.length();
     /**
      * Writes a single character.
      *
-     * @param  c The character to append.
-     * @return A reference to this {@code Appendable}.
-     * @throws IOException If an I/O error occurs.
+     * @param  c  the character to append.
+     * @return a reference to this {@code Appendable}.
+     * @throws IOException if an I/O error occurs.
      */
     @Override
     public Appendable append(final char c) throws IOException {
@@ -499,11 +499,11 @@ searchHyp:  for (int i=buffer.length();
     /**
      * Writes a portion of a character sequence.
      *
-     * @param  sequence The character sequence to be written.
-     * @param  start    Index from which to start reading characters.
-     * @param  end      Index of the character following the last character to read.
-     * @return A reference to this {@code Appendable}.
-     * @throws IOException If an I/O error occurs.
+     * @param  sequence  the character sequence to be written.
+     * @param  start     index from which to start reading characters.
+     * @param  end       index of the character following the last character to read.
+     * @return a reference to this {@code Appendable}.
+     * @throws IOException if an I/O error occurs.
      */
     @Override
     public Appendable append(final CharSequence sequence, int start, final int end) throws IOException {
@@ -533,7 +533,7 @@ searchHyp:  for (int i=buffer.length();
      * are discarded, and the column position (for tabulation expansion calculation) is
      * reset to 0. This method does not write any line separator.
      *
-     * @throws IOException If an error occurred while sending the trailing non-white
+     * @throws IOException if an error occurred while sending the trailing non-white
      *         characters to the underlying stream.
      */
     public void clear() throws IOException {
@@ -552,7 +552,7 @@ searchHyp:  for (int i=buffer.length();
      * {@linkplain Characters#isLineOrParagraphSeparator(int) line or paragraph terminator},
      * or to invoke {@link #clear()}.</p>
      *
-     * @throws IOException If an I/O error occurs.
+     * @throws IOException if an I/O error occurs.
      */
     @Override
     public void flush() throws IOException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -221,7 +221,7 @@ public class TableAppender extends Appen
     /**
      * Creates a new table formatter writing in an internal buffer with the specified column separator.
      *
-     * @param separator String to write between columns.
+     * @param separator  string to write between columns.
      */
     public TableAppender(final String separator) {
         this(new StringBuilder(256), separator);
@@ -233,7 +233,7 @@ public class TableAppender extends Appen
      * The default is a vertical double line for the left and right table borders, and a single
      * line between the columns.
      *
-     * @param out The underlying stream or buffer to write to.
+     * @param out  the underlying stream or buffer to write to.
      */
     public TableAppender(final Appendable out) {
         super(out);
@@ -245,8 +245,8 @@ public class TableAppender extends Appen
     /**
      * Creates a new table formatter writing in the given output with the specified column separator.
      *
-     * @param out The underlying stream or buffer to write to.
-     * @param separator String to write between columns.
+     * @param out        the underlying stream or buffer to write to.
+     * @param separator  string to write between columns.
      */
     public TableAppender(final Appendable out, final String separator) {
         super(out);
@@ -268,8 +268,8 @@ public class TableAppender extends Appen
      *
      * @param  horizontalBorder -1 for left border, +1 for right border,  0 for center.
      * @param  verticalBorder   -1 for top  border, +1 for bottom border, 0 for center.
-     * @param  horizontalChar   Character to use for horizontal line.
-     * @throws IOException      If the writing operation failed.
+     * @param  horizontalChar   character to use for horizontal line.
+     * @throws IOException      if the writing operation failed.
      */
     private void writeBorder(final int  horizontalBorder,
                              final int  verticalBorder,
@@ -346,8 +346,8 @@ public class TableAppender extends Appen
      *
      * The default value is {@code false}.
      *
-     * @param multiLines {@code true} true if EOL are used for line feeds inside
-     *        current cells, or {@code false} if EOL move to the next row.
+     * @param multiLines  {@code true} true if EOL are used for line feeds inside current cells,
+     *                    or {@code false} if EOL move to the next row.
      */
     public void setMultiLinesCells(final boolean multiLines) {
         multiLinesCells = multiLines;
@@ -357,7 +357,7 @@ public class TableAppender extends Appen
      * Returns the alignment of the text inside the current cell.
      * The default value is {@link #ALIGN_LEFT}.
      *
-     * @return Current cell alignment as one of the {@link #ALIGN_LEFT},
+     * @return current cell alignment as one of the {@link #ALIGN_LEFT},
      *         {@link #ALIGN_RIGHT} or {@link #ALIGN_CENTER} constants.
      */
     public byte getCellAlignment() {
@@ -372,8 +372,8 @@ public class TableAppender extends Appen
      *
      * <p>If this method is never invoked, then the default alignment is {@link #ALIGN_LEFT}.</p>
      *
-     * @param alignment The new cell alignment as one of the {@link #ALIGN_LEFT},
-     *        {@link #ALIGN_RIGHT} or {@link #ALIGN_CENTER} constants.
+     * @param  alignment  the new cell alignment as one of the {@link #ALIGN_LEFT},
+     *                    {@link #ALIGN_RIGHT} or {@link #ALIGN_CENTER} constants.
      */
     public void setCellAlignment(final byte alignment) {
         if (alignment < ALIGN_LEFT || alignment > ALIGN_RIGHT) {
@@ -386,12 +386,12 @@ public class TableAppender extends Appen
     /**
      * Returns the number of rows in this table. This count is reset to 0 by {@link #flush()}.
      *
-     * @return The number of rows in this table.
+     * @return the number of rows in this table.
      */
     public int getRowCount() {
         int count = currentRow;
         if (currentColumn != 0) {
-            count++; // Some writting has begun in the current row.
+            count++;                            // Some writting has begun in the current row.
         }
         return count;
     }
@@ -399,15 +399,15 @@ public class TableAppender extends Appen
     /**
      * Returns the number of columns in this table.
      *
-     * @return The number of columns in this table.
+     * @return the number of columns in this table.
      */
     public int getColumnCount() {
         return maximalColumnWidths.length;
     }
 
     /**
-     * Writes a single character. If {@link #isMultiLinesCells()} is {@code false}
-     * (which is the default), then:
+     * Writes a single character.
+     * If {@link #isMultiLinesCells()} is {@code false} (which is the default), then:
      *
      * <ul>
      *   <li>Tabulations ({@code '\t'}) are replaced by calls to {@link #nextColumn()}.</li>
@@ -415,7 +415,7 @@ public class TableAppender extends Appen
      *       line or paragraph separators} are replaced by calls to {@link #nextLine()}.</li>
      * </ul>
      *
-     * @param  c Character to write.
+     * @param  c  character to write.
      * @return {@code this}.
      */
     @Override
@@ -448,8 +448,8 @@ public class TableAppender extends Appen
     /**
      * Appends the specified character sequence.
      *
-     * @param  sequence The character sequence to append, or {@code null}.
-     * @return A reference to this {@code Appendable}.
+     * @param  sequence  the character sequence to append, or {@code null}.
+     * @return a reference to this {@code Appendable}.
      */
     @Override
     public TableAppender append(CharSequence sequence) {
@@ -463,9 +463,9 @@ public class TableAppender extends Appen
      * Writes a portion of a character sequence. Tabulations and line separators are
      * interpreted as by {@link #append(char)}.
      *
-     * @param  sequence The character sequence to be written.
-     * @param  start    Index from which to start reading characters.
-     * @param  end      Index of the character following the last character to read.
+     * @param  sequence  the character sequence to be written.
+     * @param  start     index from which to start reading characters.
+     * @param  end       index of the character following the last character to read.
      * @return {@code this}.
      */
     @Override
@@ -478,8 +478,10 @@ public class TableAppender extends Appen
         try {
             start = appendSurrogate(sequence, start, end);
         } catch (IOException e) {
-            // Should never happen, because appendSurrogate(…) delegates to append(char)
-            // which is overriden without 'throws IOException' clause in this class.
+            /*
+             * Should never happen, because appendSurrogate(…) delegates to append(char)
+             * which is overriden without 'throws IOException' clause in this class.
+             */
             throw new AssertionError(e);
         }
         if (start != end) {
@@ -545,7 +547,7 @@ public class TableAppender extends Appen
      * <p>Calling {@code nextColumn('*')} from the first character
      * in a cell is a convenient way to put a pad value in this cell.</p>
      *
-     * @param fill Character filling the cell (default to whitespace).
+     * @param  fill  character filling the cell (default to whitespace).
      */
     public void nextColumn(final char fill) {
         final String cellText = buffer.toString();
@@ -591,8 +593,8 @@ public class TableAppender extends Appen
      * <p>Calling {@code nextLine('-')} or {@code nextLine('═')} from the first column of a row
      * is a convenient way to fill this row with a line separator.</p>
      *
-     * @param fill Character filling the rest of the line (default to whitespace).
-     *             This character may be use as a row separator.
+     * @param  fill  character filling the rest of the line (default to whitespace).
+     *              This character may be use as a row separator.
      */
     public void nextLine(final char fill) {
         if (buffer.length() != 0) {
@@ -820,9 +822,9 @@ public class TableAppender extends Appen
      * Repeats a character. The {@code count} value may be negative,
      * which is handled as if it was zero.
      *
-     * @param out   The stream or buffer where to repeat the character.
-     * @param car   Character to write (usually ' ').
-     * @param count Number of repetition.
+     * @param  out    the stream or buffer where to repeat the character.
+     * @param  car    character to write (usually ' ').
+     * @param  count  number of repetition.
      */
     private static void repeat(final Appendable out, final char car, int count) throws IOException {
         while (--count >= 0) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -613,9 +613,11 @@ abstract class ArrayVector<E extends Num
             return NumberRange.create(min, true, max, true);
         }
 
-        // Not worth to override 'increment(double)' because the array can not be long anyway
-        // (except if the increment is zero) and the implicit conversion of 'short' to 'int'
-        // performed by Java would make the implementation a little bit more tricky.
+        /*
+         * Not worth to override 'increment(double)' because the array can not be long anyway
+         * (except if the increment is zero) and the implicit conversion of 'short' to 'int'
+         * performed by Java would make the implementation a little bit more tricky.
+         */
     }
 
     /**
@@ -672,9 +674,11 @@ abstract class ArrayVector<E extends Num
             return NumberRange.create(min, true, max, true);
         }
 
-        // Not worth to override 'increment(double)' because the array can not be long anyway
-        // (except if the increment is zero) and the implicit conversion of 'byte' to 'int'
-        // performed by Java would make the implementation a little bit more tricky.
+        /*
+         * Not worth to override 'increment(double)' because the array can not be long anyway
+         * (except if the increment is zero) and the implicit conversion of 'byte' to 'int'
+         * performed by Java would make the implementation a little bit more tricky.
+         */
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -71,7 +71,7 @@ final class CompoundDirectPositions impl
     /**
      * Starts a new iteration.
      *
-     * @return Always {@code this}.
+     * @return always {@code this}.
      */
     @Override
     public Iterator<DirectPosition> iterator() {
@@ -90,7 +90,7 @@ final class CompoundDirectPositions impl
     /**
      * Sets this object to the next position and return it.
      *
-     * @return Always {@code this}.
+     * @return always {@code this}.
      */
     @Override
     public DirectPosition next() {
@@ -101,7 +101,7 @@ final class CompoundDirectPositions impl
     /**
      * Returns {@code this} since this object is already a direct position.
      *
-     * @return Always {@code this}.
+     * @return always {@code this}.
      */
     @Override
     public DirectPosition getDirectPosition() {
@@ -111,7 +111,7 @@ final class CompoundDirectPositions impl
     /**
      * Returns {@code null} since there is no CRS associated to this object.
      *
-     * @return Always {@code null}.
+     * @return always {@code null}.
      */
     @Override
     public CoordinateReferenceSystem getCoordinateReferenceSystem() {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -49,8 +49,8 @@ final class ConcatenatedVector extends V
     /**
      * Creates a concatenated vector.
      *
-     * @param first  the vector for the lower indices.
-     * @param second the vector for the higher indices.
+     * @param first   the vector for the lower indices.
+     * @param second  the vector for the higher indices.
      */
     public ConcatenatedVector(final Vector first, final Vector second) {
         this.first  = first;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -135,8 +135,8 @@ public final class DecimalFunctions exte
      *   return Double.parseDouble(Float.toString(value));
      * }
      *
-     * @param  value The {@code float} value to convert as a {@code double}.
-     * @return The given value as a {@code double} with the extra decimal fraction digits set to zero.
+     * @param  value  the {@code float} value to convert as a {@code double}.
+     * @return the given value as a {@code double} with the extra decimal fraction digits set to zero.
      */
     public static double floatToDouble(final float value) {
         /*

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -159,7 +159,7 @@ public enum FunctionProperty {
      *   <li>{@link #SURJECTIVE}</li>
      * </ul>
      *
-     * @param  properties The properties of the function to test for bijectivity.
+     * @param  properties  the properties of the function to test for bijectivity.
      * @return {@code true} if a function having the given set of properties is bijective.
      */
     public static boolean isBijective(final Set<FunctionProperty> properties) {
@@ -176,7 +176,7 @@ public enum FunctionProperty {
      *   <li>{@link #ORDER_REVERSING}</li>
      * </ul>
      *
-     * @param  properties The properties of the function to test for monotonicity.
+     * @param  properties  the properties of the function to test for monotonicity.
      * @return {@code true} if a function having the given set of properties is monotonic.
      */
     public static boolean isMonotonic(final Set<FunctionProperty> properties) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -86,8 +86,8 @@ public class Line implements Cloneable,
      * Constructs a line with the specified slope and offset.
      * The linear equation will be <var>y</var> = <var>slope</var>⋅<var>x</var> + <var>y₀</var>.
      *
-     * @param slope The slope.
-     * @param y0 The <var>y</var> value at <var>x</var> = 0.
+     * @param slope  the slope.
+     * @param y0     the <var>y</var> value at <var>x</var> = 0.
      *
      * @see #setEquation(double, double)
      */
@@ -100,7 +100,7 @@ public class Line implements Cloneable,
     /**
      * Returns the slope.
      *
-     * @return The slope.
+     * @return the slope.
      *
      * @see #x0()
      * @see #y0()
@@ -113,7 +113,7 @@ public class Line implements Cloneable,
      * Returns the <var>x</var> value for <var>y</var> = 0.
      * Coordinate (<var>x₀</var>, 0) is the intersection point with the <var>x</var> axis.
      *
-     * @return The <var>x</var> value for <var>y</var> = 0.
+     * @return the <var>x</var> value for <var>y</var> = 0.
      *
      * @see #y0()
      * @see #slope()
@@ -126,8 +126,8 @@ public class Line implements Cloneable,
      * Computes <var>x</var> = <var>f</var>⁻¹(<var>y</var>).
      * If the line is horizontal, then this method returns an infinite value.
      *
-     * @param  y The <var>y</var> value where to evaluate the inverse function.
-     * @return The <var>x</var> value for the given <var>y</var> value.
+     * @param  y  the <var>y</var> value where to evaluate the inverse function.
+     * @return the <var>x</var> value for the given <var>y</var> value.
      *
      * @see #y(double)
      */
@@ -139,7 +139,7 @@ public class Line implements Cloneable,
      * Returns the <var>y</var> value for <var>x</var> = 0.
      * Coordinate (0, <var>y₀</var>) is the intersection point with the <var>y</var> axis.
      *
-     * @return The <var>y</var> value for <var>x</var> = 0.
+     * @return the <var>y</var> value for <var>x</var> = 0.
      *
      * @see #x0()
      * @see #slope()
@@ -152,8 +152,8 @@ public class Line implements Cloneable,
      * Computes <var>y</var> = <var>f</var>(<var>x</var>).
      * If the line is vertical, then this method returns an infinite value.
      *
-     * @param  x The <var>x</var> value where to evaluate the inverse function.
-     * @return The <var>y</var> value for the given <var>x</var> value.
+     * @param  x  the <var>x</var> value where to evaluate the inverse function.
+     * @return the <var>y</var> value for the given <var>x</var> value.
      *
      * @see #x(double)
      */
@@ -164,8 +164,8 @@ public class Line implements Cloneable,
     /**
      * Translates the line. The slope stay unchanged.
      *
-     * @param dx The horizontal translation.
-     * @param dy The vertical translation.
+     * @param  dx  the horizontal translation.
+     * @param  dy  the vertical translation.
      */
     public void translate(final double dx, final double dy) {
         if (slope == 0 || isInfinite(slope)) {
@@ -181,8 +181,8 @@ public class Line implements Cloneable,
      * Sets this line to the specified slope and offset.
      * The linear equation will be <var>y</var> = <var>slope</var>⋅<var>x</var> + <var>y₀</var>.
      *
-     * @param slope The slope.
-     * @param y0 The <var>y</var> value at <var>x</var> = 0.
+     * @param  slope  the slope.
+     * @param  y0     the <var>y</var> value at <var>x</var> = 0.
      *
      * @see #setFromPoints(double, double, double, double)
      * @see #fit(double[], double[])
@@ -197,10 +197,10 @@ public class Line implements Cloneable,
      * Sets a line through the specified points.
      * The line will continue toward infinity after the points.
      *
-     * @param x1 Ordinate <var>x</var> of the first point.
-     * @param y1 Ordinate <var>y</var> of the first point.
-     * @param x2 Ordinate <var>x</var> of the second point.
-     * @param y2 Ordinate <var>y</var> of the second point.
+     * @param  x1  ordinate <var>x</var> of the first point.
+     * @param  y1  ordinate <var>y</var> of the first point.
+     * @param  x2  ordinate <var>x</var> of the second point.
+     * @param  y2  ordinate <var>y</var> of the second point.
      */
     public void setFromPoints(final double x1, final double y1, final double x2, final double y2) {
         this.slope = (y2 - y1) / (x2 - x1);
@@ -222,9 +222,9 @@ public class Line implements Cloneable,
      * least-squares senses. This method assume that the <var>x</var> values are precise and all uncertainty
      * is in <var>y</var>.
      *
-     * @param x Vector of <var>x</var> values (independent variable).
-     * @param y Vector of <var>y</var> values (dependent variable).
-     * @return Estimation of the correlation coefficient. The closer this coefficient is to +1 or -1, the better the fit.
+     * @param  x  vector of <var>x</var> values (independent variable).
+     * @param  y  vector of <var>y</var> values (dependent variable).
+     * @return estimation of the correlation coefficient. The closer this coefficient is to +1 or -1, the better the fit.
      *
      * @throws IllegalArgumentException if <var>x</var> and <var>y</var> do not have the same length.
      */
@@ -241,8 +241,8 @@ public class Line implements Cloneable,
      * <p>Points shall be two dimensional with ordinate values in the (<var>x</var>,<var>y</var>) order.
      * {@link Double#NaN} ordinate values are ignored.</p>
      *
-     * @param  points The two-dimensional points.
-     * @return Estimation of the correlation coefficient. The closer this coefficient is to +1 or -1, the better the fit.
+     * @param  points  the two-dimensional points.
+     * @return estimation of the correlation coefficient. The closer this coefficient is to +1 or -1, the better the fit.
      * @throws MismatchedDimensionException if a point is not two-dimensional.
      */
     public double fit(final Iterable<? extends DirectPosition> points) {
@@ -264,7 +264,7 @@ public class Line implements Cloneable,
             }
             i++;
             final double x,y;
-            if (!isNaN(y = p.getOrdinate(1)) &&  // Test first the dimension which is most likely to contain NaN.
+            if (!isNaN(y = p.getOrdinate(1)) &&     // Test first the dimension which is most likely to contain NaN.
                 !isNaN(x = p.getOrdinate(0)))
             {
                 mean_x.add(x);
@@ -343,7 +343,7 @@ public class Line implements Cloneable,
     /**
      * Returns a clone of this line.
      *
-     * @return A clone of this line.
+     * @return a clone of this line.
      */
     @Override
     public Line clone() {
@@ -357,7 +357,7 @@ public class Line implements Cloneable,
     /**
      * Compares this line with the specified object for equality.
      *
-     * @param object The object to compare with this line for equality.
+     * @param  object  the object to compare with this line for equality.
      * @return {@code true} if both objects are equal.
      */
     @Override
@@ -384,7 +384,7 @@ public class Line implements Cloneable,
      * Returns a string representation of this line. This method returns the linear equation
      * in the form <var>y</var> = <var>slope</var>⋅<var>x</var> + <var>y₀</var>.
      *
-     * @return A string representation of this line.
+     * @return a string representation of this line.
      */
     @Override
     public String toString() {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -147,8 +147,8 @@ public final class MathFunctions extends
      * {@link Math#floor(double)} if the value is positive, or {@link Math#ceil(double)} if
      * the value is negative.
      *
-     * @param  value The value to truncate.
-     * @return The largest in magnitude (further from zero) integer value which is equals
+     * @param  value  the value to truncate.
+     * @return the largest in magnitude (further from zero) integer value which is equals
      *         or less in magnitude than the given value.
      */
     public static double truncate(final double value) {
@@ -171,8 +171,8 @@ public final class MathFunctions extends
      * typically aligned with the axes of a {@linkplain org.opengis.referencing.cs.CartesianCS
      * Cartesian coordinate system}.
      *
-     * @param  vector The vector for which to compute the magnitude.
-     * @return The magnitude of the given vector.
+     * @param  vector  the vector for which to compute the magnitude.
+     * @return the magnitude of the given vector.
      *
      * @see Math#hypot(double, double)
      */
@@ -238,8 +238,8 @@ public final class MathFunctions extends
      *   <li><code>Math.floor({@linkplain #LOG10_2} * getExponent(value)) == Math.floor(Math.log10(value))</code></li>
      * </ul>
      *
-     * @param  value The value for which to get the exponent.
-     * @return The unbiased exponent, corrected for sub-normal numbers if needed.
+     * @param  value  the value for which to get the exponent.
+     * @return the unbiased exponent, corrected for sub-normal numbers if needed.
      *         Values will be in the [-1075 … 1024] range, inclusive.
      *
      * @see Math#getExponent(double)
@@ -268,7 +268,7 @@ public final class MathFunctions extends
      * <code>{@linkplain Math#pow(double, double) Math.pow}(10, x)</code>, but is slightly more accurate
      * in the special case where the given argument is an integer.
      *
-     * @param x The exponent.
+     * @param  x  the exponent.
      * @return 10 raised to the given exponent.
      *
      * @see #pow10(int)
@@ -302,7 +302,7 @@ public final class MathFunctions extends
      *   <li>For all other <var>x</var> values, the result is the closest IEEE 754 approximation.</li>
      * </ul>
      *
-     * @param x The exponent.
+     * @param  x  the exponent.
      * @return 10 raised to the given exponent.
      *
      * @see #pow10(double)
@@ -317,8 +317,8 @@ public final class MathFunctions extends
      * Returns the inverse hyperbolic sine of the given value.
      * This is the inverse of the {@link Math#sinh(double)} method.
      *
-     * @param  x The value for which to compute the inverse hyperbolic sine.
-     * @return The inverse hyperbolic sine of the given value.
+     * @param  x  the value for which to compute the inverse hyperbolic sine.
+     * @return the inverse hyperbolic sine of the given value.
      *
      * @see Math#sinh(double)
      *
@@ -332,8 +332,8 @@ public final class MathFunctions extends
      * Returns the inverse hyperbolic cosine of the given value.
      * This is the inverse of the {@link Math#cosh(double)} method.
      *
-     * @param  x The value for which to compute the inverse hyperbolic cosine.
-     * @return The inverse hyperbolic cosine of the given value.
+     * @param  x  the value for which to compute the inverse hyperbolic cosine.
+     * @return the inverse hyperbolic cosine of the given value.
      *
      * @see Math#cosh(double)
      *
@@ -355,8 +355,8 @@ public final class MathFunctions extends
      *   <li>For <var>x</var> = +1, this method returns {@linkplain Double#POSITIVE_INFINITY positive infinity}.</li>
      * </ul>
      *
-     * @param  x The value for which to compute the inverse hyperbolic tangent.
-     * @return The inverse hyperbolic tangent of the given value.
+     * @param  x  the value for which to compute the inverse hyperbolic tangent.
+     * @return the inverse hyperbolic tangent of the given value.
      *
      * @see Math#tanh(double)
      */
@@ -384,7 +384,7 @@ public final class MathFunctions extends
      * The handling of zero values is the difference between invoking {@code isPositive(double)}
      * and testing if (<var>value</var> {@literal >= 0}).
      *
-     * @param  value The value to test.
+     * @param  value  the value to test.
      * @return {@code true} if the given value is positive, excluding negative zero.
      *
      * @see #isPositiveZero(double)
@@ -403,7 +403,7 @@ public final class MathFunctions extends
      *   return (value == 0) && isPositive(value);
      * }
      *
-     * @param  value The value to test.
+     * @param  value  the value to test.
      * @return {@code true} if the given value is +0.0 (not -0.0).
      *
      * @see #isPositive(double)
@@ -429,7 +429,7 @@ public final class MathFunctions extends
      * The handling of zero values is the difference between invoking {@code isNegative(double)}
      * and testing if (<var>value</var> {@literal < 0}).
      *
-     * @param  value The value to test.
+     * @param  value  the value to test.
      * @return {@code true} if the given value is negative, including negative zero.
      *
      * @see #isNegativeZero(double)
@@ -448,7 +448,7 @@ public final class MathFunctions extends
      *   return (value == 0) && isNegative(value);
      * }
      *
-     * @param  value The value to test.
+     * @param  value  the value to test.
      * @return {@code true} if the given value is -0.0 (not +0.0).
      *
      * @see #isNegative(double)
@@ -470,8 +470,8 @@ public final class MathFunctions extends
      *   <li>If any value is {@link Double#isNaN(double) NaN}, returns {@code false}</li>
      * </ul>
      *
-     * @param  v1 The first value.
-     * @param  v2 The second value, to compare the sign with the first value.
+     * @param  v1  the first value.
+     * @param  v2  the second value, to compare the sign with the first value.
      * @return {@code true} if the given values are not NaN and have the same sign.
      *
      * @see Math#signum(double)
@@ -490,9 +490,9 @@ public final class MathFunctions extends
      * <p>This method makes no guarantee about whether {@code NaN} values are handled as positive
      * or negative numbers. This is the same policy than {@link Math#copySign(double, double)}.</p>
      *
-     * @param  value The parameter providing the value that may need a sign change.
-     * @param  sign The parameter providing the sign to <cite>xor</cite> with the value.
-     * @return The provided value with its sign reversed if the {@code sign} parameter is negative.
+     * @param  value  the parameter providing the value that may need a sign change.
+     * @param  sign   the parameter providing the sign to <cite>xor</cite> with the value.
+     * @return the provided value with its sign reversed if the {@code sign} parameter is negative.
      *
      * @see Math#copySign(double, double)
      */
@@ -514,10 +514,10 @@ public final class MathFunctions extends
      *   <li>Otherwise, this method returns the result of the {@code abs(v1 - v2) <= ε} comparison.</li>
      * </ul>
      *
-     * @param  v1 The first value to compare.
-     * @param  v2 The second value to compare.
-     * @param  ε  The tolerance threshold, which must be positive.
-     * @return {@code true} If both values are equal given the tolerance threshold.
+     * @param  v1  the first value to compare.
+     * @param  v2  the second value to compare.
+     * @param  ε   the tolerance threshold, which must be positive.
+     * @return {@code true} if both values are equal given the tolerance threshold.
      */
     public static boolean epsilonEqual(final float v1, final float v2, final float ε) {
         return (Math.abs(v1 - v2) <= ε) || Float.floatToIntBits(v1) == Float.floatToIntBits(v2);
@@ -536,10 +536,10 @@ public final class MathFunctions extends
      *   <li>Otherwise, this method returns the result of the {@code abs(v1 - v2) <= ε} comparison.</li>
      * </ul>
      *
-     * @param  v1 The first value to compare.
-     * @param  v2 The second value to compare.
-     * @param  ε  The tolerance threshold, which must be positive.
-     * @return {@code true} If both values are equal given the tolerance threshold.
+     * @param  v1  the first value to compare.
+     * @param  v2  the second value to compare.
+     * @param  ε   the tolerance threshold, which must be positive.
+     * @return {@code true} if both values are equal given the tolerance threshold.
      */
     public static boolean epsilonEqual(final double v1, final double v2, final double ε) {
         return (Math.abs(v1 - v2) <= ε) || Double.doubleToLongBits(v1) == Double.doubleToLongBits(v2);
@@ -562,8 +562,8 @@ public final class MathFunctions extends
      * may change in any future version of the SIS library. The current implementation restricts the
      * range of allowed ordinal values to a smaller one than the range of all possible values.</p>
      *
-     * @param  ordinal The NaN ordinal value, from {@code -0x200000} to {@code 0x1FFFFF} inclusive.
-     * @return One of the legal {@linkplain Float#isNaN(float) NaN} values as a float.
+     * @param  ordinal  the NaN ordinal value, from {@code -0x200000} to {@code 0x1FFFFF} inclusive.
+     * @return one of the legal {@linkplain Float#isNaN(float) NaN} values as a float.
      * @throws IllegalArgumentException if the specified ordinal is out of range.
      *
      * @see Float#intBitsToFloat(int)
@@ -579,9 +579,9 @@ public final class MathFunctions extends
      * Returns the ordinal value of the given NaN number.
      * This method is the converse of {@link #toNanFloat(int)}.
      *
-     * @param  value The value from which to get the NaN ordinal value.
-     * @return The NaN ordinal value of the given floating point value.
-     * @throws IllegalArgumentException If the given value is not a NaN value,
+     * @param  value  the value from which to get the NaN ordinal value.
+     * @return the NaN ordinal value of the given floating point value.
+     * @throws IllegalArgumentException if the given value is not a NaN value,
      *         or does not use a supported bits pattern.
      */
     public static int toNanOrdinal(final float value) throws IllegalArgumentException {
@@ -617,8 +617,8 @@ public final class MathFunctions extends
      *       (this policy may be revisited in future SIS version).</li>
      * </ul>
      *
-     * @param l0 upper part of the quadruple precision floating point number.
-     * @param l1 lower part of the quadruple precision floating point number.
+     * @param  l0  upper part of the quadruple precision floating point number.
+     * @param  l1  lower part of the quadruple precision floating point number.
      * @return double precision approximation.
      *
      * @see <a href="https://en.wikipedia.org/wiki/Quadruple-precision_floating-point_format">Quadruple-precision floating-point format on Wikipedia</a>
@@ -667,8 +667,8 @@ public final class MathFunctions extends
      * Returns the <var>i</var><sup>th</sup> prime number.
      * This method returns (2, 3, 5, 7, 11, …) for index (0, 1, 2, 3, 4, …).
      *
-     * @param  index The prime number index, starting at index 0 for prime number 2.
-     * @return The prime number at the specified index.
+     * @param  index  the prime number index, starting at index 0 for prime number 2.
+     * @return the prime number at the specified index.
      * @throws IndexOutOfBoundsException if the specified index is too large.
      *
      * @see java.math.BigInteger#isProbablePrime(int)
@@ -685,7 +685,7 @@ public final class MathFunctions extends
                     // Compute by block of 16 values, for reducing the amount of array resize.
                     primes = Arrays.copyOf(primes, Math.min((index | 0xF) + 1, PRIMES_LENGTH_16_BITS));
                     do {
-testNextNumber:         while (true) { // Simulate a "goto" statement (usually not recommanded...)
+testNextNumber:         while (true) {      // Simulate a "goto" statement (usually not recommanded...)
                             final int stopAt = (int) Math.sqrt(n += 2);
                             int prime;
                             int j = 0;
@@ -711,9 +711,9 @@ testNextNumber:         while (true) { /
      * Current implementation accepts only values in the
      * [2 … {@value #HIGHEST_SUPPORTED_PRIME_NUMBER}] range.
      *
-     * @param  number The number for which to find the next prime.
-     * @return The given number if it is a prime number, or the next prime number otherwise.
-     * @throws IllegalArgumentException If the given value is outside the supported range.
+     * @param  number  the number for which to find the next prime.
+     * @return the given number if it is a prime number, or the next prime number otherwise.
+     * @throws IllegalArgumentException if the given value is outside the supported range.
      *
      * @see java.math.BigInteger#isProbablePrime(int)
      */
@@ -744,8 +744,8 @@ testNextNumber:         while (true) { /
      * than {@code O} (which returns an empty array), the first element in the returned array
      * is always {@code 1} and the last element is always the absolute value of {@code number}.
      *
-     * @param number The number for which to compute the divisors.
-     * @return The divisors in strictly increasing order.
+     * @param  number  the number for which to compute the divisors.
+     * @return the divisors in strictly increasing order.
      */
     public static int[] divisors(int number) {
         if (number == 0) {
@@ -761,7 +761,7 @@ testNextNumber:         while (true) { /
          * values before that point, i.e. if n=p1*p2 and p2 is greater than 'sqrt', than p1
          * most be lower than 'sqrt'.
          */
-        final int sqrt = (int) Math.sqrt(number); // Really wants rounding toward 0.
+        final int sqrt = (int) Math.sqrt(number);               // Really want rounding toward 0.
         for (int p,i=0; (p=primeNumberAt(i)) <= sqrt; i++) {
             if (number % p == 0) {
                 if (count == divisors.length) {
@@ -799,7 +799,7 @@ testNextNumber:         while (true) { /
                 if (number % d2 == 0) {
                     int p = Arrays.binarySearch(divisors, j, count, d2);
                     if (p < 0) {
-                        p = ~p; // ~ operator, not minus
+                        p = ~p;                                 // tild (~) operator, not minus
                         if (count == divisors.length) {
                             divisors = Arrays.copyOf(divisors, count*2);
                         }
@@ -818,8 +818,8 @@ testNextNumber:         while (true) { /
     /**
      * Returns the divisors which are common to all the specified numbers.
      *
-     * @param  numbers The numbers for which to compute the divisors.
-     * @return The divisors common to all the given numbers, in strictly increasing order.
+     * @param  numbers  the numbers for which to compute the divisors.
+     * @return the divisors common to all the given numbers, in strictly increasing order.
      */
     public static int[] commonDivisors(final int... numbers) {
         if (numbers.length == 0) {
@@ -846,7 +846,7 @@ testNextNumber:         while (true) { /
         for (int i=0; i<numbers.length; i++) {
             final int n = Math.abs(numbers[i]);
             if (n != minValue) {
-                for (int j=count; --j>0;) { // Do not test j==0, since divisors[0] ==  1.
+                for (int j=count; --j>0;) {         // Do not test j==0, since divisors[0] ==  1.
                     if (n % divisors[j] != 0) {
                         System.arraycopy(divisors, j+1, divisors, j, --count - j);
                     }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -109,9 +109,9 @@ public class Plane implements Cloneable,
     /**
      * Constructs a new plane initialized to the given coefficients.
      *
-     * @param sx The slope along the <var>x</var> values.
-     * @param sy The slope along the <var>y</var> values.
-     * @param z0 The <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0).
+     * @param sx  the slope along the <var>x</var> values.
+     * @param sy  the slope along the <var>y</var> values.
+     * @param z0  the <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0).
      *
      * @see #setEquation(double, double, double)
      */
@@ -125,7 +125,7 @@ public class Plane implements Cloneable,
      * Returns the slope along the <var>x</var> values. This coefficient appears in the plane equation
      * <var><b><u>sx</u></b></var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> + <var>z₀</var>.
      *
-     * @return The <var>sx</var> term.
+     * @return the <var>sx</var> term.
      */
     public final double slopeX() {
         return sx;
@@ -135,7 +135,7 @@ public class Plane implements Cloneable,
      * Returns the slope along the <var>y</var> values. This coefficient appears in the plane equation
      * <var>sx</var>⋅<var>x</var> + <var><b><u>sy</u></b></var>⋅<var>y</var> + <var>z₀</var>.
      *
-     * @return The <var>sy</var> term.
+     * @return the <var>sy</var> term.
      */
     public final double slopeY() {
         return sy;
@@ -145,7 +145,7 @@ public class Plane implements Cloneable,
      * Returns the <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0). This coefficient appears in the
      * plane equation <var>sx</var>⋅<var>x</var> + <var>sy</var>⋅<var>y</var> + <b><var>z₀</var></b>.
      *
-     * @return The <var>z₀</var> term.
+     * @return the <var>z₀</var> term.
      *
      * @see #z(double, double)
      */
@@ -159,9 +159,9 @@ public class Plane implements Cloneable,
      *
      * <blockquote>x(y,z) = (z - ({@linkplain #z0() z₀} + {@linkplain #slopeY() sy}⋅y)) / {@linkplain #slopeX() sx}</blockquote>
      *
-     * @param y The <var>y</var> value where to compute <var>x</var>.
-     * @param z The <var>z</var> value where to compute <var>x</var>.
-     * @return  The <var>x</var> value.
+     * @param y the <var>y</var> value where to compute <var>x</var>.
+     * @param z the <var>z</var> value where to compute <var>x</var>.
+     * @return  the <var>x</var> value.
      */
     public final double x(final double y, final double z) {
         return (z - (z0 + sy*y)) / sx;
@@ -173,9 +173,9 @@ public class Plane implements Cloneable,
      *
      * <blockquote>y(x,z) = (z - ({@linkplain #z0() z₀} + {@linkplain #slopeX() sx}⋅x)) / {@linkplain #slopeY() sy}</blockquote>
      *
-     * @param x The <var>x</var> value where to compute <var>y</var>.
-     * @param z The <var>z</var> value where to compute <var>y</var>.
-     * @return  The <var>y</var> value.
+     * @param x the <var>x</var> value where to compute <var>y</var>.
+     * @param z the <var>z</var> value where to compute <var>y</var>.
+     * @return  the <var>y</var> value.
      */
     public final double y(final double x, final double z) {
         return (z - (z0 + sx*x)) / sy;
@@ -187,9 +187,9 @@ public class Plane implements Cloneable,
      *
      * <blockquote>z(x,y) = {@linkplain #slopeX() sx}⋅x + {@linkplain #slopeY() sy}⋅y + {@linkplain #z0() z₀}</blockquote>
      *
-     * @param x The <var>x</var> value where to compute <var>z</var>.
-     * @param y The <var>y</var> value where to compute <var>z</var>.
-     * @return  The <var>z</var> value.
+     * @param x the <var>x</var> value where to compute <var>z</var>.
+     * @param y the <var>y</var> value where to compute <var>z</var>.
+     * @return  the <var>z</var> value.
      *
      * @see #z0()
      */
@@ -200,9 +200,9 @@ public class Plane implements Cloneable,
     /**
      * Sets the equation of this plane to the given coefficients.
      *
-     * @param sx The slope along the <var>x</var> values.
-     * @param sy The slope along the <var>y</var> values.
-     * @param z0 The <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0).
+     * @param sx  the slope along the <var>x</var> values.
+     * @param sy  the slope along the <var>y</var> values.
+     * @param z0  the <var>z</var> value at (<var>x</var>,<var>y</var>) = (0,0).
      */
     public void setEquation(final double sx, final double sy, final double z0) {
         this.sx = sx;
@@ -219,10 +219,10 @@ public class Plane implements Cloneable,
      * <p>{@link Double#NaN} values are ignored.
      * The result is undetermined if all points are colinear.</p>
      *
-     * @param  x vector of <var>x</var> coordinates.
-     * @param  y vector of <var>y</var> coordinates.
-     * @param  z vector of <var>z</var> values.
-     * @return An estimation of the Pearson correlation coefficient.
+     * @param  x  vector of <var>x</var> coordinates.
+     * @param  y  vector of <var>y</var> coordinates.
+     * @param  z  vector of <var>z</var> values.
+     * @return an estimation of the Pearson correlation coefficient.
      * @throws IllegalArgumentException if <var>x</var>, <var>y</var> and <var>z</var> do not have the same length.
      */
     public double fit(final double[] x, final double[] y, final double[] z) {
@@ -240,8 +240,8 @@ public class Plane implements Cloneable,
      * {@link Double#NaN} ordinate values are ignored.
      * The result is undetermined if all points are colinear.</p>
      *
-     * @param  points The three-dimensional points.
-     * @return An estimation of the Pearson correlation coefficient.
+     * @param  points  the three-dimensional points.
+     * @return an estimation of the Pearson correlation coefficient.
      * @throws MismatchedDimensionException if a point is not three-dimensional.
      */
     public double fit(final Iterable<? extends DirectPosition> points) {
@@ -379,7 +379,7 @@ public class Plane implements Cloneable,
     /**
      * Returns a clone of this plane.
      *
-     * @return A clone of this plane.
+     * @return a clone of this plane.
      */
     @Override
     public Plane clone() {
@@ -393,7 +393,7 @@ public class Plane implements Cloneable,
     /**
      * Compares this plane with the specified object for equality.
      *
-     * @param object The object to compare with this plane for equality.
+     * @param  object  the object to compare with this plane for equality.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.math;
 
+import java.util.Objects;
 import java.io.Serializable;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.ArgumentChecks;
@@ -27,7 +28,6 @@ import static java.lang.Double.isNaN;
 import static java.lang.Double.doubleToLongBits;
 
 // Branch-dependent imports
-import java.util.Objects;
 import org.apache.sis.internal.jdk8.LongConsumer;
 import org.apache.sis.internal.jdk8.DoubleConsumer;
 
@@ -157,9 +157,9 @@ public class Statistics implements Doubl
      * If differences or discrete derivatives are wanted, use the {@link #forSeries forSeries(…)}
      * method instead.</p>
      *
-     * @param name The phenomenon for which this object is collecting statistics, or {@code null}
-     *             if none. If non-null, then this name will be shown as column header in the table
-     *             formatted by {@link StatisticsFormat}.
+     * @param  name  the phenomenon for which this object is collecting statistics, or {@code null}
+     *               if none. If non-null, then this name will be shown as column header in the table
+     *               formatted by {@link StatisticsFormat}.
      */
     public Statistics(final CharSequence name) {
         this.name = Types.toInternationalString(name);
@@ -196,12 +196,12 @@ public class Statistics implements Doubl
      *
      *
      *
-     * @param  name  The phenomenon for which this object is collecting statistics, or {@code null}
+     * @param  name  the phenomenon for which this object is collecting statistics, or {@code null}
      *               if none. If non-null, then this name will be shown as column header in the table
      *               formatted by {@link StatisticsFormat}.
-     * @param  differenceNames The names of the statistics on differences.
+     * @param  differenceNames  the names of the statistics on differences.
      *         The given array can not be null, but can contain null elements.
-     * @return The newly constructed, initially empty, set of statistics.
+     * @return the newly constructed, initially empty, set of statistics.
      *
      * @see #differences()
      */
@@ -220,7 +220,7 @@ public class Statistics implements Doubl
      * If non-null, then this name will be shown as column header in the table formatted
      * by {@link StatisticsFormat}.
      *
-     * @return The phenomenon for which this object is collecting statistics, or {@code null} if none.
+     * @return the phenomenon for which this object is collecting statistics, or {@code null} if none.
      */
     public InternationalString name() {
         return name;
@@ -247,7 +247,7 @@ public class Statistics implements Doubl
      * {@link Double#NaN NaN} values increment the {@linkplain #countNaN() NaN count},
      * but are otherwise ignored.
      *
-     * @param sample The sample value (may be NaN).
+     * @param  sample  the sample value (may be NaN).
      *
      * @see #accept(long)
      * @see #combine(Statistics)
@@ -265,13 +265,16 @@ public class Statistics implements Doubl
      * Implementation of {@link #accept(double)} for real (non-NaN) numbers.
      */
     private void real(double sample) {
-        // Two next lines use !(a >= b) instead than
-        // (a < b) in order to take NaN in account.
+        /*
+         * Two next lines use !(a >= b) instead than
+         * (a < b) in order to take NaN in account.
+         */
         if (!(minimum <= sample)) minimum = sample;
         if (!(maximum >= sample)) maximum = sample;
-
-        // According algebraic laws, lowBits should always been zero. But it is
-        // not when using floating points with limited precision. Do not simplify!
+        /*
+         * According algebraic laws, 'lowBits' should always been zero. But it is
+         * not when using floating points with limited precision. Do not simplify!
+         */
         double y = sample + lowBits;
         lowBits = y + (sum - (sum += y));
 
@@ -287,7 +290,7 @@ public class Statistics implements Doubl
      * For very large integer values (greater than 2<sup>52</sup> in magnitude),
      * this method may be more accurate than the {@link #accept(double)} version.
      *
-     * @param sample The sample value.
+     * @param  sample  the sample value.
      *
      * @see #accept(double)
      * @see #combine(Statistics)
@@ -302,7 +305,7 @@ public class Statistics implements Doubl
      * Invoking this method is equivalent (except for rounding errors) to invoking
      * {@link #accept(double) accept(…)} for all samples that were added to {@code stats}.
      *
-     * @param stats The statistics to be added to {@code this}.
+     * @param  stats  the statistics to be added to {@code this}.
      */
     public void combine(final Statistics stats) {
         ArgumentChecks.ensureNonNull("stats", stats);
@@ -331,7 +334,7 @@ public class Statistics implements Doubl
      * sample values. See {@link #differences()} or {@link #forSeries forSeries(…)} for more
      * information.</p>
      *
-     * @param factor The factor by which to multiply the statistics.
+     * @param  factor  the factor by which to multiply the statistics.
      */
     public void scale(double factor) {
         ArgumentChecks.ensureFinite("factor", factor);
@@ -356,16 +359,16 @@ public class Statistics implements Doubl
      * {@code NaN} samples are ignored in all other statistical computation.
      * This method count them for information purpose only.
      *
-     * @return The number of NaN values.
+     * @return the number of NaN values.
      */
     public int countNaN() {
-        return max(countNaN, 0); // The Delta subclass initializes countNaN to -1.
+        return max(countNaN, 0);                // The Delta subclass initializes countNaN to -1.
     }
 
     /**
      * Returns the number of samples, excluding {@link Double#NaN NaN} values.
      *
-     * @return The number of sample values, excluding NaN.
+     * @return the number of sample values, excluding NaN.
      */
     public int count() {
         return count;
@@ -374,7 +377,7 @@ public class Statistics implements Doubl
     /**
      * Returns the minimum sample value, or {@link Double#NaN NaN} if none.
      *
-     * @return The minimum sample value, or NaN if none.
+     * @return the minimum sample value, or NaN if none.
      */
     public double minimum() {
         return minimum;
@@ -383,7 +386,7 @@ public class Statistics implements Doubl
     /**
      * Returns the maximum sample value, or {@link Double#NaN NaN} if none.
      *
-     * @return The maximum sample value, or NaN if none.
+     * @return the maximum sample value, or NaN if none.
      */
     public double maximum() {
         return maximum;
@@ -393,7 +396,7 @@ public class Statistics implements Doubl
      * Equivalents to <code>{@link #maximum() maximum} - {@link #minimum() minimum}</code>.
      * If no samples were added, then returns {@link Double#NaN NaN}.
      *
-     * @return The span of sample values, or NaN if none.
+     * @return the span of sample values, or NaN if none.
      */
     public double span() {
         return maximum - minimum;
@@ -402,7 +405,7 @@ public class Statistics implements Doubl
     /**
      * Returns the sum, or 0 if none.
      *
-     * @return The sum, or 0 if none.
+     * @return the sum, or 0 if none.
      */
     public double sum() {
         return sum;
@@ -411,7 +414,7 @@ public class Statistics implements Doubl
     /**
      * Returns the mean value, or {@link Double#NaN NaN} if none.
      *
-     * @return The mean value, or NaN if none.
+     * @return the mean value, or NaN if none.
      */
     public double mean() {
         return sum / count;
@@ -420,7 +423,7 @@ public class Statistics implements Doubl
     /**
      * Returns the root mean square, or {@link Double#NaN NaN} if none.
      *
-     * @return The root mean square, or NaN if none.
+     * @return the root mean square, or NaN if none.
      */
     public double rms() {
         return sqrt(squareSum / count);
@@ -448,10 +451,9 @@ public class Statistics implements Doubl
      *   <tr><td>3.0</td><td>99.9%</td><td>100%</td></tr>
      * </table>
      *
-     * @param allPopulation
-     *          {@code true} if sample values given to {@code accept(…)} methods were the totality
-     *          of the population under study, or {@code false} if they were only a sampling.
-     * @return  The standard deviation.
+     * @param  allPopulation  {@code true} if sample values given to {@code accept(…)} methods were the totality
+     *                        of the population under study, or {@code false} if they were only a sampling.
+     * @return the standard deviation.
      */
     public double standardDeviation(final boolean allPopulation) {
         return sqrt((squareSum - sum*sum/count) / (allPopulation ? count : count-1));
@@ -479,7 +481,7 @@ public class Statistics implements Doubl
      * More generally, calls to this method can be chained up to {@code differenceNames.length} times for
      * fetching second or higher order derivatives, as in the above example.
      *
-     * @return The statistics on the differences between consecutive sample values,
+     * @return the statistics on the differences between consecutive sample values,
      *         or {@code null} if not calculated by this object.
      *
      * @see #forSeries(CharSequence, CharSequence[])
@@ -502,7 +504,7 @@ public class Statistics implements Doubl
      *     Standard deviation:  6.489
      * }
      *
-     * @return A string representation of this statistics object.
+     * @return a string representation of this statistics object.
      *
      * @see StatisticsFormat
      */
@@ -514,7 +516,7 @@ public class Statistics implements Doubl
     /**
      * Returns a clone of this statistics.
      *
-     * @return A clone of this statistics.
+     * @return a clone of this statistics.
      */
     @Override
     public Statistics clone() {
@@ -541,7 +543,7 @@ public class Statistics implements Doubl
     /**
      * Compares this statistics with the specified object for equality.
      *
-     * @param  object The object to compare with.
+     * @param  object  the object to compare with.
      * @return {@code true} if both objects are equal.
      */
     @Override
@@ -611,13 +613,13 @@ public class Statistics implements Doubl
          * consecutive sample values. Other kinds of {@link Statistics} object could be
          * chained as well.
          *
-         * @param name  The phenomenon for which this object is collecting statistics, or {@code null}.
-         * @param delta The object where to stores delta statistics.
+         * @param  name   the phenomenon for which this object is collecting statistics, or {@code null}.
+         * @param  delta  the object where to stores delta statistics.
          */
         WithDelta(final CharSequence name, final Statistics delta) {
             super(name);
             this.delta = delta;
-            delta.decrementCountNaN(); // Do not count the first NaN, which will always be the first value.
+            delta.decrementCountNaN();      // Do not count the first NaN, which will always be the first value.
         }
 
         /**
@@ -627,7 +629,7 @@ public class Statistics implements Doubl
         public void reset() {
             super.reset();
             delta.reset();
-            delta.decrementCountNaN(); // Do not count the first NaN, which will always be the first value.
+            delta.decrementCountNaN();      // Do not count the first NaN, which will always be the first value.
             last       = NaN;
             lastAsLong = 0;
         }
@@ -654,12 +656,16 @@ public class Statistics implements Doubl
         public void accept(final long sample) {
             super.accept(sample);
             if (last == (double) lastAsLong) {
-                // 'lastAsLong' may have more precision than 'last' since the cast to the
-                // 'double' type may loose some digits. Invoke the 'delta.accept(long)' version.
+                /*
+                 * 'lastAsLong' may have more precision than 'last' since the cast to the
+                 * 'double' type may loose some digits. Invoke the 'delta.accept(long)' version.
+                 */
                 delta.accept(sample - lastAsLong);
             } else {
-                // The sample value is either fractional, outside 'long' range,
-                // infinity or NaN. Invoke the 'delta.accept(double)' version.
+                /*
+                 * The sample value is either fractional, outside 'long' range,
+                 * infinity or NaN. Invoke the 'delta.accept(double)' version.
+                 */
                 delta.accept(sample - last);
             }
             last       = sample;
@@ -669,8 +675,7 @@ public class Statistics implements Doubl
         /**
          * Update statistics with all samples from the specified {@code stats}.
          *
-         * @throws ClassCastException If {@code stats} is not an instance of
-         *         {@code Statistics.Delta}.
+         * @throws ClassCastException if {@code stats} is not an instance of {@code Statistics.Delta}.
          */
         @Override
         public void combine(final Statistics stats) throws ClassCastException {



Mime
View raw message