sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779790 [1/2] - in /sis/branches/JDK7: ./ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-console/src/test/java/org/apache/sis/console/ core/sis-build-helper/src/main/java/org/apache/sis/internal/book/ core/si...
Date Sun, 22 Jan 2017 10:50:31 GMT
Author: desruisseaux
Date: Sun Jan 22 10:50:30 2017
New Revision: 1779790

URL: http://svn.apache.org/viewvc?rev=1779790&view=rev
Log:
Merge from JDK8 branch.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Option.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
    sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
    sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
    sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/BookException.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/LegalConstraints.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/SecurityConstraints.java
    sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/FrenchProfile.java
    sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
    sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatStoreProviderTest.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DataType.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/NamedElement.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Capability.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/CodeType.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageOutputStream.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/DataTransfer.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/HyperRectangleReader.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/MemoryDataTransfer.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/GeoHashCoderTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ByteArrayChannel.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataTestCase.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/DripByteChannel.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ImageInputStreamComparator.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 10:50:30 2017
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1779775
+/sis/branches/JDK8:1584960-1779788
 /sis/branches/JDK9:1773327-1773512
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/HelpCommand.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -75,9 +75,9 @@ final class HelpCommand extends CommandR
     /**
      * Implementation of {@link #run()}, also shared by {@link CommandRunner#help(String)}.
      *
-     * @param showHeader   {@code true} for printing the "Apache SIS" header.
-     * @param commandNames The names of the commands to list.
-     * @param validOptions The options to list.
+     * @param  showHeader    {@code true} for printing the "Apache SIS" header.
+     * @param  commandNames  the names of the commands to list.
+     * @param  validOptions  the options to list.
      */
     void help(final boolean showHeader, final String[] commandNames, final EnumSet<Option> validOptions) {
         final ResourceBundle commands = ResourceBundle.getBundle("org.apache.sis.console.Commands", locale);
@@ -118,7 +118,7 @@ final class HelpCommand extends CommandR
             }
             table.flush();
         } catch (IOException e) {
-            throw new AssertionError(e); // Should never happen, because we are writing to a PrintWriter.
+            throw new AssertionError(e);            // Should never happen, because we are writing to a PrintWriter.
         }
     }
 }

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/IdentifierCommand.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -145,7 +145,7 @@ final class IdentifierCommand extends Me
      * Creates an identifier row for the given CRS.
      * This method gives precedence to {@code "urn:ogc:def:"} identifiers if possible.
      *
