Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -23,12 +23,10 @@ import java.io.InvalidObjectException; import java.io.IOException; import java.util.Locale; import java.util.MissingResourceException; +import java.util.Objects; import org.apache.sis.util.Utilities; import org.apache.sis.util.iso.AbstractInternationalString; -// Branch-dependent imports -import java.util.Objects; - /** * A copy of {@link org.apache.sis.util.iso.ResourceInternationalString} specialized for @@ -82,7 +80,7 @@ public abstract class ResourceInternatio /** * Creates a new international string for the given key and arguments. * - * @param key the key for the resource to fetch. + * @param key the key for the resource to fetch. * @param arguments the argument(s). */ protected ResourceInternationalString(final short key, final Object arguments) { @@ -139,7 +137,7 @@ public abstract class ResourceInternatio /** * Returns a hash code value for this international text. * - * @return A hash code value for this international text. + * @return a hash code value for this international text. */ @Override public final int hashCode() { @@ -150,7 +148,7 @@ public abstract class ResourceInternatio * Serializes this international string using the key name rather than numerical value. * * @param out the output stream where to serialize this object. - * @throws IOException If an I/O error occurred while writing. + * @throws IOException if an I/O error occurred while writing. */ private void writeObject(final ObjectOutputStream out) throws IOException { out.defaultWriteObject();
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -82,7 +82,7 @@ public interface NilObject { /** * Returns the reason why this object contains no information. * - * @return The reason why this object contains no information. + * @return the reason why this object contains no information. * * @see NilReason#forObject(Object) */ Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -195,7 +195,7 @@ abstract class Pooled { * This method is not invoked in the {@link #Pooled(Pooled)} constructor in order to * give to subclasses a chance to complete their construction first. * - * @param template the {@link PooledTemplate} from which to get the initial values. + * @param template the {@link PooledTemplate} from which to get the initial values. * @throws JAXBException if an error occurred while setting a property. */ final void initialize(final Pooled template) throws JAXBException { Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -66,9 +66,9 @@ final class PooledMarshaller extends Poo * Creates a pooled marshaller wrapping the given one. * Callers shall invoke {@link #reset(Pooled)} after construction for completing the initialization. * - * @param marshaller The marshaller to use for the actual work. - * @param template The {@link PooledTemplate} from which to get the initial values. - * @throws JAXBException If an error occurred while setting a property. + * @param marshaller the marshaller to use for the actual work. + * @param template the {@link PooledTemplate} from which to get the initial values. + * @throws JAXBException if an error occurred while setting a property. */ PooledMarshaller(final Marshaller marshaller, final Pooled template) throws JAXBException { super(template); @@ -80,9 +80,9 @@ final class PooledMarshaller extends Poo * Resets the given marshaller property to its initial state. * This method is invoked automatically by {@link #reset(Pooled)}. * - * @param key The property to reset. - * @param value The saved initial value to give to the property. - * @throws JAXBException If an error occurred while restoring a property. + * @param key the property to reset. + * @param value the saved initial value to give to the property. + * @throws JAXBException if an error occurred while restoring a property. */ @Override @SuppressWarnings({"unchecked","rawtypes"}) @@ -119,8 +119,8 @@ final class PooledMarshaller extends Poo * than the one supported natively by SIS, i.e. when {@link #getFilterVersion()} returns * a non-null value. * - * @param object The object to marshall. - * @param output The writer created by SIS (<b>not</b> the writer given by the user). + * @param object the object to marshall. + * @param output the writer created by SIS (<b>not</b> the writer given by the user). * @param version Identify the namespace substitutions to perform. */ private void marshal(final Object object, XMLStreamWriter output, final FilterVersion version) @@ -133,7 +133,7 @@ final class PooledMarshaller extends Poo } finally { context.finish(); } - output.close(); // Despite its name, this method does not close the underlying output stream. + output.close(); // Despite its name, this method does not close the underlying output stream. } /** Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -62,7 +62,7 @@ final class PooledTemplate extends Poole @Override void setStandardProperty(final String name, final Object value) { if (initialProperties.put(name, value) != null) { - throw new AssertionError(name); // If non-null, some code has done unexpected changes in the map. + throw new AssertionError(name); // If non-null, some code has done unexpected changes in the map. } } Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -115,7 +115,7 @@ final class PooledUnmarshaller extends P * * @param input the reader created by SIS (<b>not</b> the reader given by the user). * @param version identify the namespace substitutions to perform. - * @return The unmarshalled object. + * @return the unmarshalled object. */ private Object unmarshal(XMLStreamReader input, final FilterVersion version) throws XMLStreamException, JAXBException Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -18,6 +18,7 @@ package org.apache.sis.xml; import java.net.URI; import java.util.Locale; +import java.util.Objects; import java.io.Serializable; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; @@ -30,9 +31,6 @@ import org.apache.sis.util.logging.Loggi import org.apache.sis.util.resources.Errors; import org.apache.sis.internal.system.Loggers; -// Branch-dependent imports -import java.util.Objects; - /** * The XML attributes defined by OGC in the @@ -340,7 +338,7 @@ public class XLink implements Serializab * invoked with the {@link org.apache.sis.xml.XLink.Type#AUTO AUTO} enum, then this method * will infer a type from the attributes having a non-null value. * - * @return The type of link, or {@code null}. + * @return the type of link, or {@code null}. */ @XmlAttribute(name = "type", namespace = Namespaces.XLINK, required = true) public Type getType() { @@ -354,7 +352,7 @@ public class XLink implements Serializab for (final Type candidate : Type.values()) { final int forbidden = ~candidate.fieldMask; if (forbidden == 0) { - continue; // Skip the AUTO enum. + continue; // Skip the AUTO enum. } // Test if this XLink instance defines only values allowed by the candidate type. if ((defined & forbidden) != 0) { @@ -371,7 +369,7 @@ public class XLink implements Serializab best = candidate; } } - return best; // May still null. + return best; // May still null. } /** @@ -392,9 +390,9 @@ public class XLink implements Serializab /** * Checks if the given attribute can be set. * - * @param field The attribute code, as documented in {@link XLink.Type#fieldMask}. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the given field can not be set for this kind of {@code xlink}. + * @param field the attribute code, as documented in {@link XLink.Type#fieldMask}. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the given field can not be set for this kind of {@code xlink}. */ private void canWrite(final int field, final String name, final Object value) throws IllegalStateException { if (hashCode != 0) { @@ -419,7 +417,7 @@ public class XLink implements Serializab /** * Returns a URN to an external resources, or to an other part of a XML document, or an identifier. * - * @return A URN to a resources, or {@code null} if none. + * @return a URN to a resources, or {@code null} if none. * * @category locator */ @@ -432,9 +430,9 @@ public class XLink implements Serializab /** * Sets the URN to a resources. * - * @param href A URN to a resources, or {@code null} if none. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param href a URN to a resources, or {@code null} if none. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "href"} attribute. * * @category locator @@ -447,7 +445,7 @@ public class XLink implements Serializab /** * Returns a URI reference for some description of the arc role. * - * @return A URI reference for some description of the arc role, or {@code null} if none. + * @return a URI reference for some description of the arc role, or {@code null} if none. * * @category semantic */ @@ -460,9 +458,9 @@ public class XLink implements Serializab /** * Sets the URI reference for some description of the arc role. * - * @param role A URI reference for some description of the arc role, or {@code null} if none. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param role a URI reference for some description of the arc role, or {@code null} if none. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "role"} attribute. * * @category semantic @@ -475,7 +473,7 @@ public class XLink implements Serializab /** * Returns a URI reference for some description of the arc role. * - * @return A URI reference for some description of the arc role, or {@code null} if none. + * @return a URI reference for some description of the arc role, or {@code null} if none. * * @category semantic */ @@ -488,9 +486,9 @@ public class XLink implements Serializab /** * Sets a URI reference for some description of the arc role. * - * @param arcrole A URI reference for some description of the arc role, or {@code null} if none. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param arcrole a URI reference for some description of the arc role, or {@code null} if none. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "arcrole"} attribute. * * @category semantic @@ -503,7 +501,7 @@ public class XLink implements Serializab /** * Returns a human-readable string with a short description for the arc. * - * @return A human-readable string with a short description for the arc, or {@code null} if none. + * @return a human-readable string with a short description for the arc, or {@code null} if none. * * @category semantic */ @@ -515,10 +513,9 @@ public class XLink implements Serializab /** * Sets a human-readable string with a short description for the arc. * - * @param title A human-readable string with a short description for the arc, - * or {@code null} if none. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param title a human-readable string with a short description for the arc, or {@code null} if none. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "title"} attribute. * * @category semantic @@ -579,7 +576,7 @@ public class XLink implements Serializab * <li><b>none:</b> behavior is unconstrained</li> * </ul> * - * @return The desired presentation of the ending resource, or {@code null} if unspecified. + * @return the desired presentation of the ending resource, or {@code null} if unspecified. * * @category behavior */ @@ -591,9 +588,9 @@ public class XLink implements Serializab /** * Sets the desired presentation of the ending resource on traversal from the starting resource. * - * @param show The desired presentation of the ending resource, or {@code null} if unspecified. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param show the desired presentation of the ending resource, or {@code null} if unspecified. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "show"} attribute. * * @category behavior @@ -649,7 +646,7 @@ public class XLink implements Serializab * <li><b>none:</b> behavior is unconstrained</li> * </ul> * - * @return The desired timing of traversal from the starting resource to the ending resource, + * @return the desired timing of traversal from the starting resource to the ending resource, * or {@code null} if unspecified. * * @category behavior @@ -662,10 +659,10 @@ public class XLink implements Serializab /** * Sets the desired timing of traversal from the starting resource to the ending resource. * - * @param actuate The desired timing of traversal from the starting resource to the ending - * resource, or {@code null} if unspecified. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param actuate the desired timing of traversal from the starting resource to the ending resource, + * or {@code null} if unspecified. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "actuate"} attribute. * * @category behavior @@ -678,7 +675,7 @@ public class XLink implements Serializab /** * Returns an identification of the target of a {@code from} or {@code to} attribute. * - * @return An identification of the target of a {@code from} or {@code to} attribute, or {@code null}. + * @return an identification of the target of a {@code from} or {@code to} attribute, or {@code null}. * * @category traversal */ @@ -689,9 +686,9 @@ public class XLink implements Serializab /** * Sets an identification of the target of a {@code from} or {@code to} attribute. * - * @param label An identification of the target of a {@code from} or {@code to} attribute, or {@code null}. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param label an identification of the target of a {@code from} or {@code to} attribute, or {@code null}. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "label"} attribute. * * @category traversal @@ -705,7 +702,7 @@ public class XLink implements Serializab * Returns the starting resource. The value must correspond to the same value for some * {@code label} attribute. * - * @return The starting resource, or {@code null}. + * @return the starting resource, or {@code null}. * * @category traversal */ @@ -717,9 +714,9 @@ public class XLink implements Serializab * Sets the starting resource. The value must correspond to the same value for some * {@code label} attribute. * - * @param from The starting resource, or {@code null}. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param from the starting resource, or {@code null}. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "from"} attribute. * * @category traversal @@ -733,7 +730,7 @@ public class XLink implements Serializab * Returns the ending resource. The value must correspond to the same value for some * {@code label} attribute. * - * @return The ending resource, or {@code null}. + * @return the ending resource, or {@code null}. * * @category traversal */ @@ -745,9 +742,9 @@ public class XLink implements Serializab * Sets the ending resource. The value must correspond to the same value for some * {@code label} attribute. * - * @param to The ending resource, or {@code null}. - * @throws UnsupportedOperationException If this {@code xlink} is unmodifiable. - * @throws IllegalStateException If the link type {@linkplain #setType has been explicitely set}. + * @param to the ending resource, or {@code null}. + * @throws UnsupportedOperationException if this {@code xlink} is unmodifiable. + * @throws IllegalStateException if the link type {@linkplain #setType has been explicitely set}. * and that type does not allow the {@code "to"} attribute. * * @category traversal @@ -772,7 +769,7 @@ public class XLink implements Serializab /** * Compares this {@code XLink} with the given object for equality. * - * @param object The object to compare with this XLink. + * @param object the object to compare with this XLink. */ @Override public boolean equals(final Object object) { @@ -785,7 +782,7 @@ public class XLink implements Serializab if (h0 != 0) { final int h1 = that.hashCode; if (h1 != 0 && h0 != h1) { - return false; // Slight optimization using the pre-computed hash code values. + return false; // Slight optimization using the pre-computed hash code values. } } return Objects.equals(this.type, that.type) && @@ -868,8 +865,7 @@ public class XLink implements Serializab value = xml.value(); } } catch (NoSuchFieldException e) { - // Should never happen with Enums. But if it - // happen anyway, this is not a fatal error. + // Should never happen with Enums. But if it happen anyway, this is not a fatal error. Logging.unexpectedException(Logging.getLogger(Loggers.XML), XLink.class, "toString", e); } buffer.append(label).append("=\"").append(value).append('"'); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -37,6 +37,7 @@ public final strictfp class AngleConvert * Tests conversions to {@link Double}. */ @Test + @SuppressWarnings("UnnecessaryBoxing") public void testDouble() { final ObjectConverter<Angle,Double> c1 = AngleConverter.INSTANCE; final ObjectConverter<Double,Angle> c2 = AngleConverter.Inverse.INSTANCE; Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -82,7 +82,7 @@ public final strictfp class ConverterReg * Ensures that the current converters is also registered for the given target class. * The given target may not be the same than the {@link ObjectConverter#getTargetClass()}. * - * @param targetClass The target class to ensure that the converter is registered for. + * @param targetClass the target class to ensure that the converter is registered for. */ private void assertSameConverterForTarget(final Class<?> targetClass) { final ObjectConverter<?,?> converter = converters.peekLast(); @@ -101,7 +101,7 @@ public final strictfp class ConverterReg /** * Ensures that there is no converter for the given target. * - * @param targetClass The target which should not have any registered converter. + * @param targetClass the target which should not have any registered converter. */ private void assertNoConverterForTarget(final Class<?> targetClass) { final ObjectConverter<?,?> converter = converters.peekLast(); @@ -123,7 +123,7 @@ public final strictfp class ConverterReg /** * Ensures that the converter for the given target is an {@link IdentityConverter}. * - * @param targetClass The target for which an identity converter should be obtained. + * @param targetClass the target for which an identity converter should be obtained. */ private void assertIdentityForTarget(final Class<?> targetClass) { final ObjectConverter<?,?> converter = converters.peekLast(); @@ -136,10 +136,9 @@ public final strictfp class ConverterReg } /** - * Asserts that the converter to the given target is a fallback having the given string - * representation. + * Asserts that the converter to the given target is a fallback having the given string representation. * - * @param expected The expected string representation of the fallback. + * @param expected the expected string representation of the fallback. */ private void assertFallbackEquals(final Class<?> target, final String expected) { ObjectConverter<?,?> converter = converters.peekLast(); @@ -170,7 +169,7 @@ public final strictfp class ConverterReg assertMultilinesEquals("After StringConverter.Short", "ConverterRegistry\n" + " ├─Short ← String\n" + - " ├─Number ← String\n" + // Same instance than above, applied to Number target. + " ├─Number ← String\n" + // Same instance than above, applied to Number target. " │ └─Short ← String\n" + " ├─Object ← String\n" + " ├─Comparable ← String\n" + @@ -198,7 +197,7 @@ public final strictfp class ConverterReg " ├─Comparable ← String\n" + " ├─Serializable ← String\n" + " ├─Long ← String\n" + - " └─Number ← String\n" + // The FallbackConverter, which replaced the previous. + " └─Number ← String\n" + // The FallbackConverter, which replaced the previous. " ├─Short ← String\n" + " └─Long ← String\n", registry.toString()); /* @@ -243,7 +242,7 @@ public final strictfp class ConverterReg " ├─Serializable ← String\n" + " ├─Long ← String\n" + " ├─Boolean ← String\n" + - " └─Number ← String\n", registry.toString()); // Replaced the FallbackConverter. + " └─Number ← String\n", registry.toString()); // Replaced the FallbackConverter. /* * Adds String ← Float * Expected side-effect: none Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -154,9 +154,9 @@ public final strictfp class FallbackConv /** * Converts the given value and compares the result with the expected one. * - * @param converter The converter to use. - * @param expected The expected result, or {@code null} if the conversion is expected to fail. - * @param value The value to convert. + * @param converter the converter to use. + * @param expected the expected result, or {@code null} if the conversion is expected to fail. + * @param value the value to convert. * @throws UnconvertibleObjectException if an exception was not expected but occurred. */ private static void assertConvertedEquals(final ObjectConverter<String,?> converter, Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -37,6 +37,7 @@ import static org.apache.sis.test.Assert * @module */ @DependsOn(SystemRegistryTest.class) +@SuppressWarnings("UnnecessaryBoxing") public final strictfp class NumberConverterTest extends TestCase { /** * Creates a {@link NumberConverter} for the given source and target classes. Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -80,7 +80,7 @@ public final strictfp class PathConverte /** * Tests conversions from File to URI values. * - * @throws URISyntaxException Should never happen. + * @throws URISyntaxException if this test uses a malformed URI. */ @Test @PlatformDependent @@ -94,7 +94,7 @@ public final strictfp class PathConverte /** * Tests conversions from File to URL values. * - * @throws MalformedURLException Should never happen. + * @throws MalformedURLException if this test uses a malformed URL. */ @Test @PlatformDependent @@ -108,7 +108,7 @@ public final strictfp class PathConverte /** * Tests conversions from URI to string values. * - * @throws URISyntaxException Should never happen. + * @throws URISyntaxException if this test uses a malformed URI. */ @Test public void testURI_String() throws URISyntaxException { @@ -120,8 +120,8 @@ public final strictfp class PathConverte /** * Tests conversions from URI to URL values. * - * @throws MalformedURLException Should never happen. - * @throws URISyntaxException Should never happen. + * @throws MalformedURLException if this test uses a malformed URL. + * @throws URISyntaxException if this test uses a malformed URI. */ @Test public void testURI_URL() throws MalformedURLException, URISyntaxException { @@ -133,7 +133,7 @@ public final strictfp class PathConverte /** * Tests conversions from URI to File values. * - * @throws URISyntaxException Should never happen. + * @throws URISyntaxException if this test uses a malformed URI. */ @Test @PlatformDependent @@ -147,7 +147,7 @@ public final strictfp class PathConverte /** * Tests conversions from URL to string values. * - * @throws MalformedURLException Should never happen. + * @throws MalformedURLException if this test uses a malformed URL. */ @Test public void testURL_String() throws MalformedURLException { @@ -159,8 +159,8 @@ public final strictfp class PathConverte /** * Tests conversions from URL to URI values. * - * @throws MalformedURLException Should never happen. - * @throws URISyntaxException Should never happen. + * @throws MalformedURLException if this test uses a malformed URL. + * @throws URISyntaxException if this test uses a malformed URI. */ @Test public void testURL_URI() throws MalformedURLException, URISyntaxException { @@ -172,7 +172,7 @@ public final strictfp class PathConverte /** * Tests conversions from URL to File values. * - * @throws MalformedURLException Should never happen. + * @throws MalformedURLException if this test uses a malformed URL. */ @Test @PlatformDependent Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -17,14 +17,17 @@ package org.apache.sis.internal.converter; import java.util.Locale; -import java.io.File; import java.math.BigDecimal; import java.math.BigInteger; +import java.io.File; import java.net.URI; import java.net.URL; import java.net.URISyntaxException; import java.net.MalformedURLException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.lang.annotation.ElementType; import javax.measure.Unit; import org.opengis.util.InternationalString; @@ -41,11 +44,6 @@ import org.junit.Test; import static org.apache.sis.test.Assert.*; -// Branch-dependent imports -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.charset.StandardCharsets; - /** * Tests the various {@link StringConverter} implementations. @@ -55,6 +53,7 @@ import java.nio.charset.StandardCharsets * @version 0.8 * @module */ +@SuppressWarnings("UnnecessaryBoxing") @DependsOn(org.apache.sis.measure.AngleTest.class) public final strictfp class StringConverterTest extends TestCase { /** Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -57,8 +57,8 @@ public final strictfp class ModifiableId * compare with the map content. This is needed because the "special case rules" cause the {@code "href"} * identifier to be replaced by {@code "xlink:href"}. * - * @param expected The expected content. - * @return The map to compare with the expected content. + * @param expected the expected content. + * @return the map to compare with the expected content. */ private static void assertMapEquals(String expected, final Map<Citation,String> map) { final int start = expected.indexOf(TO_REPLACE); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -40,7 +40,7 @@ public final strictfp class XmlUtilities * Tests the {@link XmlUtilities#toXML} method. * This test arbitrarily uses the CET timezone. * - * @throws DatatypeConfigurationException Should never happen. + * @throws DatatypeConfigurationException if the XML factory can not be created. */ @Test public void testToXML() throws DatatypeConfigurationException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -55,8 +55,8 @@ final strictfp class PropertyTypeMock ex * If this {@code PropertyTypeMock} class was not for testing purpose only, * this method would be invoked by JAXB at marshalling time. * - * @param metadata The pseudo-metadata element to wrap. - * @return A {@code PropertyType} wrapping the given the metadata element. + * @param metadata the pseudo-metadata element to wrap. + * @return a {@code PropertyType} wrapping the given the metadata element. */ @Override protected PropertyTypeMock wrap(final Result metadata) { @@ -88,11 +88,13 @@ final strictfp class PropertyTypeMock ex } /** Returns the identifiers as a modifiable list. */ + @SuppressWarnings("ReturnOfCollectionOrArrayField") @Override public Collection<? extends Identifier> getIdentifiers() { return identifiers; } /** Returns a view of the identifiers as a map. */ + @SuppressWarnings("ReturnOfCollectionOrArrayField") @Override public IdentifierMap getIdentifierMap() { return map; } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -73,7 +73,7 @@ public final strictfp class PropertyType /** * Tests the construction of a plain property (no identifier). * - * @throws Exception Should never happen. + * @throws Exception if an error occurred during (un)marshalling. */ @Test public void testWithNoReference() throws Exception { @@ -86,7 +86,7 @@ public final strictfp class PropertyType * Tests the construction of an object containing {@code UUID} reference, * but in a context where the user didn't gave us the authorization to use it. * - * @throws Exception Should never happen. + * @throws Exception if an error occurred during (un)marshalling. */ @Test @DependsOnMethod("testWithUUID") @@ -98,7 +98,7 @@ public final strictfp class PropertyType * Tests the construction of an object containing a {@link UUID}. * The {@code UUID} is allowed to replace the object definition in the XML to be marshalled. * - * @throws Exception Should never happen. + * @throws Exception if an error occurred during (un)marshalling. */ @Test @DependsOnMethod("testWithNoReference") @@ -142,7 +142,7 @@ public final strictfp class PropertyType * Tests the construction of an object containing a {@link XLink} while keeping the metadata. * The {@code XLink} is provided for information purpose. * - * @throws Exception Should never happen. + * @throws Exception if an error occurred during (un)marshalling. */ @Test @DependsOnMethod("testWithXLink") @@ -154,7 +154,7 @@ public final strictfp class PropertyType * Tests the construction of an object containing a {@link XLink} replacing the metadata. * The {@code XLink} is allowed to replace the object definition in the XML to be marshalled. * - * @throws Exception Should never happen. + * @throws Exception if an error occurred during (un)marshalling. */ @Test @DependsOnMethod("testWithNoReference") Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -74,7 +74,7 @@ public final strictfp class LanguageCode * Creates the XML (un)marshaller pool to be shared by all test methods. * The (un)marshallers locale and timezone will be set to fixed values. * - * @throws JAXBException If an error occurred while creating the pool. + * @throws JAXBException if an error occurred while creating the pool. * * @see #disposeMarshallerPool() */ @@ -107,7 +107,7 @@ public final strictfp class LanguageCode * </gmd:MD_Metadata> * } * - * @param languageCode The XML fragment to write inside the {@code <gmd:language>} element. + * @param languageCode the XML fragment to write inside the {@code <gmd:language>} element. */ private static String getMetadataXML(final String languageCode) { return "<gmd:MD_Metadata" + @@ -123,7 +123,7 @@ public final strictfp class LanguageCode * Tests marshalling of {@code <gmd:LanguageCode>}. * The result shall be as documented in {@link #testLanguageCode()}. * - * @throws JAXBException Should never happen. + * @throws JAXBException if an error occurs while marshalling the language. * * @see #testMarshallCharacterString() */ @@ -147,7 +147,7 @@ public final strictfp class LanguageCode * </gmd:MD_Metadata> * } * - * @throws JAXBException Should never happen. + * @throws JAXBException if an error occurs while unmarshalling the language. * * @see #testMarshallLanguageCode() */ @@ -171,7 +171,7 @@ public final strictfp class LanguageCode * </gmd:MD_Metadata> * } * - * @throws JAXBException Should never happen. + * @throws JAXBException if an error occurs while unmarshalling the language. */ @Test @DependsOnMethod("testLanguageCode") @@ -187,7 +187,7 @@ public final strictfp class LanguageCode * Tests marshalling of {@code <gco:CharacterString>}, which require explicit marshaller configuration. * The result shall be as documented in {@link #testCharacterString()}. * - * @throws JAXBException Should never happen. + * @throws JAXBException if an error occurs while marshalling the language. * * @see #testMarshallLanguageCode() */ @@ -213,7 +213,7 @@ public final strictfp class LanguageCode * </gmd:MD_Metadata> * } * - * @throws JAXBException Should never happen. + * @throws JAXBException if an error occurs while unmarshalling the language. */ @Test public void testCharacterString() throws JAXBException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -65,7 +65,7 @@ public final strictfp class TimePeriodTe * Creates the XML (un)marshaller pool to be shared by all test methods. * The (un)marshallers locale and timezone will be set to fixed values. * - * @throws JAXBException If an error occurred while creating the pool. + * @throws JAXBException if an error occurred while creating the pool. * * @see #disposeMarshallerPool() */ @@ -89,8 +89,8 @@ public final strictfp class TimePeriodTe /** * Tests time instant. The test is executed using an arbitrary locale and timezone. * - * @throws JAXBException If an error occurred while marshalling. - * @throws DatatypeConfigurationException Should never happen. + * @throws JAXBException if an error occurred while marshalling. + * @throws DatatypeConfigurationException should never happen. */ @Test public void testTimeInstant() throws JAXBException, DatatypeConfigurationException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -41,7 +41,7 @@ public final strictfp class ReferenceQue * <p>This method is not a test of the SIS library, but rather a verification of our JDK * library interpretation.</p> * - * @throws InterruptedException This is the excepted exception. + * @throws InterruptedException this is the excepted exception. */ @Test(expected=InterruptedException.class) public void verifyInterruptAssumption() throws InterruptedException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -35,7 +35,7 @@ public final strictfp class XMLComparato /** * Tests the {@link XMLComparator#ignoredAttributes} and {@link XMLComparator#ignoredNodes} sets. * - * @throws Exception Shall never happen. + * @throws Exception if an error occurred while reading the XML. */ @Test public void testIgnore() throws Exception { @@ -81,7 +81,7 @@ public final strictfp class XMLComparato * * @see javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean) * - * @throws Exception Shall never happen. + * @throws Exception if an error occurred while reading the XML. */ @Test public void testNamespaceAware() throws Exception { @@ -120,8 +120,8 @@ public final strictfp class XMLComparato * invoked in order to test that the comparator rightly detected an error that we * were expected to detect. * - * @param message The message for JUnit if the comparison does not fail. - * @param cmp The comparator on which to invoke {@link XMLComparator#compare()}. + * @param message the message for JUnit if the comparison does not fail. + * @param cmp the comparator on which to invoke {@link XMLComparator#compare()}. */ private static void assertFail(final String message, final XMLComparator cmp) { try { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -147,7 +147,7 @@ public final strictfp class CitationsTes @Override public String getName() { - return "TheProj4Space"; // Intentionally a very different name than "Proj4". + return "TheProj4Space"; // Intentionally a very different name than "Proj4". } } } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -107,9 +107,9 @@ public final strictfp class DoubleDouble * Asserts that the result of some operation is equals to the expected value, * up to a tolerance value determined by the extended arithmetic precision. * - * @param expected The expected value, computed using {@code BigInteger} arithmetic. - * @param actual The actual value. - * @param ef Multiplication factor for the tolerance threshold. + * @param expected the expected value, computed using {@code BigInteger} arithmetic. + * @param actual the actual value. + * @param ef multiplication factor for the tolerance threshold. */ private static void assertExtendedEquals(final BigDecimal expected, final DoubleDouble actual, final double ef) { final BigDecimal value = toBigDecimal(actual); @@ -352,7 +352,7 @@ public final strictfp class DoubleDouble * <li>The arrays do not contains an entry for a value that could be omitted.</li> * </ul> * - * @throws ReflectiveOperationException Should never happen. + * @throws ReflectiveOperationException if this test uses wrong field names. */ @Test public void testArraysConsistency() throws ReflectiveOperationException { @@ -432,7 +432,7 @@ public final strictfp class DoubleDouble case 0: dd = DoubleDouble.createRadiansToDegrees(); break; case 1: dd = DoubleDouble.createDegreesToRadians(); break; case 2: dd = DoubleDouble.createSecondsToRadians(); break; - default: return; // Test done. + default: return; // Test done. } assertEquals(DoubleDouble.errorForWellKnownValue(dd.value), dd.error, STRICT); } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -61,16 +61,16 @@ public abstract class AppenderTestCase e * Implementations shall write in the {@link #appender}, then test * the result with {@link #assertOutputEquals(String)}. * - * @param lineSeparator The line separator to use. - * @throws IOException Should never happen. + * @param lineSeparator the line separator to use. + * @throws IOException should never happen since the tests will write in a buffer. */ abstract void run(final String lineSeparator) throws IOException; /** * Ensures that the buffer content is equals to the given string. * - * @param expected The expected content. - * @throws IOException Should never happen. + * @param expected the expected content. + * @throws IOException should never happen since the tests will write in a buffer. */ final void assertOutputEquals(final String expected) throws IOException { IO.flush(appender); @@ -91,7 +91,7 @@ public abstract class AppenderTestCase e * Tests a sequence of {@link Appendable#append(char)} calls, * with Unix line terminators mixed in. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test public void testCharsWithLF() throws IOException { @@ -103,7 +103,7 @@ public abstract class AppenderTestCase e * Tests a few {@link Appendable#append(CharSequence)} calls, * with Unix line terminators in the sequences. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithLF") @@ -115,7 +115,7 @@ public abstract class AppenderTestCase e * Tests a sequence of {@link Appendable#append(char)} calls, * with CR line terminators mixed in. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithLF") @@ -128,7 +128,7 @@ public abstract class AppenderTestCase e * Tests a few {@link Appendable#append(CharSequence)} calls, * with CR line terminators in the sequences. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithCR") @@ -140,7 +140,7 @@ public abstract class AppenderTestCase e * Tests a sequence of {@link Appendable#append(char)} calls, * with Windows line terminators mixed in. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithCR") @@ -153,7 +153,7 @@ public abstract class AppenderTestCase e * Tests a few {@link Appendable#append(CharSequence)} calls, * with Windows line terminators in the sequences. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithCRLF") @@ -165,7 +165,7 @@ public abstract class AppenderTestCase e * Tests a sequence of {@link Appendable#append(char)} calls, * with Unicode line terminators mixed in. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithLF") @@ -178,7 +178,7 @@ public abstract class AppenderTestCase e * Tests a few {@link Appendable#append(CharSequence)} calls, * with Unicode line terminators in the sequences. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ @Test @DependsOnMethod("testCharsWithUnicode") @@ -190,7 +190,7 @@ public abstract class AppenderTestCase e * Tests a few {@link java.io.Writer#write(String)} calls, * with Unix line terminators in the sequences. * - * @throws IOException Should never happen. + * @throws IOException should never happen since the tests will write in a buffer. */ public void testSequencesToWriter() throws IOException { appender = IO.asWriter(appender); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -41,8 +41,8 @@ public class EchoAppendable extends Appe /** * Creates a copy writer for the specified streams or buffers. * - * @param main The main stream or buffer. - * @param echo The echo stream or buffer. + * @param main the main stream or buffer. + * @param echo the echo stream or buffer. */ public EchoAppendable(final Appendable main, final Appendable echo) { super(main); @@ -52,9 +52,9 @@ public class EchoAppendable extends Appe /** * Writes a single character. * - * @param c The character to append. + * @param c the character to append. * @return {@code this}. - * @throws IOException If an I/O error occurs. + * @throws IOException if an I/O error occurs. */ @Override public Appendable append(final char c) throws IOException { @@ -66,9 +66,9 @@ public class EchoAppendable extends Appe /** * Writes a character sequence. * - * @param sequence The character sequence to be written. + * @param sequence the character sequence to be written. * @return {@code this}. - * @throws IOException If an I/O error occurs. + * @throws IOException if an I/O error occurs. */ @Override public Appendable append(final CharSequence sequence) throws IOException { @@ -80,11 +80,11 @@ public class EchoAppendable extends Appe /** * 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. + * @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}. - * @throws IOException If an I/O error occurs. + * @throws IOException if an I/O error occurs. */ @Override public Appendable append(final CharSequence sequence, final int start, final int end) throws IOException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -52,8 +52,8 @@ public final strictfp class LeftMarginTe /** * Runs the test using an extract from Arthur RIMBAUD (1854-1891), "Le bateau ivre". * - * @param lineSeparator The line separator to use in the test strings. - * @throws IOException Should never happen, since we are writing in a {@link StringBuilder}. + * @param lineSeparator the line separator to use in the test strings. + * @throws IOException should never happen, since we are writing in a {@link StringBuilder}. */ @Override void run(final String lineSeparator) throws IOException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -57,8 +57,8 @@ public strictfp class LineAppenderTest e /** * Runs the test. * - * @param lineSeparator The line separator to use in the test strings. - * @throws IOException Should never happen, since we are writing in a {@link StringBuilder}. + * @param lineSeparator the line separator to use in the test strings. + * @throws IOException should never happen, since we are writing in a {@link StringBuilder}. */ @Override void run(final String lineSeparator) throws IOException { @@ -79,7 +79,7 @@ public strictfp class LineAppenderTest e * Tests a call to {@link LineAppender#flush()} interleaved between two lines, * where the second line begin with a tabulation. * - * @throws IOException Should never happen, since we are writing in a {@link StringBuilder}. + * @throws IOException should never happen, since we are writing in a {@link StringBuilder}. * * @see <a href="https://issues.apache.org/jira/browse/SIS-140";>SIS-140</a> */ Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/SingleCharAppendable.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/SingleCharAppendable.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/SingleCharAppendable.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/SingleCharAppendable.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -33,7 +33,7 @@ final class SingleCharAppendable extends /** * Constructs a {@code SingleCharAppendable} object delegating to the given {@code Appendable}. * - * @param out The underlying stream or buffer. + * @param out the underlying stream or buffer. */ public SingleCharAppendable(final Appendable out) { super(out); @@ -51,10 +51,10 @@ final class SingleCharAppendable extends /** * 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. - * @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. + * @throws IOException if an I/O error occurs. */ @Override public Appendable append(final CharSequence sequence, int start, final int end) throws IOException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -57,9 +57,10 @@ public final strictfp class TableAppende void run(String lineSeparator) throws IOException { final Appendable out = appender; table.nextLine('═'); - - // r.e.d. = Equatorial diameter Measured relative to the Earth. - // Source: "Planet" on wikipedia on July 25, 2008. + /* + * r.e.d. = Equatorial diameter Measured relative to the Earth. + * Source: "Planet" on wikipedia on July 25, 2008. + */ assertSame(out, out.append("English\tFrench\tr.e.d." + lineSeparator)); table.appendHorizontalSeparator(); assertSame(out, out.append("Mercury\tMercure\t0.382" + lineSeparator)); @@ -107,7 +108,7 @@ public final strictfp class TableAppende * more easily, without having to deal with {@link IOException}. */ @Test - public void testToString() { // NO throws IOException + public void testToString() { // NO throws IOException /* * First, ensure that TableAppender.toString() does not * mess with the content of user-supplied Appendable. @@ -130,8 +131,8 @@ public final strictfp class TableAppende /** * Helper method for {@link #testToString()}. * - * @param table Where to format the table. - * @param expected The expected string representation of the formatted table. + * @param table where to format the table. + * @param expected the expected string representation of the formatted table. */ private static void testToString(final TableAppender table, final String expected) { table.nextLine('═'); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -47,8 +47,8 @@ public final strictfp class TabulationEx /** * Runs the test. * - * @param lineSeparator The line separator to use in the test strings. - * @throws IOException Should never happen, since we are writing in a {@link StringBuilder}. + * @param lineSeparator the line separator to use in the test strings. + * @throws IOException should never happen, since we are writing in a {@link StringBuilder}. */ @Override void run(final String lineSeparator) throws IOException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -59,8 +59,8 @@ public strictfp class WordWrapTest exten * Runs the test using an extract from Émile Nelligan (1879-1941) * with soft hyphen and X3.64 sequences added. * - * @param lineSeparator The line separator to use in the test strings. - * @throws IOException Should never happen, since we are writing in a {@link StringBuilder}. + * @param lineSeparator the line separator to use in the test strings. + * @throws IOException should never happen, since we are writing in a {@link StringBuilder}. */ @Override void run(final String lineSeparator) throws IOException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -180,8 +180,8 @@ public final strictfp class DecimalFunct assertEquals(1, fractionDigitsForDelta(0.100, true)); assertEquals(1, fractionDigitsForDelta(0.125, true)); assertEquals(1, fractionDigitsForDelta(0.949, true)); - assertEquals(2, fractionDigitsForDelta(0.994, true)); // Special case - assertEquals(3, fractionDigitsForDelta(0.999, true)); // Special case + assertEquals(2, fractionDigitsForDelta(0.994, true)); // Special case + assertEquals(3, fractionDigitsForDelta(0.999, true)); // Special case assertEquals( 0, fractionDigitsForDelta( 1.0, true)); assertEquals( 0, fractionDigitsForDelta( 1.9, true)); @@ -189,24 +189,24 @@ public final strictfp class DecimalFunct assertEquals(-1, fractionDigitsForDelta( 10.0, true)); assertEquals(-1, fractionDigitsForDelta( 19.9, true)); assertEquals(-1, fractionDigitsForDelta( 94.9, true)); - assertEquals( 0, fractionDigitsForDelta( 99.0, true)); // Special case + assertEquals( 0, fractionDigitsForDelta( 99.0, true)); // Special case assertEquals(-2, fractionDigitsForDelta(100.0, true)); assertEquals(-2, fractionDigitsForDelta(100.1, true)); - assertEquals(-1, fractionDigitsForDelta(994.9, true)); // Special case - assertEquals(+1, fractionDigitsForDelta(999.9, true)); // Special case + assertEquals(-1, fractionDigitsForDelta(994.9, true)); // Special case + assertEquals(+1, fractionDigitsForDelta(999.9, true)); // Special case assertEquals(-3, fractionDigitsForDelta(1000, true)); // Tests values out of the POW10 array range. assertEquals(23, fractionDigitsForDelta(1.0E-23, true)); assertEquals(23, fractionDigitsForDelta(1.9E-23, true)); assertEquals(23, fractionDigitsForDelta(9.1E-23, true)); - assertEquals(24, fractionDigitsForDelta(9.6E-23, true)); // Special case + assertEquals(24, fractionDigitsForDelta(9.6E-23, true)); // Special case assertEquals(300, fractionDigitsForDelta(1.1E-300, true)); assertEquals(-23, fractionDigitsForDelta(1.0E+23, true)); assertEquals(-23, fractionDigitsForDelta(1.9E+23, true)); assertEquals(-23, fractionDigitsForDelta(9.1E+23, true)); - assertEquals(-22, fractionDigitsForDelta(9.6E+23, true)); // Special case + assertEquals(-22, fractionDigitsForDelta(9.6E+23, true)); // Special case assertEquals(-300, fractionDigitsForDelta(1.1E+300, true)); // Other cases. Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -42,7 +42,7 @@ public final strictfp class PlaneTest ex * * This method also verifies that the Pearson coefficient is close to 1. * - * @param tolerance The maximal difference allowed between the fitted and the original values. + * @param tolerance the maximal difference allowed between the fitted and the original values. */ private static Plane assertFitEquals(final double tolerance, final double[] x, final double[] y, final double[] z) { final Plane plan = new Plane(); @@ -57,11 +57,11 @@ public final strictfp class PlaneTest ex /** * Returns an array of the given length filled with random values. * - * @param rd The random number generator to use. - * @param length The desired array length. - * @param offset The minimal value allowed in the returned array. - * @param scale The difference between the minimal and maximal allowed values. - * @return The array of random values. + * @param rd the random number generator to use. + * @param length the desired array length. + * @param offset the minimal value allowed in the returned array. + * @param scale the difference between the minimal and maximal allowed values. + * @return the array of random values. */ private static double[] random(final Random rd, final int length, final double offset, final double scale) { final double[] x = new double[length]; Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -73,7 +73,7 @@ public final strictfp class StatisticsTe */ @Test public void testGaussian() { - final Random random = new Random(317780561); // See class javadoc. + final Random random = new Random(317780561); // See class javadoc. final Statistics statistics = new Statistics(null); for (int i=0; i<10000; i++) { statistics.accept(random.nextGaussian()); @@ -192,7 +192,7 @@ public final strictfp class StatisticsTe */ @Test public void testConcatenation() { - final Random random = new Random(429323868); // See class javadoc. + final Random random = new Random(429323868); // See class javadoc. final Statistics global = new Statistics(null); final Statistics byBlock = new Statistics(null); for (int i=0; i<10; i++) { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -187,7 +187,7 @@ public final strictfp class AngleFormatT /** * Tests the example provided in the {@link AngleFormat} javadoc. * - * @throws ParseException If a string can not be parsed. + * @throws ParseException if a string can not be parsed. */ @Test @DependsOnMethod("testOptionalFields") @@ -205,11 +205,11 @@ public final strictfp class AngleFormatT /** * Tests a single line of Javadoc examples. * - * @param f The angle format to test. - * @param pattern The pattern to apply for the test. - * @param e1 The expected string value of 48.5. - * @param e2 The expected string value of -12.53125. - * @param eps The tolerance for comparing the parsed value of {@code e2}. + * @param f the angle format to test. + * @param pattern the pattern to apply for the test. + * @param e1 the expected string value of 48.5. + * @param e2 the expected string value of -12.53125. + * @param eps the tolerance for comparing the parsed value of {@code e2}. */ private static void testExample(final AngleFormat f, final String pattern, final String e1, final String e2, final double eps) throws ParseException Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -104,7 +104,7 @@ public final strictfp class AngleTest ex assertEquals( 90, Latitude.clamp(Double.POSITIVE_INFINITY), 0); assertEquals(-90, Latitude.clamp(Double.NEGATIVE_INFINITY), 0); assertEquals(doubleToLongBits(+0.0), doubleToLongBits(Latitude.clamp(+0.0))); - assertEquals(doubleToLongBits(-0.0), doubleToLongBits(Latitude.clamp(-0.0))); // Sign shall be preserved. + assertEquals(doubleToLongBits(-0.0), doubleToLongBits(Latitude.clamp(-0.0))); // Sign shall be preserved. } /** @@ -117,11 +117,11 @@ public final strictfp class AngleTest ex assertEquals(-160, Longitude.normalize( 200), 0); assertEquals( 160, Longitude.normalize(-200), 0); assertEquals(-180, Longitude.normalize(-180), 0); - assertEquals(-180, Longitude.normalize( 180), 0); // Upper value shall be exclusive. + assertEquals(-180, Longitude.normalize( 180), 0); // Upper value shall be exclusive. assertEquals(NaN, Longitude.normalize( NaN), 0); assertEquals(NaN, Longitude.normalize(Double.POSITIVE_INFINITY), 0); assertEquals(NaN, Longitude.normalize(Double.NEGATIVE_INFINITY), 0); assertEquals(doubleToLongBits(+0.0), doubleToLongBits(Longitude.normalize(+0.0))); - assertEquals(doubleToLongBits(-0.0), doubleToLongBits(Longitude.normalize(-0.0))); // Sign shall be preserved. + assertEquals(doubleToLongBits(-0.0), doubleToLongBits(Longitude.normalize(-0.0))); // Sign shall be preserved. } } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -130,7 +130,7 @@ public final strictfp class FormattedCha * with attributes. Built in a sub-class of {@link SimpleCharacterIterator} in * order to have access to the protected {@link #upper} field. */ - @SuppressWarnings("serial") + @SuppressWarnings({"serial", "CloneableClassWithoutClone"}) private static class LatitudeString extends SimpleCharacterIterator { LatitudeString() { super(LATITUDE_STRING); @@ -213,19 +213,19 @@ public final strictfp class FormattedCha */ if (!isInteger) { if (index < 7) { - startInteger = index; // End of previous integer field. - limitInteger = index+1; // Start of next integer field. + startInteger = index; // End of previous integer field. + limitInteger = index+1; // Start of next integer field. } else { - startInteger = 8; // End of last integer field. + startInteger = 8; // End of last integer field. } } if (!isSeparator) { - if (index < 8) limitSeparator = 8; // Start of next separator field. - else startSeparator = 9; // End of previous separator field. + if (index < 8) limitSeparator = 8; // Start of next separator field. + else startSeparator = 9; // End of previous separator field. } if (!isFraction) { - if (index < 9) limitFraction = 9; // Start of next fraction field. - else startFraction = 10; // End of previous fraction field. + if (index < 9) limitFraction = 9; // Start of next fraction field. + else startFraction = 10; // End of previous fraction field. } } final Map<Attribute,Object> attributes = it.getAttributes(); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -81,7 +81,7 @@ public final strictfp class RangeTest ex * <p>This test requires assertions to be enabled.</p> */ @Test(expected = IllegalArgumentException.class) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes", "ResultOfObjectAllocationIgnored"}) public void testConstructorErrors00() { assumeTrue(Range.class.desiredAssertionStatus()); new Range(Double.class, "error", true, "blast", true); @@ -96,7 +96,7 @@ public final strictfp class RangeTest ex * <p>This test requires assertions to be enabled.</p> */ @Test(expected = IllegalArgumentException.class) - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes", "ResultOfObjectAllocationIgnored"}) public void testConstructorErrors01() { assumeTrue(Range.class.desiredAssertionStatus()); new Range(String.class, 123.233, true, 8740.09, true); @@ -229,6 +229,7 @@ public final strictfp class RangeTest ex * Tests the {@link Range#intersect(Range)} method. */ @Test + @SuppressWarnings("UnnecessaryBoxing") public void testIntersection() { final Range<Integer> range1 = new Range<>(Integer.class, 1, true, 5, true); final Range<Integer> range2 = new Range<>(Integer.class, 4, true, 6, true); @@ -256,6 +257,7 @@ public final strictfp class RangeTest ex * Tests the {@link Range#union(Range)} method. */ @Test + @SuppressWarnings("UnnecessaryBoxing") public void testUnion() { final Range<Character> range1 = new Range<>(Character.class, 'a', true, 'f', true); final Range<Character> range2 = new Range<>(Character.class, 'd', true, 'h', true); @@ -270,6 +272,7 @@ public final strictfp class RangeTest ex * Tests the {@link Range#union(Range)} method with disjoint ranges. */ @Test + @SuppressWarnings("UnnecessaryBoxing") public void testDisjointUnion() { final Range<Character> range1 = new Range<>(Character.class, 'a', true, 'f', true); final Range<Character> range2 = new Range<>(Character.class, 'm', true, 'v', true);
