sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1773266 [1/2] - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ core/...
Date Thu, 08 Dec 2016 16:22:44 GMT
Author: desruisseaux
Date: Thu Dec  8 16:22:44 2016
New Revision: 1773266

URL: http://svn.apache.org/viewvc?rev=1773266&view=rev
Log:
Cleaning: add 'throws ObjectStreamException' after 'readResolve()' method: even if it appears to not be necessary, the java.io.Serializable specification nevertheless seems to consider it as mandatory.
Opportunistic javadoc formatting.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/GlobalNameSpace.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilInternationalString.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
    sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.io.wkt;
 
 import java.util.EnumMap;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.apache.sis.internal.util.X364;
 import org.apache.sis.util.resources.Errors;
 
@@ -110,7 +111,7 @@ public class Colors implements Cloneable
     /**
      * Creates a new set of colors initialized to a copy of the given one.
      *
-     * @param colors The set of colors to copy.
+     * @param colors  the set of colors to copy.
      */
     public Colors(final Colors colors) {
         map = new EnumMap<>(colors.map);
@@ -122,9 +123,9 @@ public class Colors implements Cloneable
      * {@code "red"}, {@code "green"}, {@code "yellow"}, {@code "blue"}, {@code "magenta"}, {@code "cyan"}
      * and {@code "gray"}, case-insensitive.
      *
-     * @param  key   The syntactic element for which to set the color.
-     * @param  color The color to give to the specified element, or {@code null} if none.
-     * @throws IllegalArgumentException If the given color name is not recognized.
+     * @param  key    the syntactic element for which to set the color.
+     * @param  color  the color to give to the specified element, or {@code null} if none.
+     * @throws IllegalArgumentException if the given color name is not recognized.
      */
     public void setName(final ElementKind key, final String color) throws IllegalArgumentException {
         if (isImmutable) {
@@ -143,7 +144,7 @@ public class Colors implements Cloneable
      * @param key The syntactic element for which to get the color.
      * @return The color of the specified element, or {@code null} if none.
      */
-    public final String getName(final ElementKind key) { // Declared final for consistency with getAnsiSequence(…)
+    public final String getName(final ElementKind key) {      // Declared final for consistency with getAnsiSequence(…)
         final X364 color = map.get(key);
         return (color != null) ? color.color : null;
     }
@@ -171,7 +172,7 @@ public class Colors implements Cloneable
     /**
      * Returns a clone of this {@code Colors}.
      *
-     * @return A clone of this {@code Colors}.
+     * @return a clone of this {@code Colors}.
      */
     @Override
     public Colors clone() {
@@ -189,7 +190,7 @@ public class Colors implements Cloneable
     /**
      * Compares this {@code Colors} with the given object for equality.
      *
-     * @param  other The object to compare with this {@code Colors}.
+     * @param  other  the object to compare with this {@code Colors}.
      * @return {@code true} if both objects are equal.
      */
     @Override
@@ -204,7 +205,7 @@ public class Colors implements Cloneable
     /**
      * Returns a hash code value for this object.
      *
-     * @return A hash code value.
+     * @return a hash code value.
      */
     @Override
     public int hashCode() {
@@ -214,9 +215,9 @@ public class Colors implements Cloneable
     /**
      * Replaces the deserialized instance by {@link #DEFAULT} one if possible.
      *
-     * @return The object to use after deserialization.
+     * @return the object to use after deserialization.
      */
-    final Object readResolve() {
+    final Object readResolve() throws ObjectStreamException {
         return isImmutable && map.equals(DEFAULT.map) ? DEFAULT : this;
     }
 }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -19,6 +19,7 @@ package org.apache.sis.io.wkt;
 import java.util.Arrays;
 import java.util.Locale;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import java.text.NumberFormat;
 import org.apache.sis.util.Localized;
 import org.apache.sis.util.Workaround;
@@ -192,7 +193,7 @@ public class Symbols implements Localize
     /**
      * Creates a new set of WKT symbols initialized to a copy of the given symbols.
      *
-     * @param symbols The symbols to copy.
+     * @param symbols  the symbols to copy.
      */
     public Symbols(final Symbols symbols) {
         ensureNonNull("symbols", symbols);
@@ -235,7 +236,7 @@ public class Symbols implements Localize
      * Returns the default set of symbols.
      * This is currently set to {@link #SQUARE_BRACKETS}.
      *
-     * @return The default set of symbols.
+     * @return the default set of symbols.
      */
     public static Symbols getDefault() {
         return SQUARE_BRACKETS;
@@ -251,7 +252,7 @@ public class Symbols implements Localize
      * On the contrary, the {@code Locale} property of this {@code Symbols} class controls
      * the decimal format symbols and is very rarely set to an other locale than {@code Locale.ROOT}.
      *
-     * @return The locale for dates and numbers.
+     * @return the locale for dates and numbers.
      *
      * @see WKTFormat#getLocale(Locale.Category)
      */
@@ -265,7 +266,7 @@ public class Symbols implements Localize
      * Note that any non-English locale is likely to produce WKT that do not conform to ISO 19162.
      * Such WKT can be used for human reading, but not for data export.
      *
-     * @param locale The new symbols locale.
+     * @param  locale  the new symbols locale.
      */
     public void setLocale(final Locale locale) {
         checkWritePermission();
@@ -297,7 +298,7 @@ public class Symbols implements Localize
      * Returns the number of paired brackets. For example if the WKT parser accepts both the
      * {@code […]} and {@code (…)} bracket pairs, then this method returns 2.
      *
-     * @return The number of bracket pairs.
+     * @return the number of bracket pairs.
      *
      * @see #getOpeningBracket(int)
      * @see #getClosingBracket(int)
@@ -311,8 +312,8 @@ public class Symbols implements Localize
      * Index 0 stands for the default bracket used at formatting time.
      * All other index are for optional brackets accepted at parsing time.
      *
-     * @param  index Index of the opening bracket to get, from 0 to {@link #getNumPairedBrackets()} exclusive.
-     * @return The opening bracket at the given index, as a Unicode code point.
+     * @param  index  index of the opening bracket to get, from 0 to {@link #getNumPairedBrackets()} exclusive.
+     * @return the opening bracket at the given index, as a Unicode code point.
      * @throws IndexOutOfBoundsException if the given index is out of bounds.
      */
     public final int getOpeningBracket(final int index) {
@@ -324,8 +325,8 @@ public class Symbols implements Localize
      * Index 0 stands for the default bracket used at formatting time.
      * All other index are for optional brackets accepted at parsing time.
      *
-     * @param  index Index of the closing bracket to get, from 0 to {@link #getNumPairedBrackets()} exclusive.
-     * @return The closing bracket at the given index, as a Unicode code point.
+     * @param  index  index of the closing bracket to get, from 0 to {@link #getNumPairedBrackets()} exclusive.
+     * @return the closing bracket at the given index, as a Unicode code point.
      * @throws IndexOutOfBoundsException if the given index is out of bounds.
      */
     public final int getClosingBracket(final int index) {
@@ -345,8 +346,8 @@ public class Symbols implements Localize
      *   symbols.setPairedBrackets("()", "[]");
      * }</div>
      *
-     * @param preferred The preferred pair of opening and closing quotes, used at formatting time.
-     * @param alternatives Alternative pairs of opening and closing quotes accepted at parsing time.
+     * @param  preferred     the preferred pair of opening and closing quotes, used at formatting time.
+     * @param  alternatives  alternative pairs of opening and closing quotes accepted at parsing time.
      */
     public void setPairedBrackets(final String preferred, final String... alternatives) {
         checkWritePermission();
@@ -379,8 +380,8 @@ public class Symbols implements Localize
      * Index 0 stands for the default quote used at formatting time, which is usually {@code '"'}.
      * All other index are for optional quotes accepted at parsing time.
      *
-     * @param  index Index of the opening quote to get, from 0 to {@link #getNumPairedQuotes()} exclusive.
-     * @return The opening quote at the given index, as a Unicode code point.
+     * @param  index  index of the opening quote to get, from 0 to {@link #getNumPairedQuotes()} exclusive.
+     * @return the opening quote at the given index, as a Unicode code point.
      * @throws IndexOutOfBoundsException if the given index is out of bounds.
      */
     public final int getOpeningQuote(final int index) {
@@ -392,8 +393,8 @@ public class Symbols implements Localize
      * Index 0 stands for the default quote used at formatting time, which is usually {@code '"'}.
      * All other index are for optional quotes accepted at parsing time.
      *
-     * @param  index Index of the closing quote to get, from 0 to {@link #getNumPairedQuotes()} exclusive.
-     * @return The closing quote at the given index, as a Unicode code point.
+     * @param  index  index of the closing quote to get, from 0 to {@link #getNumPairedQuotes()} exclusive.
+     * @return the closing quote at the given index, as a Unicode code point.
      * @throws IndexOutOfBoundsException if the given index is out of bounds.
      */
     public final int getClosingQuote(final int index) {
@@ -423,8 +424,8 @@ public class Symbols implements Localize
      *   symbols.setPairedQuotes("“”", "\"\"");
      * }</div>
      *
-     * @param preferred The preferred pair of opening and closing quotes, used at formatting time.
-     * @param alternatives Alternative pairs of opening and closing quotes accepted at parsing time.
+     * @param  preferred     the preferred pair of opening and closing quotes, used at formatting time.
+     * @param  alternatives  alternative pairs of opening and closing quotes accepted at parsing time.
      */
     public void setPairedQuotes(final String preferred, final String... alternatives) {
         checkWritePermission();
@@ -473,7 +474,7 @@ public class Symbols implements Localize
      * Returns the character used for opening a sequence of values.
      * This is usually <code>'{'</code>.
      *
-     * @return The character used for opening a sequence of values, as a Unicode code point.
+     * @return the character used for opening a sequence of values, as a Unicode code point.
      */
     public final int getOpenSequence() {
         return openSequence;
@@ -483,7 +484,7 @@ public class Symbols implements Localize
      * Returns the character used for closing a sequence of values.
      * This is usually <code>'}'</code>.
      *
-     * @return The character used for closing a sequence of values, as a Unicode code point.
+     * @return the character used for closing a sequence of values, as a Unicode code point.
      */
     public final int getCloseSequence() {
         return closeSequence;
@@ -492,8 +493,8 @@ public class Symbols implements Localize
     /**
      * Sets the characters used for opening and closing a sequence of values.
      *
-     * @param openSequence  The character for opening a sequence of values, as a Unicode code point.
-     * @param closeSequence The character for closing a sequence of values, as a Unicode code point.
+     * @param  openSequence   the character for opening a sequence of values, as a Unicode code point.
+     * @param  closeSequence  the character for closing a sequence of values, as a Unicode code point.
      */
     public void setSequenceBrackets(final int openSequence, final int closeSequence) {
         checkWritePermission();
@@ -507,7 +508,7 @@ public class Symbols implements Localize
      * Returns the string used as a separator in a list of values. This is usually {@code ", "},
      * but may be different if a non-English locale is used for formatting numbers.
      *
-     * @return The string used as a separator in a list of values.
+     * @return the string used as a separator in a list of values.
      */
     public final String getSeparator() {
         return separator;
@@ -518,7 +519,7 @@ public class Symbols implements Localize
      * The given string will be used "as-is" at formatting time,
      * but leading and trailing spaces will be ignored at parsing time.
      *
-     * @param separator The new string to use as a separator in a list of values.
+     * @param  separator  the new string to use as a separator in a list of values.
      */
     public void setSeparator(final String separator) {
         checkWritePermission();
@@ -580,8 +581,8 @@ public class Symbols implements Localize
      * The purpose of this method is to guess some characteristics about the encoded object without
      * the cost of a full WKT parsing.
      *
-     * @param  wkt The WKT to inspect.
-     * @param  element The element to search for.
+     * @param  wkt      the WKT to inspect.
+     * @param  element  the element to search for.
      * @return {@code true} if the given WKT contains at least one instance of the given element.
      */
     public boolean containsElement(final CharSequence wkt, final String element) {
@@ -605,7 +606,7 @@ public class Symbols implements Localize
      * Consequently, the presence of {@code AXIS[…]} elements in a WKT is an indication that the encoded
      * object may not be understood as intended by some external softwares.
      *
-     * @param  wkt The WKT to inspect.
+     * @param  wkt  the WKT to inspect.
      * @return {@code true} if the given WKT contains at least one instance of the {@code AXIS[…]} element.
      */
     public boolean containsAxis(final CharSequence wkt) {
@@ -616,9 +617,9 @@ public class Symbols implements Localize
     /**
      * Implementation of {@link #containsElement(CharSequence, String)} without verification of argument validity.
      *
-     * @param  wkt     The WKT to inspect.
-     * @param  element The element to search. Must contains only uppercase letters.
-     * @param  offset  The index to start the search from.
+     * @param  wkt      the WKT to inspect.
+     * @param  element  the element to search. Must contains only uppercase letters.
+     * @param  offset   the index to start the search from.
      */
     private boolean containsElement(final CharSequence wkt, final String element, int offset) {
         final int[] quotes = this.quotes;
@@ -685,7 +686,7 @@ public class Symbols implements Localize
     /**
      * Returns a clone of this {@code Symbols}.
      *
-     * @return A clone of this {@code Symbols}.
+     * @return a clone of this {@code Symbols}.
      */
     @Override
     public Symbols clone() {
@@ -706,7 +707,7 @@ public class Symbols implements Localize
     /**
      * Compares this {@code Symbols} with the given object for equality.
      *
-     * @param  other The object to compare with this {@code Symbols}.
+     * @param  other  the object to compare with this {@code Symbols}.
      * @return {@code true} if both objects are equal.
      */
     @Override
@@ -727,7 +728,7 @@ public class Symbols implements Localize
     /**
      * Returns a hash code value for this object.
      *
-     * @return A hash code value.
+     * @return a hash code value.
      */
     @Override
     public int hashCode() {
@@ -738,9 +739,9 @@ public class Symbols implements Localize
      * Invoked on deserialization for replacing the deserialized instance by the constant instance.
      * This method also opportunistically recompute the {@link #quote} field if no replacement is done.
      *
-     * @return The object to use after deserialization.
+     * @return the object to use after deserialization.
      */
-    final Object readResolve() {
+    final Object readResolve() throws ObjectStreamException {
         if (isImmutable) {
             if (equals(SQUARE_BRACKETS)) return SQUARE_BRACKETS;
             if (equals(CURLY_BRACKETS))  return CURLY_BRACKETS;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -19,6 +19,7 @@ package org.apache.sis.io.wkt;
 import java.util.Map;
 import java.util.HashMap;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.referencing.cs.PolarCS;
 import org.opengis.referencing.cs.SphericalCS;
 import org.opengis.referencing.cs.EllipsoidalCS;
@@ -155,8 +156,8 @@ public abstract class Transliterator imp
      * <p>The default implementation invokes {@link CharSequences#toASCII(CharSequence)},
      * replaces line feed and tabulations by single spaces, then remove control characters.</p>
      *
-     * @param  text The text to format without non-ASCII characters.
-     * @return The text to write in <cite>Well Known Text</cite>.
+     * @param  text  the text to format without non-ASCII characters.
+     * @return the text to write in <cite>Well Known Text</cite>.
      *
      * @see org.apache.sis.util.Characters#isValidWKT(int)
      */
@@ -207,10 +208,10 @@ public abstract class Transliterator imp
      *       or {@code GEOCENTRIC_Z} and the name is the same than the axis direction (ignoring case).</li>
      * </ul>
      *
-     * @param  cs        The enclosing coordinate system, or {@code null} if unknown.
-     * @param  direction The direction of the axis to format.
-     * @param  name      The axis name, to be eventually replaced by this method.
-     * @return The axis name to format, or {@code null} if the name shall be omitted.
+     * @param  cs         the enclosing coordinate system, or {@code null} if unknown.
+     * @param  direction  the direction of the axis to format.
+     * @param  name       the axis name, to be eventually replaced by this method.
+     * @return the axis name to format, or {@code null} if the name shall be omitted.
      *
      * @see org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#formatTo(Formatter)
      */
@@ -257,10 +258,10 @@ public abstract class Transliterator imp
      * SIS does not put restriction on axis names, but we nevertheless try to use a unique
      * name when we recognize it.</div>
      *
-     * @param  csType    The type of the coordinate system, or {@code null} if unknown.
-     * @param  direction The parsed axis direction.
-     * @param  name      The parsed axis abbreviation, to be eventually replaced by this method.
-     * @return The axis name to use. Can not be null.
+     * @param  csType     the type of the coordinate system, or {@code null} if unknown.
+     * @param  direction  the parsed axis direction.
+     * @param  name       the parsed axis abbreviation, to be eventually replaced by this method.
+     * @return the axis name to use. Can not be null.
      */
     public String toLongAxisName(final String csType, final AxisDirection direction, final String name) {
         if (csType != null) switch (csType) {
@@ -290,8 +291,8 @@ public abstract class Transliterator imp
     /**
      * Returns {@code true} if the given axis name is at least part of the given expected axis name.
      *
-     * @param expected {@link AxisNames#LATITUDE} or {@link AxisNames#LONGITUDE}.
-     * @param name The parsed axis name.
+     * @param  expected  {@link AxisNames#LATITUDE} or {@link AxisNames#LONGITUDE}.
+     * @param  name      the parsed axis name.
      */
     private static boolean isLatLong(final String expected, final String name) {
         final int length = name.length();
@@ -320,10 +321,10 @@ public abstract class Transliterator imp
      * Note that while this method may return a string of any length, ISO 19162 requires abbreviations
      * to be a single Latin character.
      *
-     * @param  cs           The enclosing coordinate system, or {@code null} if unknown.
-     * @param  direction    The direction of the axis to format.
-     * @param  abbreviation The axis abbreviation, to be eventually replaced by this method.
-     * @return The axis abbreviation to format.
+     * @param  cs            the enclosing coordinate system, or {@code null} if unknown.
+     * @param  direction     the direction of the axis to format.
+     * @param  abbreviation  the axis abbreviation, to be eventually replaced by this method.
+     * @return the axis abbreviation to format.
      *
      * @see org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis#formatTo(Formatter)
      */
@@ -398,10 +399,10 @@ public abstract class Transliterator imp
      *   <li><var>U</var> → θ  if {@code csType} is {@code "polar"}.</li>
      * </ul>
      *
-     * @param  csType       The type of the coordinate system, or {@code null} if unknown.
-     * @param  direction    The parsed axis direction.
-     * @param  abbreviation The parsed axis abbreviation, to be eventually replaced by this method.
-     * @return The axis abbreviation to use. Can not be null.
+     * @param  csType        the type of the coordinate system, or {@code null} if unknown.
+     * @param  direction     the parsed axis direction.
+     * @param  abbreviation  the parsed axis abbreviation, to be eventually replaced by this method.
+     * @return the axis abbreviation to use. Can not be null.
      */
     public String toUnicodeAbbreviation(final String csType, final AxisDirection direction, String abbreviation) {
         if (abbreviation.length() == 1) {
@@ -439,7 +440,7 @@ public abstract class Transliterator imp
         }
 
         /** Replaces deserialized instances by the unique instance. */
-        Object readResolve() {
+        Object readResolve() throws ObjectStreamException {
             return DEFAULT;
         }
     }
@@ -483,7 +484,7 @@ public abstract class Transliterator imp
         }
 
         /** Replaces deserialized instances by the unique instance. */
-        Object readResolve() {
+        Object readResolve() throws ObjectStreamException {
             return IDENTITY;
         }
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.metadata;
 
 import java.util.Map;
 import java.util.IdentityHashMap;
+import java.io.ObjectStreamException;
 import org.opengis.annotation.UML;
 import org.opengis.annotation.Classifier;
 import org.opengis.annotation.Stereotype;
@@ -71,11 +72,11 @@ final class StandardImplementation exten
      * Creates a new instance working on implementation of interfaces defined in the
      * specified package. This constructor is used only for the pre-defined constants.
      *
-     * @param citation              The title of the standard.
-     * @param interfacePackage      The root package for metadata interfaces, with a trailing {@code '.'}.
-     * @param implementationPackage The root package for metadata implementations. with a trailing {@code '.'}.
-     * @param acronyms              An array of (full text, acronyms) pairs. This array is not cloned.
-     * @param dependencies          The dependencies to other metadata standards, or {@code null} if none.
+     * @param citation               the title of the standard.
+     * @param interfacePackage       the root package for metadata interfaces, with a trailing {@code '.'}.
+     * @param implementationPackage  the root package for metadata implementations. with a trailing {@code '.'}.
+     * @param acronyms               an array of (full text, acronyms) pairs. This array is not cloned.
+     * @param dependencies           the dependencies to other metadata standards, or {@code null} if none.
      */
     StandardImplementation(final String citation, final String interfacePackage, final String implementationPackage,
             final String[] acronyms, final MetadataStandard[] dependencies)
@@ -111,9 +112,9 @@ final class StandardImplementation exten
      * Returns the implementation class for the given interface, or {@code null} if none.
      * This class uses heuristic rules based on naming conventions.
      *
-     * @param  <T>  The compile-time {@code type}.
-     * @param  type The interface, typically from the {@code org.opengis.metadata} package.
-     * @return The implementation class, or {@code null} if none.
+     * @param  <T>   the compile-time {@code type}.
+     * @param  type  the interface, typically from the {@code org.opengis.metadata} package.
+     * @return the implementation class, or {@code null} if none.
      */
     @Override
     public <T> Class<? extends T> getImplementation(final Class<T> type) {
@@ -170,7 +171,7 @@ final class StandardImplementation exten
     /**
      * Invoked on deserialization. Returns one of the pre-existing constants if possible.
      */
-    Object readResolve() {
+    Object readResolve() throws ObjectStreamException {
         if (ISO_19111.citation.equals(citation)) return ISO_19111;
         if (ISO_19115.citation.equals(citation)) return ISO_19115;
         /*

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToPolar.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.util.Arrays;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
@@ -59,7 +60,7 @@ final class CartesianToPolar extends Coo
     /**
      * Returns the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CartesianToSpherical.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.util.Arrays;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix3;
@@ -52,7 +53,7 @@ final class CartesianToSpherical extends
     /**
      * Returns the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PolarToCartesian.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.util.Arrays;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
@@ -72,7 +73,7 @@ final class PolarToCartesian extends Coo
     /**
      * Returns the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/SphericalToCartesian.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.util.Arrays;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix3;
@@ -70,7 +71,7 @@ final class SphericalToCartesian extends
     /**
      * Returns the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/Column.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -17,6 +17,7 @@
 package org.apache.sis.internal.converter;
 
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.Debug;
 import org.apache.sis.util.ObjectConverter;
@@ -77,7 +78,7 @@ final class Column extends TableColumn<C
     /**
      * Resources to the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return target ? TARGET : SOURCE;
     }
 
@@ -93,8 +94,8 @@ final class Column extends TableColumn<C
      * Used by {@link FallbackConverter} and {@link ConverterRegistry} for
      * implementing their {@code toString()} method.
      *
-     * @param  converter The converter for which to create a tree.
-     * @param  addTo     The node in which to add the converter.
+     * @param  converter  the converter for which to create a tree.
+     * @param  addTo      the node in which to add the converter.
      */
     static void toTree(final ObjectConverter<?,?> converter, final TreeTable.Node addTo) {
         final TreeTable.Node node = addTo.newChild();

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemConverter.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.internal.converte
 
 import java.util.Set;
 import java.util.EnumSet;
+import java.io.ObjectStreamException;
 import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.resources.Errors;
@@ -48,8 +49,8 @@ abstract class SystemConverter<S,T> exte
     /**
      * Creates a new converter for the given source and target classes.
      *
-     * @param sourceClass The {@linkplain #getSourceClass() source class}.
-     * @param targetClass The {@linkplain #getTargetClass() target class}.
+     * @param sourceClass  the {@linkplain #getSourceClass() source class}.
+     * @param targetClass  the {@linkplain #getTargetClass() target class}.
      */
     SystemConverter(final Class<S> sourceClass, final Class<T> targetClass) {
         super(sourceClass, targetClass);
@@ -58,7 +59,7 @@ abstract class SystemConverter<S,T> exte
     /**
      * Returns the source class given at construction time.
      *
-     * @return The type of objects to convert.
+     * @return the type of objects to convert.
      */
     @Override
     public final Class<S> getSourceClass() {
@@ -68,7 +69,7 @@ abstract class SystemConverter<S,T> exte
     /**
      * Returns the target class given at construction time.
      *
-     * @return The type of converted objects.
+     * @return the type of converted objects.
      */
     @Override
     public final Class<T> getTargetClass() {
@@ -87,7 +88,7 @@ abstract class SystemConverter<S,T> exte
     /**
      * Default to non-invertible conversion. Must be overridden by subclasses that support inversions.
      *
-     * @return A converter for converting instances of <var>T</var> back to instances of <var>S</var>.
+     * @return a converter for converting instances of <var>T</var> back to instances of <var>S</var>.
      */
     @Override
     public ObjectConverter<T,S> inverse() throws UnsupportedOperationException {
@@ -120,7 +121,7 @@ abstract class SystemConverter<S,T> exte
      *       an instance of {@code ClassPair} instance (not a subclass).</li>
      * </ul>
      *
-     * @param  other The object to compare with this {@code SystemConverter}.
+     * @param  other the object to compare with this {@code SystemConverter}.
      * @return {@code true} if the given object is a {@code ClassPair} or a converter of the
      *         same class than {@code this}, and both have the same source and target classes.
      */
@@ -138,7 +139,7 @@ abstract class SystemConverter<S,T> exte
      * exists for the same source an target classes, then this converter is returned.
      * Otherwise this converter is returned <strong>without</strong> being cached.
      *
-     * @return The unique instance, or {@code this} if no unique instance can be found.
+     * @return the unique instance, or {@code this} if no unique instance can be found.
      */
     public ObjectConverter<S,T> unique() {
         final ObjectConverter<S,T> existing = SystemRegistry.INSTANCE.findEquals(this);
@@ -149,15 +150,15 @@ abstract class SystemConverter<S,T> exte
      * Returns the singleton instance on deserialization, if any. If no instance already exist
      * in the virtual machine, we do not cache the instance (for now) for security reasons.
      */
-    protected final Object readResolve() {
+    protected final Object readResolve() throws ObjectStreamException {
         return unique();
     }
 
     /**
      * Formats an error message for a value that can not be converted.
      *
-     * @param  value The value that can not be converted.
-     * @return The error message.
+     * @param  value  the value that can not be converted.
+     * @return the error message.
      */
     final String formatErrorMessage(final S value) {
         return Errors.format(Errors.Keys.CanNotConvertValue_2, value, targetClass);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.IdentityHashMap;
 import java.util.Collection;
 import java.util.Collections;
+import java.io.ObjectStreamException;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.apache.sis.internal.simple.CitationConstant;
@@ -96,9 +97,9 @@ public final class NonMarshalledAuthorit
     /**
      * Creates a new citation for the given XML attribute name.
      *
-     * @param attribute The XML attribute name, to be returned by {@link #getName()}.
-     * @param ordinal   Ordinal value for switch statement, as one of the {@link #ID},
-     *                  {@link #UUID}, <i>etc.</i> constants.
+     * @param attribute  the XML attribute name, to be returned by {@link #getName()}.
+     * @param ordinal    ordinal value for switch statement, as one of the {@link #ID},
+     *                   {@link #UUID}, <i>etc.</i> constants.
      */
     public NonMarshalledAuthority(final String attribute, final byte ordinal) {
         super(attribute);
@@ -113,9 +114,9 @@ public final class NonMarshalledAuthorit
      * <p>This method is used for implementation of {@code getIdentifier()} methods (singular form)
      * in public metadata objects.</p>
      *
-     * @param  <T> The type of object used as identifier values.
-     * @param  identifiers The collection from which to get identifiers, or {@code null}.
-     * @return The first identifier, or {@code null} if none.
+     * @param  <T>          the type of object used as identifier values.
+     * @param  identifiers  the collection from which to get identifiers, or {@code null}.
+     * @return the first identifier, or {@code null} if none.
      */
     public static <T extends Identifier> T getMarshallable(final Collection<? extends T> identifiers) {
         if (identifiers != null) {
@@ -137,9 +138,9 @@ public final class NonMarshalledAuthorit
      * <p>This method is used for implementation of {@code setIdentifier(Identifier)} methods
      * in public metadata objects.</p>
      *
-     * @param <T>         The type of object used as identifier values.
-     * @param identifiers The collection in which to add the identifier.
-     * @param newValue    The identifier to add, or {@code null}.
+     * @param <T>          the type of object used as identifier values.
+     * @param identifiers  the collection in which to add the identifier.
+     * @param newValue     the identifier to add, or {@code null}.
      *
      * @see #setMarshallables(Collection, Collection)
      */
@@ -148,7 +149,7 @@ public final class NonMarshalledAuthorit
         while (it.hasNext()) {
             final T old = it.next();
             if (old != null && old.getAuthority() instanceof NonMarshalledAuthority<?>) {
-                continue; // Don't touch this identifier.
+                continue;                   // Leave the identifier as-is.
             }
             it.remove();
         }
@@ -167,8 +168,8 @@ public final class NonMarshalledAuthorit
      * {@link org.apache.sis.xml.IdentifiedObject#getIdentifiers()}, which is expected to return
      * all identifiers in normal (non-marshalling) usage.</p>
      *
-     * @param  identifiers The identifiers to filter, or {@code null}.
-     * @return The identifiers to marshal, or {@code null} if none.
+     * @param  identifiers  the identifiers to filter, or {@code null}.
+     * @return the identifiers to marshal, or {@code null} if none.
      */
     public static Collection<Identifier> filterOnMarshalling(Collection<Identifier> identifiers) {
         if (identifiers != null && Context.isFlagSet(Context.current(), Context.MARSHALLING)) {
@@ -196,9 +197,9 @@ public final class NonMarshalledAuthorit
      * <p>This method is used for implementation of {@code setIdentifiers(Collection)} methods
      * in public metadata objects.</p>
      *
-     * @param  identifiers The metadata internal identifiers collection, or {@code null} if none.
-     * @param  newValues   The identifiers to add, or {@code null}.
-     * @return The collection to set (may be {@code newValues}.
+     * @param  identifiers  the metadata internal identifiers collection, or {@code null} if none.
+     * @param  newValues    the identifiers to add, or {@code null}.
+     * @return the collection to set (may be {@code newValues}.
      *
      * @see #setMarshallable(Collection, Identifier)
      */
@@ -261,10 +262,11 @@ public final class NonMarshalledAuthorit
      * Invoked at deserialization time in order to replace the deserialized instance
      * by the appropriate instance defined in the {@link IdentifierSpace} interface.
      *
-     * @return The instance to use, as an unique instance if possible.
+     * @return the instance to use, as an unique instance if possible.
+     * @throws ObjectStreamException never thrown.
      */
     @Override
-    protected Object readResolve() {
+    protected Object readResolve() throws ObjectStreamException {
         final String name = getName();
         IdentifierSpace<?> candidate;
         int code = 0;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/simple/CitationConstant.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -18,6 +18,7 @@ package org.apache.sis.internal.simple;
 
 import java.util.Date;
 import java.util.Collection;
+import java.io.ObjectStreamException;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.citation.CitationDate;
@@ -172,8 +173,9 @@ public class CitationConstant extends Si
      * instance defined in the {@link org.apache.sis.metadata.iso.citation.Citations} class.
      *
      * @return the instance to use, as an unique instance if possible.
+     * @throws ObjectStreamException never thrown.
      */
-    protected Object readResolve() {
+    protected Object readResolve() throws ObjectStreamException {
         CitationConstant c = MetadataServices.getInstance().getCitationConstant(title);
         if (c == null) {
             /*

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.internal.util;
 
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.util.AbstractQueue;
 import java.util.Collections;
@@ -26,7 +27,7 @@ import java.util.Queue;
 /**
  * An immutable and serializable empty queue.
  *
- * @param  <E> Type of elements in the collection.
+ * @param  <E>  type of elements in the collection.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -63,7 +64,8 @@ final class EmptyQueue<E> extends Abstra
     /**
      * Returns the singleton instance on deserialization.
      */
-    protected Object readResolve() {
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")
+    protected Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.io;
 
+import java.io.ObjectStreamException;
 import java.text.Format;
 import java.text.FieldPosition;
 import java.text.ParsePosition;
@@ -71,7 +72,7 @@ final class ClassFormat extends Format {
     /**
      * Resolves to the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         return INSTANCE;
     }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -20,6 +20,7 @@ import java.text.Format;
 import java.text.FieldPosition;
 import java.text.ParsePosition;
 import java.text.ParseException;
+import java.io.ObjectStreamException;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.internal.util.LocalizedParseException;
@@ -99,7 +100,7 @@ final class DefaultFormat extends Format
      * Parses the given string. Callers shall catch the {@link NumberFormatException}
      * and handle the error according the caller's method contract.
      *
-     * @throws NumberFormatException If the parsing failed.
+     * @throws NumberFormatException if the parsing failed.
      */
     private Object valueOf(final String source) throws NumberFormatException {
         return (type != Number.class) ? Numbers.valueOf(source, type) : Numbers.narrowestNumber(source);
@@ -139,7 +140,7 @@ final class DefaultFormat extends Format
     /**
      * Resolves to the singleton instance on deserialization.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         final Format format = getInstance(type);
         return (format != null) ? format : this;
     }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -62,14 +62,14 @@ class FormatField extends Format.Field {
      * Invoked on deserialization for resolving this instance to one of the predefined constants.
      *
      * @return One of the predefined constants.
-     * @throws InvalidObjectException If this instance can not be resolved.
+     * @throws InvalidObjectException if this instance can not be resolved.
      */
     @Override
     protected final Object readResolve() throws InvalidObjectException {
         final Class<?> type = getClass();
         try {
             return type.cast(type.getField(getName()).get(null));
-        } catch (Exception cause) { // Many exceptions, including unchecked ones.
+        } catch (Exception cause) {                                 // Many exceptions, including unchecked ones.
             InvalidObjectException e = new InvalidObjectException(cause.toString());
             e.initCause(cause);
             throw e;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.internal.system.Modules;
@@ -274,7 +275,7 @@ public class OptionKey<T> implements Ser
      *
      * @return  the unique {@code OptionKey} instance.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         try {
             return OptionKey.class.getField(name).get(null);
         } catch (ReflectiveOperationException e) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -186,7 +187,7 @@ public class RangeSet<E extends Comparab
         /**
          * Returns the singleton instance on deserialization.
          */
-        Object readResolve() {
+        Object readResolve() throws ObjectStreamException {
             return INSTANCE;
         }
     };
@@ -256,9 +257,9 @@ public class RangeSet<E extends Comparab
      * This constructor is provided for sub-classing only.
      * Client code should use the static {@link #create(Class, boolean, boolean)} method instead.
      *
-     * @param elementType   The type of the range elements.
-     * @param isMinIncluded {@code true} if the minimal values are inclusive, or {@code false} if exclusive.
-     * @param isMaxIncluded {@code true} if the maximal values are inclusive, or {@code false} if exclusive.
+     * @param elementType    the type of the range elements.
+     * @param isMinIncluded  {@code true} if the minimal values are inclusive, or {@code false} if exclusive.
+     * @param isMaxIncluded  {@code true} if the maximal values are inclusive, or {@code false} if exclusive.
      */
     protected RangeSet(final Class<E> elementType, final boolean isMinIncluded, final boolean isMaxIncluded) {
         ArgumentChecks.ensureNonNull("elementType", elementType);
@@ -278,10 +279,10 @@ public class RangeSet<E extends Comparab
     /**
      * Constructs an initially empty set of ranges.
      *
-     * @param  <E>           The type of range elements.
-     * @param  elementType   The type of the range elements.
-     * @param  isMinIncluded {@code true} if the minimal values are inclusive, or {@code false} if exclusive.
-     * @param  isMaxIncluded {@code true} if the maximal values are inclusive, or {@code false} if exclusive.
+     * @param  <E>            the type of range elements.
+     * @param  elementType    the type of the range elements.
+     * @param  isMinIncluded  {@code true} if the minimal values are inclusive, or {@code false} if exclusive.
+     * @param  isMaxIncluded  {@code true} if the maximal values are inclusive, or {@code false} if exclusive.
      * @return A new range set for range elements of the given type.
      */
     @SuppressWarnings({"unchecked","rawtypes"})
@@ -309,7 +310,7 @@ public class RangeSet<E extends Comparab
      * Returns the comparator associated with this sorted set.
      */
     @Override
-    @SuppressWarnings({"unchecked","rawtypes"}) // Because we share the same static instance.
+    @SuppressWarnings({"unchecked","rawtypes"})             // Because we share the same static instance.
     public Comparator<Range<E>> comparator() {
         return Compare.INSTANCE;
     }
@@ -320,7 +321,7 @@ public class RangeSet<E extends Comparab
     @Override
     public void clear() {
         if (array instanceof Object[]) {
-            Arrays.fill((Object[]) array, 0, length, null); // Let GC do its job.
+            Arrays.fill((Object[]) array, 0, length, null);         // Let GC do its job.
         }
         length = 0;
         modCount++;
@@ -331,7 +332,7 @@ public class RangeSet<E extends Comparab
      */
     @Override
     public int size() {
-        assert (length & 1) == 0; // Length must be even.
+        assert (length & 1) == 0;                                   // Length must be even.
         return length >>> 1;
     }
 
@@ -356,7 +357,7 @@ public class RangeSet<E extends Comparab
     public final void trimToSize() {
         // This method is final because equals(Object) and other methods rely on this behavior.
         if (array != null && Array.getLength(array) != length) {
-            reallocate(); // Will set the array to null if length == 0.
+            reallocate();                           // Will set the array to null if length == 0.
             assert isSorted();
         }
     }
@@ -365,9 +366,9 @@ public class RangeSet<E extends Comparab
      * Inserts two values at the given index. The underlying {@linkplain #array} shall be
      * non-null before this method is invoked. This method increases the array size as needed.
      *
-     * @param lower The index where to insert the values.
-     * @param minValue The first value to insert.
-     * @param maxValue The second value to insert.
+     * @param  lower     the index where to insert the values.
+     * @param  minValue  the first value to insert.
+     * @param  maxValue  the second value to insert.
      */
     private void insertAt(final int lower, final E minValue, final E maxValue) {
         final Object oldArray = array;
@@ -387,8 +388,8 @@ public class RangeSet<E extends Comparab
      * Removes the values in the given range. The underlying {@linkplain #array} shall be
      * non-null before this method is invoked.
      *
-     * @param lower First value to remove, inclusive.
-     * @param upper Last value to remove, exclusive.
+     * @param  lower  first value to remove, inclusive.
+     * @param  upper  last value to remove, exclusive.
      */
     private void removeAt(final int lower, final int upper) {
         final int oldLength = length;
@@ -428,9 +429,9 @@ public class RangeSet<E extends Comparab
      * Returns the index of {@code value} in {@link #array}. This method delegates to
      * one of {@code Arrays.binarySearch} methods, depending on element primary type.
      *
-     * @param value The value to search.
-     * @param lower Index of the first value to examine.
-     * @param upper Index after the last value to examine.
+     * @param  value  the value to search.
+     * @param  lower  index of the first value to examine.
+     * @param  upper  index after the last value to examine.
      */
     final int binarySearch(final E value, final int lower, final int upper) {
         switch (elementCode) {
@@ -466,10 +467,10 @@ public class RangeSet<E extends Comparab
      * match the ones given to the constructor of this {@code RangeSet}, then delegates to
      * {@link #add(Comparable, Comparable)}.</p>
      *
-     * @param  range The range to add.
+     * @param  range  the range to add.
      * @return {@code true} if this set changed as a result of this method call.
-     * @throws IllegalArgumentException If the {@code isMinIncluded} or {@code isMaxIncluded}
-     *         property doesn't match the one given at this {@code RangeSet} constructor.
+     * @throws IllegalArgumentException if the {@code isMinIncluded} or {@code isMaxIncluded}
+     *         property does not match the one given at this {@code RangeSet} constructor.
      */
     @Override
     public boolean add(final Range<E> range) throws IllegalArgumentException {
@@ -489,8 +490,8 @@ public class RangeSet<E extends Comparab
      * the existing ranges will be merged. This may result in smaller {@linkplain #size() size}
      * of this set.
      *
-     * @param  minValue The minimal value.
-     * @param  maxValue The maximal value.
+     * @param  minValue  the minimal value.
+     * @param  maxValue  the maximal value.
      * @return {@code true} if this set changed as a result of this method call.
      * @throws IllegalArgumentException if {@code minValue} is greater than {@code maxValue}.
      */
@@ -503,7 +504,7 @@ public class RangeSet<E extends Comparab
         if (array == null) {
             ensureOrdered(minValue, maxValue);
             Class<?> type = elementType;
-            if (type != Boolean.class) { // Because there is no Arrays.binarySearch(boolean[], …) method.
+            if (type != Boolean.class) {        // Because there is no Arrays.binarySearch(boolean[], …) method.
                 type = wrapperToPrimitive(type);
             }
             array = Array.newInstance(type, 8);
@@ -517,7 +518,7 @@ public class RangeSet<E extends Comparab
         int i0 = binarySearch(minValue, 0, length);
         int i1 = binarySearch(maxValue, (i0 >= 0) ? i0 : ~i0, length);
         if (i0 < 0) {
-            i0 = ~i0; // Really tild operator, not minus sign.
+            i0 = ~i0;                           // Really tild operator, not minus sign.
             if ((i0 & 1) == 0) {
                 /*
                  * If the "insertion point" is outside any existing range, if the maximum value
@@ -572,7 +573,7 @@ public class RangeSet<E extends Comparab
          * Ensure that the index is odd. This means that if the maximum value is the begining of an
          * existing range, then we move to the end of that range. Otherwise the index is unchanged.
          */
-        i1 |= 1; // Equivalent to executing i1++ only if i1 is even.
+        i1 |= 1;                        // Equivalent to executing i1++ only if i1 is even.
         /*
          * At this point, the index of the [minValue … maxValue] range is now [i0 … i1].
          * Remove everything between i0 and i1, excluding i0 and i1 themselves.
@@ -610,9 +611,9 @@ public class RangeSet<E extends Comparab
      * the {@code isMinIncluded} and {@code isMaxIncluded} are consistent with the ones given to the
      * constructor of this {@code RangeSet}, then delegates to {@link #remove(Comparable, Comparable)}.</p>
      *
-     * @param  object The range to remove.
+     * @param  object  the range to remove.
      * @return {@code true} if this set changed as a result of this method call.
-     * @throws IllegalArgumentException If the {@code isMinIncluded} or {@code isMaxIncluded}
+     * @throws IllegalArgumentException if the {@code isMinIncluded} or {@code isMaxIncluded}
      *         property is not the complement of the one given at this {@code RangeSet} constructor.
      */
     @Override
@@ -636,8 +637,8 @@ public class RangeSet<E extends Comparab
      * then the existing range may be splitted in two smaller ranges. This may result in greater
      * {@linkplain #size() size} of this set.
      *
-     * @param  minValue The minimal value.
-     * @param  maxValue The maximal value.
+     * @param  minValue  the minimal value.
+     * @param  maxValue  the maximal value.
      * @return {@code true} if this set changed as a result of this method call.
      * @throws IllegalArgumentException if {@code minValue} is greater than {@code maxValue}.
      */
@@ -684,7 +685,7 @@ public class RangeSet<E extends Comparab
                  * index :      A0    B0       i1  Bn     A(n+1)   B(n+1)
                  * range :      ███████        █████      ██████████  ◾◾◾
                  */
-                removeAt(i0, i1 & ~1); // equivalent to (i0, i1 - 1)
+                removeAt(i0, i1 & ~1);                              // equivalent to (i0, i1 - 1)
                 Array.set(array, i0, maxValue);
             }
         } else {
@@ -747,7 +748,7 @@ public class RangeSet<E extends Comparab
                     final int di = i1 - i0;
                     assert di >= 2 : di;
                     if (di > 2) {
-                        removeAt(i0 + 1, i1 & ~1); // equivalent to (i0 + 1, i1 - 1)
+                        removeAt(i0 + 1, i1 & ~1);              // equivalent to (i0 + 1, i1 - 1)
                     }
                     Array.set(array, i0,     minValue);
                     Array.set(array, i0 + 1, maxValue);
@@ -780,13 +781,13 @@ public class RangeSet<E extends Comparab
      * The default implementation checks the type of the given object, then delegates to
      * <code>{@linkplain #contains(Range, boolean) contains}(object, false)</code>.
      *
-     * @param  object The object to check for inclusion in this set.
+     * @param  object  the object to check for inclusion in this set.
      * @return {@code true} if the given object is contained in this set.
      */
     @Override
     public boolean contains(final Object object) {
         if (object instanceof Range<?>) {
-            @SuppressWarnings("unchecked") // We are going to check just the line after.
+            @SuppressWarnings("unchecked")                  // We are going to check just the line after.
             final Range<E> range = (Range<E>) object;
             if (range.getElementType() == elementType) {
                 return contains(range, false);
@@ -806,8 +807,8 @@ public class RangeSet<E extends Comparab
      *       behaves as documented in the {@link #contains(Object)} method.</li>
      * </ul>
      *
-     * @param  range The range to check for inclusion in this set.
-     * @param  exact {@code true} for searching for an exact match,
+     * @param  range  the range to check for inclusion in this set.
+     * @param  exact  {@code true} for searching for an exact match,
      *         or {@code false} for searching for inclusion in any range.
      * @return {@code true} if the given object is contained in this set.
      */
@@ -891,8 +892,8 @@ public class RangeSet<E extends Comparab
      * this {@code RangeSet} with the given range. Changes in this {@code RangeSet}
      * will be reflected in the returned view, and conversely.
      *
-     * @param  subRange The range to intersect with this {@code RangeSet}.
-     * @return A view of the specified range within this range set.
+     * @param  subRange  the range to intersect with this {@code RangeSet}.
+     * @return a view of the specified range within this range set.
      */
     public SortedSet<Range<E>> intersect(final Range<E> subRange) {
         ArgumentChecks.ensureNonNull("subRange", subRange);
@@ -915,9 +916,9 @@ public class RangeSet<E extends Comparab
      * This method takes the minimal value of the {@code upper} argument instead
      * than the maximal value because the upper endpoint is exclusive.</div>
      *
-     * @param  lower Low endpoint (inclusive) of the sub set.
-     * @param  upper High endpoint (exclusive) of the sub set.
-     * @return A view of the specified range within this sorted set.
+     * @param  lower  low endpoint (inclusive) of the sub set.
+     * @param  upper  high endpoint (exclusive) of the sub set.
+     * @return a view of the specified range within this sorted set.
      *
      * @see #intersect(Range)
      */
@@ -942,8 +943,8 @@ public class RangeSet<E extends Comparab
      * documented in the {@link #subSet(Range, Range)} method, except that the lower
      * endpoint is {@code null}.
      *
-     * @param  upper High endpoint (exclusive) of the headSet.
-     * @return A view of the specified initial range of this sorted set.
+     * @param  upper  high endpoint (exclusive) of the headSet.
+     * @return a view of the specified initial range of this sorted set.
      *
      * @see #intersect(Range)
      */
@@ -965,8 +966,8 @@ public class RangeSet<E extends Comparab
      * documented in the {@link #subSet(Range, Range)} method, except that the upper
      * endpoint is {@code null}.
      *
-     * @param  lower Low endpoint (inclusive) of the tailSet.
-     * @return A view of the specified final range of this sorted set.
+     * @param  lower  low endpoint (inclusive) of the tailSet.
+     * @return a view of the specified final range of this sorted set.
      *
      * @see #intersect(Range)
      */
@@ -1015,7 +1016,7 @@ public class RangeSet<E extends Comparab
         /**
          * Creates a new subset of the enclosing {@code RangeSet} between the given values.
          *
-         * @param subRange The range to intersect with the enclosing {@code RangeSet}.
+         * @param subRange  the range to intersect with the enclosing {@code RangeSet}.
          */
         SubSet(final Range<E> subRange) {
             this.subRange = subRange;
@@ -1384,8 +1385,8 @@ public class RangeSet<E extends Comparab
      * If the specified value is inside a range, returns the index of this range.
      * Otherwise, returns {@code -1}.
      *
-     * @param  value The value to search.
-     * @return The index of the range which contains this value, or -1 if there is no such range.
+     * @param  value  the value to search.
+     * @return the index of the range which contains this value, or -1 if there is no such range.
      */
     public int indexOfRange(final E value) {
         int index = binarySearch(value, 0, length);
@@ -1410,8 +1411,8 @@ public class RangeSet<E extends Comparab
      * exclusive. The returned values always increase with {@code index}.
      * Widening conversions are performed as needed.
      *
-     * @param  index The range index, from 0 inclusive to {@link #size() size} exclusive.
-     * @return The minimum value for the range at the specified index, inclusive.
+     * @param  index  the range index, from 0 inclusive to {@link #size() size} exclusive.
+     * @return the minimum value for the range at the specified index, inclusive.
      * @throws IndexOutOfBoundsException if {@code index} is out of bounds.
      * @throws ClassCastException if range elements are not convertible to {@code long}.
      */
@@ -1428,8 +1429,8 @@ public class RangeSet<E extends Comparab
      * exclusive. The returned values always increase with {@code index}.
      * Widening conversions are performed as needed.
      *
-     * @param  index The range index, from 0 inclusive to {@link #size() size} exclusive.
-     * @return The minimum value for the range at the specified index, inclusive.
+     * @param  index  the range index, from 0 inclusive to {@link #size() size} exclusive.
+     * @return the minimum value for the range at the specified index, inclusive.
      * @throws IndexOutOfBoundsException if {@code index} is out of bounds.
      * @throws ClassCastException if range elements are not convertible to numbers.
      *
@@ -1448,8 +1449,8 @@ public class RangeSet<E extends Comparab
      * exclusive. The returned values always increase with {@code index}.
      * Widening conversions are performed as needed.
      *
-     * @param  index The range index, from 0 inclusive to {@link #size() size} exclusive.
-     * @return The maximum value for the range at the specified index, inclusive.
+     * @param  index  the range index, from 0 inclusive to {@link #size() size} exclusive.
+     * @return the maximum value for the range at the specified index, inclusive.
      * @throws IndexOutOfBoundsException if {@code index} is out of bounds.
      * @throws ClassCastException if range elements are not convertible to {@code long}.
      */
@@ -1466,8 +1467,8 @@ public class RangeSet<E extends Comparab
      * exclusive. The returned values always increase with {@code index}.
      * Widening conversions are performed as needed.
      *
-     * @param  index The range index, from 0 inclusive to {@link #size size} exclusive.
-     * @return The maximum value for the range at the specified index, exclusive.
+     * @param  index  the range index, from 0 inclusive to {@link #size size} exclusive.
+     * @return the maximum value for the range at the specified index, exclusive.
      * @throws IndexOutOfBoundsException if {@code index} is out of bounds.
      * @throws ClassCastException if range elements are not convertible to numbers.
      *
@@ -1493,7 +1494,7 @@ public class RangeSet<E extends Comparab
      * Returns the range at the given array index. The given index is relative to
      * the interval {@link #array}, which is twice the index of range elements.
      *
-     * @param index The range index, from 0 inclusive to {@link #length} exclusive.
+     * @param index  the range index, from 0 inclusive to {@link #length} exclusive.
      */
     final Range<E> getRange(final int index) {
         return newRange(getValue(index), getValue(index+1));
@@ -1502,9 +1503,9 @@ public class RangeSet<E extends Comparab
     /**
      * Returns a new {@link Range} object initialized with the given values.
      *
-     * @param  lower The lower value, inclusive.
-     * @param  upper The upper value, exclusive.
-     * @return The new range for the given values.
+     * @param  lower  the lower value, inclusive.
+     * @param  upper  the upper value, exclusive.
+     * @return the new range for the given values.
      */
     protected Range<E> newRange(final E lower, final E upper) {
         return new Range<>(elementType, lower, isMinIncluded, upper, isMaxIncluded);
@@ -1536,7 +1537,7 @@ public class RangeSet<E extends Comparab
     /**
      * Compares the specified object with this set of ranges for equality.
      *
-     * @param object The object to compare with this range.
+     * @param  object  the object to compare with this range.
      * @return {@code true} if the given object is equal to this range.
      */
     @Override
@@ -1572,13 +1573,13 @@ public class RangeSet<E extends Comparab
                 default:        return Arrays.equals((Object[]) a1, (Object[]) a2);
             }
         }
-        return super.equals(object); // Allow comparison with other Set implementations.
+        return super.equals(object);        // Allow comparison with other Set implementations.
     }
 
     /**
      * Returns a clone of this range set.
      *
-     * @return A clone of this range set.
+     * @return a clone of this range set.
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -1598,8 +1599,8 @@ public class RangeSet<E extends Comparab
      * Invoked before serialization. Trims the internal array to the minimal size
      * in order to reduce the size of the object to be serialized.
      *
-     * @param  out The output stream where to serialize this range set.
-     * @throws IOException If an I/O error occurred while writing.
+     * @param  out  the output stream where to serialize this range set.
+     * @throws IOException if an I/O error occurred while writing.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         trimToSize();
@@ -1609,9 +1610,9 @@ public class RangeSet<E extends Comparab
     /**
      * Invoked after deserialization. Initializes the transient fields.
      *
-     * @param  in The input stream from which to deserialize a range set.
-     * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
-     * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
+     * @param  in  the input stream from which to deserialize a range set.
+     * @throws IOException if an I/O error occurred while reading or if the stream contains invalid data.
+     * @throws ClassNotFoundException if the class serialized on the stream is not on the classpath.
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TableColumn.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -19,6 +19,7 @@ package org.apache.sis.util.collection;
 import java.util.Map;
 import java.util.Collections;
 import java.io.Serializable;
+import java.io.ObjectStreamException;
 import java.io.InvalidObjectException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.iso.Types;
@@ -90,7 +91,7 @@ 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.
+ * @param  <V>  base type of all values in the column identified by this instance.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -180,7 +181,7 @@ public class TableColumn<V> implements C
      * This implementation differs resource bundle loading until first needed,
      * and resolves deserialized instances to the singleton instances.
      *
-     * @param <V> Base type of all values in the column identified by this instance.
+     * @param  <V>  base type of all values in the column identified by this instance.
      *
      * @author  Martin Desruisseaux (Geomatys)
      * @since   0.3
@@ -206,9 +207,9 @@ public class TableColumn<V> implements C
         /**
          * Creates a new instance for a build-in constant.
          *
-         * @param field  The programmatic name of the static final field holding this constant.
-         * @param type   Base type of all values in the column identified by this instance.
-         * @param header The resource key for the column header.
+         * @param field   the programmatic name of the static final field holding this constant.
+         * @param type    base type of all values in the column identified by this instance.
+         * @param header  the resource key for the column header.
          */
         Constant(final String field, final Class<V> type, final short header) {
             super(type);
@@ -231,10 +232,10 @@ public class TableColumn<V> implements C
         /**
          * Invoked on deserialization for resolving this instance to one of the predefined constants.
          *
-         * @return One of the predefined constants.
-         * @throws InvalidObjectException If this instance can not be resolved.
+         * @return one of the predefined constants.
+         * @throws InvalidObjectException if this instance can not be resolved.
          */
-        private Object readResolve() throws InvalidObjectException {
+        private Object readResolve() throws ObjectStreamException {
             try {
                 return TableColumn.class.getField(field).get(null);
             } catch (ReflectiveOperationException cause) {
@@ -259,7 +260,7 @@ public class TableColumn<V> implements C
     /**
      * Creates a new instance for a build-in constant.
      *
-     * @param type Base type of all values in the column identified by this instance.
+     * @param type  base type of all values in the column identified by this instance.
      */
     TableColumn(final Class<V> type) {
         this.type = type;
@@ -268,8 +269,8 @@ public class TableColumn<V> implements C
     /**
      * Creates a new instance for the given type of values.
      *
-     * @param type   Base type of all values in the column identified by this instance.
-     * @param header The text to display as column header.
+     * @param type    base type of all values in the column identified by this instance.
+     * @param header  the text to display as column header.
      */
     public TableColumn(final Class<V> type, final CharSequence header) {
         ArgumentChecks.ensureNonNull("type",   this.type   = type);
@@ -279,7 +280,7 @@ public class TableColumn<V> implements C
     /**
      * Returns the text to display as column header.
      *
-     * @return The text to display as column header.
+     * @return the text to display as column header.
      */
     public synchronized InternationalString getHeader() {
         final InternationalString i18n = Types.toInternationalString(header);
@@ -288,8 +289,7 @@ public class TableColumn<V> implements C
     }
 
     /**
-     * Returns the base type of all values in any column identified by this {@code TableColumn}
-     * instance.
+     * Returns the base type of all values in any column identified by this {@code TableColumn} instance.
      */
     @Override
     public final Class<V> getElementType() {
@@ -298,8 +298,7 @@ public class TableColumn<V> implements C
 
     /**
      * Returns a string representation of this table column.
-     * The default implementation returns the {@linkplain #getHeader() header}
-     * in its default locale.
+     * The default implementation returns the {@linkplain #getHeader() header} in its default locale.
      */
     @Override
     public String toString() {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1773266&r1=1773265&r2=1773266&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] Thu Dec  8 16:22:44 2016
@@ -19,6 +19,8 @@ package org.apache.sis.util.iso;
 import java.util.List;
 import java.util.Collections;
 import java.util.Locale;
+import java.util.Objects;
+import java.io.ObjectStreamException;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,9 +34,6 @@ import org.apache.sis.xml.Namespaces;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Identifier within a {@linkplain DefaultNameSpace name space} for a local object.
@@ -107,8 +106,8 @@ public class DefaultLocalName extends Ab
      * method will be invoked for fetching an unlocalized name.
      * Otherwise the {@link CharSequence#toString()} method will be used.
      *
-     * @param scope The scope of this name, or {@code null} for a global scope.
-     * @param name The local name (never {@code null}).
+     * @param scope  the scope of this name, or {@code null} for a global scope.
+     * @param name   the local name (never {@code null}).
      */
     protected DefaultLocalName(NameSpace scope, final CharSequence name) {
         ArgumentChecks.ensureNonNull("name", name);
@@ -158,8 +157,8 @@ public class DefaultLocalName extends Ab
      *       with the same values than the given name.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultLocalName castOrCopy(final LocalName object) {
@@ -233,7 +232,7 @@ public class DefaultLocalName extends Ab
      * This string does not include the scope, which is consistent with the
      * {@linkplain #getParsedNames() parsed names} definition.
      *
-     * @return A local-independent string representation of this name.
+     * @return a local-independent string representation of this name.
      */
     @Override
     public synchronized String toString() {
@@ -265,7 +264,7 @@ public class DefaultLocalName extends Ab
      * zero, or a positive integer as this name lexicographically precedes, is equal to,
      * or follows the specified object.
      *
-     * @param name The other name to compare with this name.
+     * @param  name  the other name to compare with this name.
      * @return -1 if this name precedes the given one, +1 if it follows, 0 if equals.
      */
     @Override
@@ -287,7 +286,7 @@ public class DefaultLocalName extends Ab
     /**
      * Compares this local name with the specified object for equality.
      *
-     * @param object The object to compare with this name for equality.
+     * @param  object  the object to compare with this name for equality.
      * @return {@code true} if the given object is equal to this name.
      */
     @Override
@@ -318,9 +317,9 @@ public class DefaultLocalName extends Ab
      * deserialized class is a subclass. This is the intended behavior since we don't want
      * to replace an instance of a user-defined class.</p>
      *
-     * @return The unique instance.
+     * @return the unique instance.
      */
-    private Object readResolve() {
+    private Object readResolve() throws ObjectStreamException {
         final DefaultNameSpace ns;
         if (scope == null) { // Not a bug: readResolve() is intentionally private.
             ns = GlobalNameSpace.GLOBAL;




Mime
View raw message