-     * @return The row, or {@code null} if no identifier has been found.
+     * @return the row, or {@code null} if no identifier has been found.
      */
     static Row create(ReferenceSystem rs) throws FactoryException {
         String identifier = IdentifiedObjects.lookupURN(rs, null);

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidCommandException.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -39,8 +39,8 @@ public class InvalidCommandException ext
     /**
      * Constructs an exception with the specified detail message.
      *
-     * @param message The detail message.
-     * @param command The name of the invalid command.
+     * @param message  the detail message.
+     * @param command  the name of the invalid command.
      */
     public InvalidCommandException(final String message, final String command) {
         super(message);
@@ -50,7 +50,7 @@ public class InvalidCommandException ext
     /**
      * Returns the name of the invalid command.
      *
-     * @return The name of the invalid command.
+     * @return the name of the invalid command.
      */
     public String getCommand() {
         return command;

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MetadataCommand.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -131,7 +131,7 @@ class MetadataCommand extends CommandRun
      * If the given argument seems to be an authority code ("URN", "EPSG", "CRS", "AUTO", <i>etc.</i>),
      * delegates to {@link CRS#forCode(String)}. Otherwise reads the metadata using a datastore.
      *
-     * @return A {@link Metadata} or {@link CoordinateReferenceSystem} instance, or {@code null} if none.
+     * @return a {@link Metadata} or {@link CoordinateReferenceSystem} instance, or {@code null} if none.
      */
     final Object readMetadataOrCRS() throws DataStoreException, FactoryException {
         if (useStandardInput()) {

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/MimeTypeCommand.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -20,16 +20,14 @@ import java.net.URI;
 import java.util.EnumSet;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import org.apache.sis.storage.DataStores;
-import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.CharSequences;
-
-// Branch-dependent imports
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.FileSystemNotFoundException;
+import org.apache.sis.storage.DataStores;
+import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.CharSequences;
 
 
 /**
@@ -60,7 +58,7 @@ final class MimeTypeCommand extends Comm
     /**
      * Prints mime-type information.
      *
-     * @throws IOException If an error occurred while reading the file.
+     * @throws IOException if an error occurred while reading the file.
      */
     @Override
     public int run() throws InvalidOptionException, IOException, DataStoreException, URISyntaxException {
@@ -90,8 +88,10 @@ final class MimeTypeCommand extends Comm
             }
             String type;
             if (!uri.isAbsolute()) {
-                // If the URI is not absolute, we will not be able to convert to Path.
-                // Open as a String, leaving the conversion to DataStore implementations.
+                /*
+                 * If the URI is not absolute, we will not be able to convert to Path.
+                 * Open as a String, leaving the conversion to DataStore implementations.
+                 */
                 type = DataStores.probeContentType(file);
             } else try {
                 type = Files.probeContentType(Paths.get(uri));

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Option.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Option.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Option.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Option.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -159,9 +159,9 @@ enum Option {
     /**
      * Parses the given value as a boolean.
      *
-     * @param  value The value to parse.
-     * @return The value as a boolean.
-     * @throws InvalidOptionException If the given value is not recognized as a boolean.
+     * @param  value  the value to parse.
+     * @return the value as a boolean.
+     * @throws InvalidOptionException if the given value is not recognized as a boolean.
      */
     boolean parseBoolean(final String value) throws InvalidOptionException {
         for (int i=0; i<BOOLEAN_VALUES.length; i++) {

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -29,6 +29,8 @@ import java.io.Console;
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.Path;
 import java.sql.Connection;                             // For javadoc.
 import org.apache.sis.internal.system.DataDirectory;
 import org.apache.sis.util.resources.Errors;
@@ -38,10 +40,6 @@ import org.apache.sis.setup.Installation
 
 import static org.apache.sis.internal.util.Constants.EPSG;
 
-// Branch-dependent imports
-import java.nio.file.AccessDeniedException;
-import java.nio.file.Path;
-
 
 /**
  * A provider for data licensed under different terms of use than the Apache license.
@@ -154,7 +152,7 @@ public class ResourcesDownloader extends
      * Returns the provider to use for fetching the actual licensed data after we got user's agreement.
      * This method asks for user's agreement when first invoked.
      *
-     * @param  requireAgreement {@code true} if license agreement is required.
+     * @param  requireAgreement  {@code true} if license agreement is required.
      * @throws AccessDeniedException if the user does not accept to install the EPSG dataset.
      * @throws IOException if an error occurred while reading the {@link #DOWNLOAD_URL}.
      */
@@ -221,8 +219,8 @@ public class ResourcesDownloader extends
      * Asks the user to answer by "Yes" or "No". Callers is responsible for ensuring
      * that the {@link #answers} map is non-empty before to invoke this method.
      *
-     * @param prompt Message to show to the user.
-     * @return The user's answer.
+     * @param  prompt  message to show to the user.
+     * @return the user's answer.
      */
     private boolean accept(final String prompt, final Object... arguments) {
         Boolean answer;
@@ -236,9 +234,9 @@ public class ResourcesDownloader extends
      * Returns the terms of use of the dataset provided by the given authority, or {@code null} if none.
      * The terms of use can be returned in either plain text or HTML.
      *
-     * @param  authority One of the values returned by {@link #getAuthorities()}.
-     * @param  mimeType Either {@code "text/plain"} or {@code "text/html"}.
-     * @return The terms of use in plain text or HTML, or {@code null} if none.
+     * @param  authority  one of the values returned by {@link #getAuthorities()}.
+     * @param  mimeType   either {@code "text/plain"} or {@code "text/html"}.
+     * @return the terms of use in plain text or HTML, or {@code null} if none.
      * @throws IllegalArgumentException if the given {@code authority} argument is not one of the expected values.
      * @throws IOException if an error occurred while reading the license file.
      */
@@ -255,8 +253,8 @@ public class ResourcesDownloader extends
      * <p>If that question has not already been asked, this method asks to the user if (s)he accepts
      * EPSG terms of use. If (s)he refuses, an {@link AccessDeniedException} will be thrown.</p>
      *
-     * @param  authority One of the values returned by {@link #getAuthorities()}.
-     * @return The names of all SQL scripts to execute.
+     * @param  authority  one of the values returned by {@link #getAuthorities()}.
+     * @return the names of all SQL scripts to execute.
      * @throws IllegalArgumentException if the given {@code authority} argument is not one of the expected values.
      * @throws IOException if an error occurred while fetching the script names.
      */
@@ -273,10 +271,10 @@ public class ResourcesDownloader extends
      * <p>If that question has not already been asked, this method asks to the user if (s)he accepts
      * EPSG terms of use. If (s)he refuses, an {@link AccessDeniedException} will be thrown.</p>
      *
-     * @param  authority One of the values returned by {@link #getAuthorities()}.
-     * @param  resource Index of the script to open, from 0 inclusive to
-     *         <code>{@linkplain #getResourceNames(String) getResourceNames}(authority).length</code> exclusive.
-     * @return A reader for the installation script content.
+     * @param  authority  one of the values returned by {@link #getAuthorities()}.
+     * @param  resource   index of the script to open, from 0 inclusive to
+     *                    <code>{@linkplain #getResourceNames(String) getResourceNames}(authority).length</code> exclusive.
+     * @return a reader for the installation script content.
      * @throws IllegalArgumentException if the given {@code authority} argument is not one of the expected values.
      * @throws IndexOutOfBoundsException if the given {@code resource} argument is out of bounds.
      * @throws IOException if an error occurred while creating the reader.

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -264,7 +264,7 @@ final class TransformCommand extends Met
     /**
      * Prints the character for commented lines.
      *
-     * @param after  the color to apply after the comment character, if colors are enabled.
+     * @param  after  the color to apply after the comment character, if colors are enabled.
      */
     private void printCommentLinePrefix() {
         if (colors) {
@@ -280,7 +280,7 @@ final class TransformCommand extends Met
      * Prints the given string after the prefix comment. This is used for formatting
      * some metadata in the header before to print transformed coordinates.
      *
-     * @param key  a {@code Vocabulary.Keys} constant for the header to print.
+     * @param  key  a {@code Vocabulary.Keys} constant for the header to print.
      */
     private void printHeader(final short key) {
         printCommentLinePrefix();
@@ -325,7 +325,7 @@ final class TransformCommand extends Met
      * Otherwise prints only the operation method names, since the coordinate operation names
      * generated by SIS are not very meaningful.
      *
-     * @param step  the coordinate operation to print as a sequence of steps.
+     * @param  step  the coordinate operation to print as a sequence of steps.
      */
     private void printOperations(final CoordinateOperation step, boolean isNext) {
         if (isNext) {

Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/AboutCommandTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -39,7 +39,7 @@ public final strictfp class AboutCommand
     /**
      * Tests the sub-command without option.
      *
-     * @throws Exception Should never happen.
+     * @throws Exception should never happen.
      */
     @Test
     public void testDefault() throws Exception {
@@ -68,7 +68,7 @@ public final strictfp class AboutCommand
     /**
      * Tests the sub-command with the {@code --brief} option.
      *
-     * @throws Exception Should never happen.
+     * @throws Exception should never happen.
      */
     @Test
     public void testBrief() throws Exception {
@@ -81,7 +81,7 @@ public final strictfp class AboutCommand
     /**
      * Tests the sub-command with the {@code --verbose} option.
      *
-     * @throws Exception Should never happen.
+     * @throws Exception should never happen.
      */
     @Test
     public void testVerbose() throws Exception {

Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CommandRunnerTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -20,6 +20,7 @@ import java.util.EnumSet;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
+import java.nio.charset.StandardCharsets;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -27,9 +28,6 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.apache.sis.test.TestUtilities.getSingleton;
 
-// Branch-dependent imports
-import java.nio.charset.StandardCharsets;
-
 
 /**
  * Tests the {@link CommandRunner} base class.
@@ -47,8 +45,8 @@ public final strictfp class CommandRunne
         /**
          * Creates a new sub-command for the given arguments and option values.
          *
-         * @param  validOptions The valid options.
-         * @param  arguments The test arguments.
+         * @param  validOptions  the valid options.
+         * @param  arguments     the test arguments.
          */
         Dummy(final EnumSet<Option> validOptions, final String... arguments) throws InvalidOptionException {
             super(0, arguments, validOptions);
@@ -66,7 +64,7 @@ public final strictfp class CommandRunne
     /**
      * Tests the {@code --locale} option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testLocale() throws InvalidOptionException {
@@ -79,7 +77,7 @@ public final strictfp class CommandRunne
     /**
      * Tests the {@code --timezone} option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testTimeZone() throws InvalidOptionException {
@@ -93,7 +91,7 @@ public final strictfp class CommandRunne
     /**
      * Tests the {@code --encoding} option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testEncoding() throws InvalidOptionException {
@@ -106,7 +104,7 @@ public final strictfp class CommandRunne
     /**
      * Tests passing a mix of different legal options.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     @DependsOnMethod({"testLocale", "testTimeZone", "testEncoding"})
@@ -125,10 +123,11 @@ public final strictfp class CommandRunne
     /**
      * Tests passing an option with a missing value.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     @DependsOnMethod("testLocale")
+    @SuppressWarnings("ResultOfObjectAllocationIgnored")
     public void testMissingOptionValue() throws InvalidOptionException {
         final CommandRunner c = new Dummy(EnumSet.allOf(Option.class), CommandRunner.TEST, "--brief"); // Should not comply.
         assertEquals(Option.BRIEF, getSingleton(c.options.keySet()));

Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/HelpCommandTest.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -36,7 +36,7 @@ public final strictfp class HelpCommandT
     /**
      * Tests the sub-command without option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testDefault() throws InvalidOptionException {
@@ -56,7 +56,7 @@ public final strictfp class HelpCommandT
      * Tests the sub-command with the {@code --help} option.
      * Shall contain only a subset of {@link #testDefault()}.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testHelp() throws InvalidOptionException {
@@ -75,7 +75,7 @@ public final strictfp class HelpCommandT
     /**
      * Tests the sub-command with the {@code --locale en} option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testEnglishLocale() throws InvalidOptionException {
@@ -89,7 +89,7 @@ public final strictfp class HelpCommandT
     /**
      * Tests the sub-command with the {@code --locale fr} option.
      *
-     * @throws InvalidOptionException Should never happen.
+     * @throws InvalidOptionException should never happen.
      */
     @Test
     public void testFrenchLocale() throws InvalidOptionException {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -142,8 +142,8 @@ public final class Assembler {
     /**
      * Creates a new assembler for the given input and output files.
      *
-     * @param  input  the input file (e.g. {@code "site/book/en/body.html"}).
-     * @param  locale the locale for the message to generates in HTML code.
+     * @param  input   the input file (e.g. {@code "site/book/en/body.html"}).
+     * @param  locale  the locale for the message to generates in HTML code.
      * @throws ParserConfigurationException if this constructor can not build the XML document.
      * @throws IOException if an error occurred while reading the file.
      * @throws SAXException if an error occurred while parsing the XML.
@@ -216,7 +216,7 @@ public final class Assembler {
                 CharSequence  text    = node.getTextContent();
                 for (int i=0; i<text.length(); i++) {
                     switch (text.charAt(i)) {
-                        case '\r': break;  // Delete all occurrences of '\r'.
+                        case '\r': break;                       // Delete all occurrences of '\r'.
                         case '\n': newLine = true;  continue;
                         default  : newLine = false; continue;
                         case ' ' : if (newLine) break; else continue;
@@ -289,8 +289,8 @@ public final class Assembler {
      * Performs on the given node the processing documented in the class javadoc.
      * This method invokes itself recursively.
      *
-     * @param index {@code true} for including the {@code <h1>}, <i>etc.</i> texts in the Table Of Content (TOC).
-     *        This is set to {@code false} when parsing the content of {@code <aside>} or {@code <article>} elements.
+     * @param  index  {@code true} for including the {@code <h1>}, <i>etc.</i> texts in the Table Of Content (TOC).
+     *         This is set to {@code false} when parsing the content of {@code <aside>} or {@code <article>} elements.
      */
     private void process(final Node node, boolean index) throws IOException, SAXException, BookException {
         Node[] childNodes = toArray(node.getChildNodes());
@@ -378,8 +378,8 @@ public final class Assembler {
      * Prepend the current section numbers to the given node.
      * The given node shall be a {@code <h1>}, {@code <h2>}, <i>etc.</i> element.
      *
-     * @param level 1 if {@code head} is {@code <h1>}, 2 if {@code head} is {@code <h2>}, <i>etc.</i>
-     * @param head  the {@code <h1>}, {@code <h2>}, {@code <h3>}, {@code <h4>}, <i>etc.</i> element.
+     * @param  level  1 if {@code head} is {@code <h1>}, 2 if {@code head} is {@code <h2>}, <i>etc.</i>
+     * @param  head   the {@code <h1>}, {@code <h2>}, {@code <h3>}, {@code <h4>}, <i>etc.</i> element.
      */
     private void prependSectionNumber(final int level, final Node head) {
         final Element number = document.createElement("span");
@@ -396,9 +396,9 @@ public final class Assembler {
     /**
      * Appends the given header to the table of content.
      *
-     * @param appendTo   The root node of the table of content where to append a new line.
-     * @param level      Level of the {@code <h1>}, {@code <h2>}, {@code <h3>}, <i>etc.</i> element found.
-     * @param referenced The {@code <h1>}, {@code <h2>}, {@code <h3>}, <i>etc.</i> element to reference.
+     * @param  appendTo    the root node of the table of content where to append a new line.
+     * @param  level       level of the {@code <h1>}, {@code <h2>}, {@code <h3>}, <i>etc.</i> element found.
+     * @param  referenced  the {@code <h1>}, {@code <h2>}, {@code <h3>}, <i>etc.</i> element to reference.
      */
     private void appendToTableOfContent(Node appendTo, int level, final Element referenced) throws BookException {
         final String id = referenced.getAttribute("id");
@@ -428,7 +428,7 @@ public final class Assembler {
      * Generates a {@code <nav>} element below the given {@code <h1>} element with navigation links
      * to previous and next chapters.
      *
-     * @param head the {@code <h1>} element.
+     * @param  head  the {@code <h1>} element.
      */
     private void linkToSiblingChapters(final Element head) throws BookException {
         final Element links = document.createElement("div");
@@ -533,7 +533,7 @@ public final class Assembler {
     /**
      * Assembles the document and writes to the destination.
      *
-     * @param  output the output file (e.g. {@code "site/content/en/developer-guide.html"}).
+     * @param  output  the output file (e.g. {@code "site/content/en/developer-guide.html"}).
      * @throws IOException if an error occurred while reading or writing file.
      * @throws SAXException if an error occurred while parsing an input XML.
      * @throws BookException if an error was found in the content of the XML file.
@@ -556,7 +556,7 @@ public final class Assembler {
      * The only argument expected by this method is the language: {@code "en"} or {@code "fr"}.
      * The current directory shall be the parent directory of {@code "book"} and {@code "content"}.
      *
-     * @param  args command-line arguments. Should contain exactly on value, which is the language.
+     * @param  args  command-line arguments. Should contain exactly on value, which is the language.
      * @throws Exception if an I/O error, a XML parsing error or other kinds of error occurred.
      *
      * @since 0.8

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/BookException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/BookException.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/BookException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/BookException.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -29,7 +29,7 @@ public class BookException extends Excep
     /**
      * Creates an exception with the given message.
      *
-     * @param message The exception message.
+     * @param message  the exception message.
      */
     public BookException(final String message) {
         super(message);

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/CodeColorizer.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -100,7 +100,7 @@ public final class CodeColorizer {
     /**
      * Creates a new color colorizer.
      *
-     * @param document the object to use for creating nodes.
+     * @param  document  the object to use for creating nodes.
      * @throws IOException if an error occurred while reading the list of pre-defined identifiers.
      * @throws BookException if an identifier is defined twice.
      */
@@ -244,16 +244,16 @@ public final class CodeColorizer {
     /**
      * Applies emphasing on the words found in all text node of the given node.
      *
-     * @param  parent the root element where to put Java keywords in bold characters.
-     *         This is typically a {@code <pre>} or {@code <code>} element.
-     * @param  type {@code "xml"} if the element to process is XML rather than Java code.
+     * @param  parent  the root element where to put Java keywords in bold characters.
+     *                 This is typically a {@code <pre>} or {@code <code>} element.
+     * @param  type    {@code "xml"} if the element to process is XML rather than Java code.
      * @throws BookException if an element can not be processed.
      */
     public void highlight(final Node parent, final String type) throws BookException {
         final boolean isXML = "xml".equals(type);
-        final boolean isJava = !isXML;   // Future version may add more choices.
-        Element syntaticElement = null;  // E.g. comment block or a String.
-        String  stopCondition   = null;  // Identify 'syntaticElement' end.
+        final boolean isJava = !isXML;                              // Future version may add more choices.
+        Element syntaticElement = null;                             // E.g. comment block or a String.
+        String  stopCondition   = null;                             // Identify 'syntaticElement' end.
         for (final Node node : toArray(parent.getChildNodes())) {
             /*
              * The following condition happen only if a quoted string or a comment started in a previous

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -79,7 +79,7 @@ public final class Doclet extends HtmlDo
     /**
      * Invoked by Javadoc for starting the doclet.
      *
-     * @param  root The root document.
+     * @param  root  the root document.
      * @return {@code true} on success, or {@code false} on failure.
      */
     public static boolean start(final RootDoc root) {
@@ -152,9 +152,9 @@ public final class Doclet extends HtmlDo
      * Copies the standard CSS file, then copies the custom CSS file.
      * If the {@value #RENAMED_CSS} file already exists, it will not be overwritten.
      *
-     * @param  inputFile        The custom CSS file to copy in the destination directory.
-     * @param  outputDirectory  The directory where to copy the CSS file.
-     * @throws IOException      If an error occurred while reading or writing.
+     * @param  inputFile        the custom CSS file to copy in the destination directory.
+     * @param  outputDirectory  the directory where to copy the CSS file.
+     * @throws IOException      if an error occurred while reading or writing.
      */
     private static void copyStylesheet(final File inputFile, final File outputDirectory) throws IOException {
         final File stylesheetFile = new File(outputDirectory, STYLESHEET);
@@ -198,9 +198,9 @@ public final class Doclet extends HtmlDo
      * directory can be specified with {@code <javadocResourcesDirectory>}, I have been unable to make it work even
      * with absolute paths.
      *
-     * @param  inputFile        The directory containing resources.
-     * @param  outputDirectory  The directory where to copy the resource files.
-     * @throws IOException      If an error occurred while reading or writing.
+     * @param  inputFile        the directory containing resources.
+     * @param  outputDirectory  the directory where to copy the resource files.
+     * @throws IOException      if an error occurred while reading or writing.
      */
     private static void copyResources(final File inputDirectory, final File outputDirectory) throws IOException {
         final File[] inputFiles = inputDirectory.listFiles(new FilenameFilter() {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -147,8 +147,8 @@ public class Assembler extends AbstractM
     /**
      * The filter to use for selecting the files to be included in the ZIP file.
      *
-     * @param  directory The directory.
-     * @param  filename  The filename.
+     * @param  directory  the directory.
+     * @param  filename   the filename.
      * @return {@code true} if the given file should be included in the ZIP file.
      */
     @Override

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -95,7 +95,7 @@ final class Filenames {
     /**
      * Returns the distribution directory, creating it if needed.
      *
-     * @param targetDirectory The {@code target} directory.
+     * @param  targetDirectory  the {@code target} directory.
      */
     static File distributionDirectory(final File targetDirectory) throws IOException {
         final File outDirectory = new File(targetDirectory, DISTRIBUTION_DIRECTORY);

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -23,6 +23,9 @@ import java.io.FileWriter;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.nio.file.FileSystemException;
 import java.util.Set;
 import java.util.LinkedHashSet;
 import org.apache.maven.plugin.AbstractMojo;
@@ -36,11 +39,6 @@ import org.apache.maven.artifact.Artifac
 
 import static org.apache.sis.internal.maven.Filenames.*;
 
-// Related to JDK7
-import java.nio.file.Path;
-import java.nio.file.Files;
-import java.nio.file.FileSystemException;
-
 
 /**
  * Collects <code>.jar</code> files in a single "{@code target/binaries}" directory.
@@ -198,9 +196,9 @@ public final class JarCollector extends
      * Returns the name of the given file. If the given file is a snapshot, then the
      * {@code "SNAPSHOT"} will be replaced by the timestamp if possible.
      *
-     * @param  file     The file from which to get the filename.
-     * @param  artifact The artifact that produced the given file.
-     * @return The filename to use.
+     * @param  file      the file from which to get the filename.
+     * @param  artifact  the artifact that produced the given file.
+     * @return the filename to use.
      */
     private static String getFinalName(final File file, final Artifact artifact) {
         String filename = file.getName();
@@ -222,8 +220,8 @@ public final class JarCollector extends
      * On JDK6 or on platform that do not support links, this method rather
      * updates the <code>content.txt</code> file.
      *
-     * @param file The source file to read.
-     * @param copy The destination file to create.
+     * @param  file  the source file to read.
+     * @param  copy  the destination file to create.
      */
     private static void linkFileToDirectory(final File file, final File copy) throws IOException {
         final Path source = file.toPath();

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -83,7 +83,7 @@ final class PackInput implements Closeab
     /**
      * Opens the given JAR file in read-only mode.
      *
-     * @param  file The file to open.
+     * @param  file  the file to open.
      * @throws IOException if the file can't be open.
      */
     PackInput(final File file) throws IOException {
@@ -104,7 +104,7 @@ final class PackInput implements Closeab
     /**
      * Returns the entries in the input JAR file.
      *
-     * @return The next entry, or {@code null} if the iteration is finished.
+     * @return the next entry, or {@code null} if the iteration is finished.
      */
     JarEntry nextEntry() {
         if (entries == null) {
@@ -119,7 +119,7 @@ final class PackInput implements Closeab
                 }
             }
             entry.setMethod(JarEntry.DEFLATED);
-            entry.setCompressedSize(-1); // Change in method has changed the compression size.
+            entry.setCompressedSize(-1);                    // Change in method has changed the compression size.
             return entry;
         }
         return entry = null;
@@ -150,9 +150,9 @@ final class PackInput implements Closeab
      * Returns the input stream for the entry of the given name. This method must be invoked
      * before the first call to {@link #nextEntry}. Each entry can be requested only once.
      *
-     * @param  name The name of the entry
-     * @return The input stream for the requested entry, or {@code null} if none.
-     * @throws IOException If the entry can not be read.
+     * @param  name  the name of the entry
+     * @return the input stream for the requested entry, or {@code null} if none.
+     * @throws IOException if the entry can not be read.
      * @throws IllegalStateException Programming error (pre-condition violated).
      */
     InputStream getInputStream(final String name) throws IOException {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -98,8 +98,8 @@ final class PackOutput implements Closea
     /**
      * Creates an output jar.
      *
-     * @param inputJARs The input JAR filenames together with their {@code PackInput} helpers.
-     * @param outputJAR The output JAR filename.
+     * @param  inputJARs  the input JAR filenames together with their {@code PackInput} helpers.
+     * @param  outputJAR  the output JAR filename.
      */
     PackOutput(final Map<File,PackInput> inputJARs, final File outputJAR) {
         this.inputJARs = inputJARs;
@@ -117,8 +117,8 @@ final class PackOutput implements Closea
     /**
      * Opens the given JAR file for writing and creates its manifest.
      *
-     * @param  projectName The project name, or {@code null} if none.
-     * @param  version     The project version, or {@code null} if none.
+     * @param  projectName  the project name, or {@code null} if none.
+     * @param  version      the project version, or {@code null} if none.
      * @throws IOException if the file can't be open.
      */
     void open(final String projectName, final String version) throws IOException {
@@ -249,9 +249,9 @@ final class PackOutput implements Closea
      * Copies fully the given input stream to the given destination.
      * The given input stream is closed after the copy.
      *
-     * @param  in     The input stream from which to get the the content to copy.
-     * @param  buffer Temporary buffer to reuse at each method call.
-     * @throws IOException If an error occurred during the copy.
+     * @param  in      the input stream from which to get the the content to copy.
+     * @param  buffer  temporary buffer to reuse at each method call.
+     * @throws IOException if an error occurred during the copy.
      */
     void copy(final InputStream in, final byte[] buffer) throws IOException {
         int n;
@@ -309,7 +309,7 @@ final class PackOutput implements Closea
     /**
      * Creates a Pack200 file from the output JAR, then delete the JAR.
      *
-     * @param  out Where to write the Pack200. This stream will be closed by this method.
+     * @param  out  where to write the Pack200. This stream will be closed by this method.
      * @throws IOException if an error occurred while packing the JAR.
      */
     void pack(final OutputStream out) throws IOException {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -58,9 +58,9 @@ final class Packer implements FilenameFi
     /**
      * Creates a packer.
      *
-     * @param  projectName     The project name to declare in the manifest file, or {@code null} if none.
-     * @param  version         The project version to declare in the manifest file, or {@code null} if none.
-     * @param  targetDirectory The Maven target directory.
+     * @param  projectName      the project name to declare in the manifest file, or {@code null} if none.
+     * @param  version          the project version to declare in the manifest file, or {@code null} if none.
+     * @param  targetDirectory  the Maven target directory.
      * @throws FileNotFoundException if the {@code target/binaries} directory is not found.
      */
     Packer(final String projectName, final String version, final File targetDirectory) throws FileNotFoundException {
@@ -76,8 +76,8 @@ final class Packer implements FilenameFi
     /**
      * Filter the input JAR files. This is for internal usage by {@link #createOutputJAR(String)} only.
      *
-     * @param  directory The directory (ignored).
-     * @param  name The filename.
+     * @param  directory  the directory (ignored).
+     * @param  name       the filename.
      * @return {@code true} if the given filename ends with {@code ".jar"}.
      */
     @Override
@@ -115,8 +115,8 @@ final class Packer implements FilenameFi
      *
      * <p>Callers needs to invoke one of the {@code PackOutput.pack(…)} methods on the returned object.</p>
      *
-     * @param  outputJAR The name of the JAR file to create before the Pack200 creation.
-     * @throws IOException If an error occurred while collecting the target directory content.
+     * @param  outputJAR  the name of the JAR file to create before the Pack200 creation.
+     * @throws IOException if an error occurred while collecting the target directory content.
      */
     PackOutput preparePack200(final String outputJAR) throws IOException {
         /*

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -54,7 +54,7 @@ public final class Include extends Inlin
     /**
      * Register this taglet.
      *
-     * @param tagletMap the map to register this tag to.
+     * @param  tagletMap  the map to register this tag to.
      */
     public static void register(final Map<String,Taglet> tagletMap) {
        final Include tag = new Include();
@@ -71,7 +71,7 @@ public final class Include extends Inlin
     /**
      * Returns the name of this custom tag.
      *
-     * @return The tag name.
+     * @return the tag name.
      */
     @Override
     public String getName() {
@@ -81,8 +81,8 @@ public final class Include extends Inlin
     /**
      * Given the <code>Tag</code> representation of this custom tag, return its string representation.
      *
-     * @param tag The tag to format.
-     * @return A string representation of the given tag.
+     * @param  tag  the tag to format.
+     * @return a string representation of the given tag.
      */
     @Override
     public String toString(final Tag tag) {
@@ -122,7 +122,7 @@ public final class Include extends Inlin
                 }
                 start = line.indexOf(ANCHOR_START);
                 if (start >= 0 && line.lastIndexOf(ANCHOR_END) >= start) {
-                    break; // Found the next section - stop this one.
+                    break;                              // Found the next section - stop this one.
                 }
                 if (line.contains(DOCUMENT_END)) {
                     break;

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -70,7 +70,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since SIS taglets can be used in overview.
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inOverview() {
@@ -80,7 +80,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since SIS taglets can be used in package documentation.
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inPackage() {
@@ -91,7 +91,7 @@ abstract class InlineTaglet implements T
      * Returns {@code true} since SIS taglets can be used in type documentation
      * (classes or interfaces).
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inType() {
@@ -101,7 +101,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since SIS taglets can be used in constructor
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inConstructor() {
@@ -111,7 +111,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since SIS taglets can be used in method documentation.
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inMethod() {
@@ -121,7 +121,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since SIS taglets can be used in field documentation.
      *
-     * @return Default to {@code true}.
+     * @return default to {@code true}.
      */
     @Override
     public boolean inField() {
@@ -131,7 +131,7 @@ abstract class InlineTaglet implements T
     /**
      * Returns {@code true} since this base class is all about inline tags.
      *
-     * @return Always {@code true}.
+     * @return always {@code true}.
      */
     @Override
     public final boolean isInlineTag() {
@@ -143,8 +143,8 @@ abstract class InlineTaglet implements T
      * representation. This method should not be called since arrays of inline tags do
      * not exist. However we define it as a matter of principle.
      *
-     * @param  tags The tags to format.
-     * @return A string representation of the given tags.
+     * @param  tags  the tags to format.
+     * @return a string representation of the given tags.
      */
     @Override
     public final String toString(final Tag[] tags) {
@@ -158,6 +158,7 @@ abstract class InlineTaglet implements T
     /**
      * Prints a warning message.
      */
+    @SuppressWarnings("UseOfSystemOutOrSystemErr")
     static void printWarning(final SourcePosition position, final String message) {
         final RootDoc root = getRootDoc();
         if (root != null) {
@@ -170,6 +171,7 @@ abstract class InlineTaglet implements T
     /**
      * Prints an error message.
      */
+    @SuppressWarnings("UseOfSystemOutOrSystemErr")
     static void printError(final SourcePosition position, final String message) {
         final RootDoc root = getRootDoc();
         if (root != null) {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -34,7 +34,7 @@ public final class Module implements Tag
     /**
      * Register this taglet.
      *
-     * @param tagletMap the map to register this tag to.
+     * @param  tagletMap  the map to register this tag to.
      */
     public static void register(final Map<String,Taglet> tagletMap) {
        final Module tag = new Module();
@@ -56,7 +56,7 @@ public final class Module implements Tag
     /**
      * Returns the name of this custom tag.
      *
-     * @return The tag name.
+     * @return the tag name.
      */
     @Override
     public String getName() {
@@ -66,7 +66,7 @@ public final class Module implements Tag
     /**
      * Returns {@code false} since <code>@module</code> can not be used in overview.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean inOverview() {
@@ -76,7 +76,7 @@ public final class Module implements Tag
     /**
      * Returns {@code true} since <code>@module</code> can be used in package documentation.
      *
-     * @return Always {@code true}.
+     * @return always {@code true}.
      */
     @Override
     public boolean inPackage() {
@@ -87,7 +87,7 @@ public final class Module implements Tag
      * Returns {@code true} since <code>@module</code> can be used in type documentation
      * (classes or interfaces). This is actually its main target.
      *
-     * @return Always {@code true}.
+     * @return always {@code true}.
      */
     @Override
     public boolean inType() {
@@ -97,7 +97,7 @@ public final class Module implements Tag
     /**
      * Returns {@code false} since <code>@module</code> can not be used in constructor.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean inConstructor() {
@@ -107,7 +107,7 @@ public final class Module implements Tag
     /**
      * Returns {@code false} since <code>@module</code> can not be used in method documentation.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean inMethod() {
@@ -117,7 +117,7 @@ public final class Module implements Tag
     /**
      * Returns {@code false} since <code>@module</code> can not be used in field documentation.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean inField() {
@@ -127,7 +127,7 @@ public final class Module implements Tag
     /**
      * Returns {@code false} since <code>@module</code> is not an inline tag.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean isInlineTag() {
@@ -138,8 +138,8 @@ public final class Module implements Tag
      * Given the <code>Tag</code> representation of this custom tag, return its string representation.
      * The default implementation invokes the array variant of this method.
      *
-     * @param tag The tag to format.
-     * @return A string representation of the given tag.
+     * @param  tag  the tag to format.
+     * @return a string representation of the given tag.
      */
     @Override
     public String toString(final Tag tag) {
@@ -150,8 +150,8 @@ public final class Module implements Tag
      * Given an array of {@code Tag}s representing this custom tag, return its string
      * representation.
      *
-     * @param tags The tags to format.
-     * @return A string representation of the given tags.
+     * @param  tags  the tags to format.
+     * @return a string representation of the given tags.
      */
     @Override
     public String toString(final Tag[] tags) {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -78,7 +78,7 @@ public final class Preformat extends Inl
     /**
      * Returns the name of this custom tag.
      *
-     * @return The tag name.
+     * @return the tag name.
      */
     @Override
     public String getName() {
@@ -88,7 +88,7 @@ public final class Preformat extends Inl
     /**
      * Returns {@code false} since <code>@preformat</code> can not be used in overview.
      *
-     * @return Always {@code false}.
+     * @return always {@code false}.
      */
     @Override
     public boolean inOverview() {
@@ -99,7 +99,7 @@ public final class Preformat extends Inl
      * Given the <code>Tag</code> representation of this custom tag, return its string representation.
      *
      * @param tag The tag to format.
-     * @return A string representation of the given tag.
+     * @return a string representation of the given tag.
      */
     @Override
     public String toString(final Tag tag) {
@@ -209,7 +209,7 @@ all:    while (tk.hasMoreTokens()) {
                         }
                         break;
                     }
-                    case '\'': // fall through
+                    case '\'':                                 // fall through
                     case '"': {
                         quote = c;
                         buffer.append("<font color=\"orangered\">").append(c);

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -78,7 +78,7 @@ public final class JavaMaker extends Abs
      * The output directory shall already exists. It should be the case if all
      * sources files have been compiled before this method is invoked.
      *
-     * @return The number of files copied.
+     * @return the number of files copied.
      */
     private static int copyClasses(final File sourceDirectory,
                                    final File outputDirectory) throws IOException

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -114,8 +114,8 @@ public final class UnoPkg extends Abstra
     /**
      * Tests if a specified file should be included in a file list.
      *
-     * @param   directory the directory in which the file was found.
-     * @param   name      the name of the file.
+     * @param  directory  the directory in which the file was found.
+     * @param  name       the name of the file.
      */
     @Override
     public boolean accept(final File directory, final String name) {
@@ -222,7 +222,7 @@ public final class UnoPkg extends Abstra
     /**
      * Copies the content of the specified binary file to the specified output stream.
      *
-     * @param name The ZIP entry name, or {@code null} for using the name of the given file.
+     * @param  name  the ZIP entry name, or {@code null} for using the name of the given file.
      */
     private static void copy(final File file, final ZipOutputStream out, String name) throws IOException {
         if (name == null) {

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -127,7 +127,7 @@ class IndexedResourceCompiler implements
      * @param sourceDirectory     the source directory.
      * @param buildDirectory      the target directory where to write UTF files.
      * @param resourcesToProcess  the resource bundle base classes
-     *        (e.g. {@code org/apache/sis/util/resources/Vocabulary.java}).
+     *                            (e.g. {@code org/apache/sis/util/resources/Vocabulary.java}).
      */
     IndexedResourceCompiler(final File sourceDirectory, final File buildDirectory, final File[] resourcesToProcess) {
         this.sourceDirectory    = sourceDirectory;

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -32,7 +32,7 @@ final class ResourceCompilerException ex
     /**
      * Creates an exception with the given detail message.
      *
-     * @param message The detail message.
+     * @param message  the detail message.
      */
     ResourceCompilerException(final String message) {
         super(message);
@@ -41,7 +41,7 @@ final class ResourceCompilerException ex
     /**
      * Creates an exception with the given cause.
      *
-     * @param cause The cause of this exception.
+     * @param cause  the cause of this exception.
      */
     ResourceCompilerException(final Throwable cause) {
         super(cause.getLocalizedMessage(), cause);

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -155,7 +155,7 @@ public class ResourceCompilerMojo extend
     private int processAllResourceDirectories(final File directory) throws ResourceCompilerException {
         int errors = 0;
         final File[] subdirs = directory.listFiles();
-        if (subdirs != null) { // Appears to be sometime null with auto-generated sub-directories.
+        if (subdirs != null) {                  // Appears to be sometime null with auto-generated sub-directories.
             for (final File subdir : subdirs) {
                 if (subdir.isDirectory()) {
                     File[] resourcesToProcess = subdir.listFiles(this);
@@ -222,8 +222,10 @@ public class ResourceCompilerMojo extend
                         break;
                     }
                 }
-                // Accepts the property file only if we found at least one language.
-                // Example: "Messages.properties" and "Messages_en.properties".
+                /*
+                 * Accepts the property file only if we found at least one language.
+                 * Example: "Messages.properties" and "Messages_en.properties".
+                 */
                 if (i - fileIndex >= 2) {
                     resourcesToProcess[count++] = file;
                 }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -61,7 +61,7 @@ public abstract class CodeListAdapter<Bo
      * Substitutes the adapter value read from an XML stream by the object which will
      * contain the value. JAXB calls automatically this method at unmarshalling time.
      *
-     * @param  identifier The code space and identifier.
+     * @param  identifier  the code space and identifier.
      * @return a code list which represents the GML value.
      */
     @Override

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -135,7 +135,7 @@ public class ResourceInternationalString
      *     }
      * }
      *
-     * @param  locale The locale for which to get the resource bundle.
+     * @param  locale  the locale for which to get the resource bundle.
      * @return the resource bundle for the given locale.
      *
      * @see ResourceBundle#getBundle(String, Locale, ClassLoader)

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -377,7 +377,7 @@ public class XLink implements Serializab
      * Type.AUTO} (including {@code null}) will overwrite the value inferred automatically by
      * {@link #getType()}. A {@code AUTO} value will enable automatic type detection.
      *
-     * @param type The new type of link, or {@code null} if none.
+     * @param  type  the new type of link, or {@code null} if none.
      */
     public void setType(final Type type) {
         canWrite(0x1, "type", "type"); // We want a non-null value in all cases.

Modified: sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/Constraints.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -50,6 +50,7 @@ import org.apache.sis.metadata.iso.const
  * @since   0.4
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(name = "FRA_Constraints_Type")
 @XmlRootElement(name= "FRA_Constraints")
 public class Constraints extends DefaultConstraints {
@@ -73,7 +74,7 @@ public class Constraints extends Default
      * Constructs an instance initialized to a copy of the given object.
      * This constructor does <strong>not</strong> copy the FRA-specific properties.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      */
     public Constraints(final org.opengis.metadata.constraint.Constraints object) {
         super(object);
@@ -82,7 +83,7 @@ public class Constraints extends Default
     /**
      * Returns the documents that specifies the nature of the constraints.
      *
-     * @return Citations to the current documents.
+     * @return citations to the current documents.
      */
     @XmlElement(name = "citation")
     public Collection<Citation> getCitations() {
@@ -92,7 +93,7 @@ public class Constraints extends Default
     /**
      * Sets the documents that specifies the nature of the constraints.
      *
-     * @param newValues Citation to the new documents.
+     * @param  newValues  citation to the new documents.
      */
     public void setCitations(final Collection<? extends Citation> newValues) {
         citations = writeCollection(newValues, citations, Citation.class);

Modified: sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -49,6 +49,7 @@ import org.apache.sis.metadata.iso.ident
  * @since   0.4
  * @module
  */
+@SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(name = "FRA_DataIdentification_Type")
 @XmlRootElement(name ="FRA_DataIdentification")
 public class DataIdentification extends DefaultDataIdentification {
@@ -72,7 +73,7 @@ public class DataIdentification extends
      * Constructs an instance initialized to a copy of the given object.
      * This constructor does <strong>not</strong> copy the FRA-specific properties.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      */
     public DataIdentification(final org.opengis.metadata.identification.DataIdentification object) {
         super(object);
@@ -81,7 +82,7 @@ public class DataIdentification extends
     /**
      * Returns the documents at the origin of the creation of the identified resources.
      *
-     * @return Citations to the current documents.
+     * @return citations to the current documents.
      */
     @XmlElement(name = "relatedCitation")
     public Collection<Citation> getRelatedCitations() {
@@ -91,7 +92,7 @@ public class DataIdentification extends
     /**
      * Sets the documents at the origin of the creation of the identified resources.
      *
-     * @param newValues Citation to the new documents.
+     * @param  newValues  citation to the new documents.
      */
     public void setRelatedCitations(final Collection<? extends Citation> newValues) {
         relatedCitations = writeCollection(newValues, relatedCitations, Citation.class);

Modified: sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -60,7 +60,7 @@ public class DirectReferenceSystem exten
     /**
      * Creates a new reference system from the given one.
      *
-     * @param crs The reference system to partially copy.
+     * @param  crs  the reference system to partially copy.
      */
     public DirectReferenceSystem(final ReferenceSystem crs) {
         super(crs);
@@ -69,7 +69,7 @@ public class DirectReferenceSystem exten
     /**
      * Creates a new reference system from the given code.
      *
-     * @param identifier The reference system identifier.
+     * @param  identifier  the reference system identifier.
      */
     public DirectReferenceSystem(final Identifier identifier) {
         super(identifier);
@@ -78,8 +78,8 @@ public class DirectReferenceSystem exten
     /**
      * Compares this object with the given one for equality.
      *
-     * @param  object The object to compare with this reference system.
-     * @param  mode The strictness level of the comparison.
+     * @param  object  the object to compare with this reference system.
+     * @param  mode    the strictness level of the comparison.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java?rev=1779790&r1=1779789&r2=1779790&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java [UTF-8] Sun Jan 22 10:50:30 2017
@@ -60,7 +60,7 @@ public class IndirectReferenceSystem ext
     /**
      * Creates a new reference system from the given one.
      *
-     * @param crs The reference system to partially copy.
+     * @param  crs  the reference system to partially copy.
      */
     public IndirectReferenceSystem(final ReferenceSystem crs) {
         super(crs);
@@ -69,7 +69,7 @@ public class IndirectReferenceSystem ext
     /**
      * Creates a new reference system from the given code.
      *
-     * @param identifier The reference system identifier.
+     * @param  identifier  the reference system identifier.
      */
     public IndirectReferenceSystem(final Identifier identifier) {
         super(identifier);
@@ -78,8 +78,8 @@ public class IndirectReferenceSystem ext
     /**
      * Compares this object with the given one for equality.
      *
-     * @param  object The object to compare with this reference system.
-     * @param  mode The strictness level of the comparison.
+     * @param  object  the object to compare with this reference system.
+     * @param  mode    the strictness level of the comparison.
      * @return {@code true} if both objects are equal.
      */
     @Override



Mime
View raw message