sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779293 [6/8] - in /sis/branches/JDK7: ./ core/sis-utility/src/main/java/org/apache/sis/internal/converter/ core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/ c...
Date Wed, 18 Jan 2017 06:31:09 GMT
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -101,7 +101,7 @@ public abstract class LoggerAdapter exte
     /**
      * Creates a new logger.
      *
-     * @param name The logger name.
+     * @param  name  the logger name.
      */
     protected LoggerAdapter(final String name) {
         super(name, null);
@@ -122,7 +122,7 @@ public abstract class LoggerAdapter exte
      * Sets the level for this logger. Subclasses must redirect the call to the external
      * logging framework, or do nothing if the level can not be changed programmatically.
      *
-     * @param level The new value for the log level (may be null).
+     * @param level  the new value for the log level (may be null).
      */
     @Override
     public abstract void setLevel(Level level);
@@ -131,7 +131,7 @@ public abstract class LoggerAdapter exte
      * Returns the level for this logger. Subclasses shall get this level from the
      * external logging framework.
      *
-     * @return The logger's level.
+     * @return the logger's level.
      */
     @Override
     public abstract Level getLevel();
@@ -143,7 +143,7 @@ public abstract class LoggerAdapter exte
      * value used in the JDK logging framework. Subclasses should override this method if
      * a different debug level is wanted.
      *
-     * @return The level to use for debugging informations.
+     * @return the level to use for debugging informations.
      */
     @Debug
     protected Level getDebugLevel() {
@@ -191,7 +191,7 @@ public abstract class LoggerAdapter exte
      *     }
      * }
      *
-     * @param  level A message logging level.
+     * @param  level  a message logging level.
      * @return {@code true} if the given message level is currently being logged.
      */
     @Override
@@ -200,7 +200,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs a {@link Level#SEVERE SEVERE} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void severe(String message);
@@ -208,7 +208,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs a {@link Level#WARNING WARNING} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void warning(String message);
@@ -216,7 +216,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs an {@link Level#INFO INFO} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void info(String message);
@@ -224,7 +224,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs an {@link Level#CONFIG CONFIG} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void config(String message);
@@ -232,7 +232,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs a {@link Level#FINE FINE} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void fine(String message);
@@ -240,7 +240,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs a {@link Level#FINER FINER} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void finer(String message);
@@ -248,7 +248,7 @@ public abstract class LoggerAdapter exte
     /**
      * Logs a {@link Level#FINEST FINEST} message.
      *
-     * @param message The message to log.
+     * @param message  the message to log.
      */
     @Override
     public abstract void finest(String message);
@@ -258,8 +258,8 @@ public abstract class LoggerAdapter exte
      * default {@link Logger}, this implementation bypass the level check in order to let
      * the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of method that is being entered.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of method that is being entered.
      */
     @Override
     public void entering(final String sourceClass, final String sourceMethod) {
@@ -271,9 +271,9 @@ public abstract class LoggerAdapter exte
      * Compared to the default {@link Logger}, this implementation bypass the level check in
      * order to let the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of method that is being entered.
-     * @param param        Parameter to the method being entered.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of method that is being entered.
+     * @param param         parameter to the method being entered.
      */
     @Override
     public void entering(String sourceClass, String sourceMethod, Object param) {
@@ -285,9 +285,9 @@ public abstract class LoggerAdapter exte
      * Compared to the default {@link Logger}, this implementation bypass the level check in
      * order to let the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of method that is being entered.
-     * @param params       Array of parameters to the method being entered.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of method that is being entered.
+     * @param params        array of parameters to the method being entered.
      */
     @Override
     public void entering(final String sourceClass, final String sourceMethod, final Object[] params) {
@@ -315,8 +315,8 @@ public abstract class LoggerAdapter exte
      * default {@link Logger}, this implementation bypass the level check in order to let
      * the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
      */
     @Override
     public void exiting(final String sourceClass, final String sourceMethod) {
@@ -328,9 +328,9 @@ public abstract class LoggerAdapter exte
      * default {@link Logger}, this implementation bypass the level check in order to let
      * the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param result       Object that is being returned.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param result        object that is being returned.
      */
     @Override
     public void exiting(String sourceClass, String sourceMethod, Object result) {
@@ -342,9 +342,9 @@ public abstract class LoggerAdapter exte
      * default {@link Logger}, this implementation bypass the level check in order to let
      * the backing logging framework do its own check.
      *
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param thrown       The Throwable that is being thrown.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param thrown        the Throwable that is being thrown.
      */
     @Override
     public void throwing(String sourceClass, String sourceMethod, Throwable thrown) {
@@ -356,7 +356,7 @@ public abstract class LoggerAdapter exte
      * {@link #logrb(Level,String,String,ResourceBundle,String,Object[]) logrb} or
      * {@link #logp(Level,String,String,String)} methods.
      *
-     * @param record The log record to be published.
+     * @param record  the log record to be published.
      */
     @Override
     public void log(final LogRecord record) {
@@ -408,8 +408,8 @@ public abstract class LoggerAdapter exte
      * {@link #config(String) config}, {@link #fine(String) fine}, {@link #finer(String) finer} or
      * {@link #finest(String) finest} methods according the supplied level.
      *
-     * @param level   One of the message level identifiers.
-     * @param message The message to log.
+     * @param level    one of the message level identifiers.
+     * @param message  the message to log.
      */
     @Override
     @SuppressWarnings("fallthrough")
@@ -418,8 +418,10 @@ public abstract class LoggerAdapter exte
         switch (n / 100) {
             default: {
                 if (n < 0 || n == Integer.MAX_VALUE) break;
-                // MAX_VALUE is a special value for Level.OFF. Otherwise and
-                // if positive, fallthrough since we are greater than SEVERE.
+                /*
+                 * MAX_VALUE is a special value for Level.OFF. Otherwise and
+                 * if positive, fallthrough since we are greater than SEVERE.
+                 */
             }
             case 10: severe (message); break;
             case  9: warning(message); break;
@@ -439,9 +441,9 @@ public abstract class LoggerAdapter exte
      * Logs a record at the specified level. The default implementation discards the exception
      * and delegates to <code>{@linkplain #log(Level,String) log}(level, message)</code>.
      *
-     * @param level   One of the message level identifiers.
-     * @param message The message to log.
-     * @param thrown  Throwable associated with log message.
+     * @param level    one of the message level identifiers.
+     * @param message  the message to log.
+     * @param thrown   throwable associated with log message.
      */
     @Override
     public void log(final Level level, final String message, final Throwable thrown) {
@@ -453,9 +455,9 @@ public abstract class LoggerAdapter exte
      * <code>{@linkplain #log(Level,String,Object[]) log}(level, message, params)</code>
      * where the {@code params} array is built from the {@code param} object.
      *
-     * @param level   One of the message level identifiers.
-     * @param message The message to log.
-     * @param param   Parameter to the method being entered.
+     * @param level    one of the message level identifiers.
+     * @param message  the message to log.
+     * @param param    parameter to the method being entered.
      */
     @Override
     public void log(final Level level, final String message, final Object param) {
@@ -467,9 +469,9 @@ public abstract class LoggerAdapter exte
      * The default implementation formats the message immediately, then delegates to
      * <code>{@linkplain #log(Level,String) log}(level, message)</code>.
      *
-     * @param level   One of the message level identifiers.
-     * @param message The message to log.
-     * @param params  Array of parameters to the method being entered.
+     * @param level    one of the message level identifiers.
+     * @param message  the message to log.
+     * @param params   array of parameters to the method being entered.
      */
     @Override
     public void log(final Level level, final String message, final Object[] params) {
@@ -481,10 +483,10 @@ public abstract class LoggerAdapter exte
      * the source class and source method, then delegates to
      * <code>{@linkplain #log(Level,String) log}(level, message)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param message      The message to log.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param message       the message to log.
      */
     @Override
     public void logp(final Level level, final String sourceClass, final String sourceMethod,
@@ -498,11 +500,11 @@ public abstract class LoggerAdapter exte
      * the source class and source method, then delegates to
      * <code>{@linkplain #log(Level,String,Throwable) log}(level, message, thrown)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param message      The message to log.
-     * @param thrown       Throwable associated with log message.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param message       the message to log.
+     * @param thrown        throwable associated with log message.
      */
     @Override
     public void logp(final Level level, final String sourceClass, final String sourceMethod,
@@ -520,11 +522,11 @@ public abstract class LoggerAdapter exte
      * <p>Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
      * target {@link #logp(Level,String,String,String) logp} method has been overridden.</p>
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param message      The message to log.
-     * @param param        Parameter to the method being entered.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param message       the message to log.
+     * @param param         parameter to the method being entered.
      */
     @Override
     public void logp(final Level level, final String sourceClass, final String sourceMethod,
@@ -541,11 +543,11 @@ public abstract class LoggerAdapter exte
      * <p>Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
      * target {@link #logp(Level,String,String,String) logp} method has been overridden.</p>
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param message      The message to log.
-     * @param params       Array of parameters to the method being entered.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param message       the message to log.
+     * @param params        array of parameters to the method being entered.
      */
     @Override
     public void logp(final Level level, final String sourceClass, final String sourceMethod,
@@ -559,12 +561,12 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
      * Object[]) logp}(level, sourceClass, sourceMethod, message, params)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundle       The resource bundle for localizing the message, or {@code null}.
-     * @param message      The message to log.
-     * @param params       Array of parameters to the method being entered.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundle        the resource bundle for localizing the message, or {@code null}.
+     * @param message       the message to log.
+     * @param params        array of parameters to the method being entered.
      *
      * @since 0.5
      */
@@ -579,12 +581,12 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
      * Throwable) logp}(level, sourceClass, sourceMethod, message, thrown)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundle       The resource bundle for localizing the message, or {@code null}.
-     * @param message      The message to log.
-     * @param thrown       Throwable associated with log message.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundle        the resource bundle for localizing the message, or {@code null}.
+     * @param message       the message to log.
+     * @param thrown        throwable associated with log message.
      *
      * @since 0.5
      */
@@ -599,11 +601,11 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String)
      * logp}(level, sourceClass, sourceMethod, message)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundleName   Name of resource bundle to localize message, or {@code null}.
-     * @param message      The message to log.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundleName    name of resource bundle to localize message, or {@code null}.
+     * @param message       the message to log.
      *
      * @deprecated JDK 8 has deprecated this method.
      */
@@ -620,12 +622,12 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
      * Throwable) logp}(level, sourceClass, sourceMethod, message, thrown)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundleName   Name of resource bundle to localize message, or {@code null}.
-     * @param message      The message to log.
-     * @param thrown       Throwable associated with log message.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundleName    name of resource bundle to localize message, or {@code null}.
+     * @param message       the message to log.
+     * @param thrown        throwable associated with log message.
      *
      * @deprecated JDK 8 has deprecated this method.
      */
@@ -642,12 +644,12 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
      * Object) logp}(level, sourceClass, sourceMethod, message, param)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundleName   Name of resource bundle to localize message, or {@code null}.
-     * @param message      The message to log.
-     * @param param        Parameter to the method being entered.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundleName    name of resource bundle to localize message, or {@code null}.
+     * @param message       the message to log.
+     * @param param         parameter to the method being entered.
      *
      * @deprecated JDK 8 has deprecated this method.
      */
@@ -664,12 +666,12 @@ public abstract class LoggerAdapter exte
      * message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
      * Object[]) logp}(level, sourceClass, sourceMethod, message, params)</code>.
      *
-     * @param level        One of the message level identifiers.
-     * @param sourceClass  Name of class that issued the logging request.
-     * @param sourceMethod Name of the method.
-     * @param bundleName   Name of resource bundle to localize message, or {@code null}.
-     * @param message      The message to log.
-     * @param params       Array of parameters to the method being entered.
+     * @param level         one of the message level identifiers.
+     * @param sourceClass   name of class that issued the logging request.
+     * @param sourceMethod  name of the method.
+     * @param bundleName    name of resource bundle to localize message, or {@code null}.
+     * @param message       the message to log.
+     * @param params        array of parameters to the method being entered.
      *
      * @deprecated JDK 8 has deprecated this method.
      */
@@ -687,7 +689,7 @@ public abstract class LoggerAdapter exte
      * (e.g. <a href="http://commons.apache.org/logging/">Commons-logging</a>) instead,
      * which is not expected to use {@link Handler} objects.
      *
-     * @param handler A logging handler, ignored in default implementation.
+     * @param handler  a logging handler, ignored in default implementation.
      */
     @Override
     public void addHandler(Handler handler) {
@@ -696,7 +698,7 @@ public abstract class LoggerAdapter exte
     /**
      * Do nothing since this logger adapter does not support handlers.
      *
-     * @param handler A logging handler, ignored in default implementation.
+     * @param handler  a logging handler, ignored in default implementation.
      */
     @Override
     public void removeHandler(Handler handler) {
@@ -707,7 +709,7 @@ public abstract class LoggerAdapter exte
      * with {@link #addHandler} not allowing to add any handlers, and avoid mixing
      * loggings from the external framework with JDK loggings.
      *
-     * @param useParentHandlers Ignored in default implementation.
+     * @param useParentHandlers  ignored in default implementation.
      */
     @Override
     public void setUseParentHandlers(boolean useParentHandlers) {
@@ -718,7 +720,7 @@ public abstract class LoggerAdapter exte
      * More specifically, it should not inherits any configuration from a parent
      * logger using the JDK logging framework.
      *
-     * @param parent Ignored in default implementation.
+     * @param parent  ignored in default implementation.
      */
     @Override
     public void setParent(Logger parent) {
@@ -731,7 +733,7 @@ public abstract class LoggerAdapter exte
      * is cascaded into many other {@code log} calls, and this test must works in multi-threads
      * environment).
      *
-     * @param filter Ignored in default implementation.
+     * @param filter  ignored in default implementation.
      */
     @Override
     public void setFilter(Filter filter) {
@@ -739,7 +741,7 @@ public abstract class LoggerAdapter exte
 
     /**
      * Wraps the specified object in an array. This is a helper method for
-     * {@code log(..., Object)} methods that delegate their work to {@code log(..., Object[])}
+     * {@code log(…, Object)} methods that delegate their work to {@code log(…, Object[])}
      */
     private static Object[] asArray(final Object param) {
         return (param != null) ? new Object[] {param} : null;
@@ -747,15 +749,17 @@ public abstract class LoggerAdapter exte
 
     /**
      * Formats the specified message. This is a helper method for
-     * {@code log(..., Object[])} methods that delegate their work to {@code log(...)}
+     * {@code log(…, Object[])} methods that delegate their work to {@code log(…)}
      */
     private static String format(String message, final Object[] params) {
         if (params != null && params.length != 0) {
             if (MESSAGE_FORMAT.matcher(message).find()) try {
                 message = MessageFormat.format(message, params);
             } catch (IllegalArgumentException e) {
-                // The default Formatter.messageFormat implementation ignores this exception
-                // and uses the pattern as the message, so we mimic its behavior here.
+                /*
+                 * The default Formatter.messageFormat implementation ignores this exception
+                 * and uses the pattern as the message, so we mimic its behavior here.
+                 */
             }
         }
         return message;
@@ -763,28 +767,32 @@ public abstract class LoggerAdapter exte
 
     /**
      * Localizes the specified message. This is a helper method for
-     * {@code logrb(...)} methods that delegate their work to {@code logp(...)}
+     * {@code logrb(…)} methods that delegate their work to {@code logp(…)}
      */
     private static String localize(final String bundleName, String message) {
         if (bundleName != null) try {
             message = ResourceBundle.getBundle(bundleName).getString(message);
         } catch (MissingResourceException e) {
-            // The default Formatter.messageFormat implementation ignores this exception
-            // and uses the bundle key as the message, so we mimic its behavior here.
+            /*
+             * The default Formatter.messageFormat implementation ignores this exception
+             * and uses the bundle key as the message, so we mimic its behavior here.
+             */
         }
         return message;
     }
 
     /**
      * Localizes the specified message. This is a helper method for
-     * {@code logrb(...)} methods that delegate their work to {@code logp(...)}
+     * {@code logrb(…)} methods that delegate their work to {@code logp(…)}
      */
     private static String localize(final ResourceBundle bundle, String message) {
         if (bundle != null) try {
             message = bundle.getString(message);
         } catch (MissingResourceException e) {
-            // The default Formatter.messageFormat implementation ignores this exception
-            // and uses the bundle key as the message, so we mimic its behavior here.
+            /*
+             * The default Formatter.messageFormat implementation ignores this exception
+             * and uses the bundle key as the message, so we mimic its behavior here.
+             */
         }
         return message;
     }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -41,8 +41,8 @@ import org.apache.sis.util.collection.We
  * This base class is safe for multi-threads usage. Subclasses registered in {@code META-INF/services/}
  * shall make sure that any overridden methods remain safe to call from multiple threads.
  *
- * @param <L> The type of loggers used for the implementation backend.
- *            This is the type used by external frameworks like Log4J.
+ * @param  <L>  the type of loggers used for the implementation backend.
+ *              This is the type used by external frameworks like Log4J.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
@@ -78,7 +78,7 @@ public abstract class LoggerFactory<L> {
     /**
      * Returns the name of the logging framework.
      *
-     * @return The logging framework name.
+     * @return the logging framework name.
      */
     public abstract String getName();
 
@@ -86,8 +86,8 @@ public abstract class LoggerFactory<L> {
      * Returns the logger of the specified name, or {@code null} if the JDK logging framework
      * should be used.
      *
-     * @param  name The name of the logger.
-     * @return The logger, or {@code null} if the JDK logging framework should be used.
+     * @param  name  the name of the logger.
+     * @return the logger, or {@code null} if the JDK logging framework should be used.
      */
     public Logger getLogger(final String name) {
         final L target = getImplementation(name);
@@ -108,7 +108,7 @@ public abstract class LoggerFactory<L> {
      * Returns the base class of objects to be returned by {@link #getImplementation(String)}.
      * The class depends on the underlying logging framework (Log4J, SLF4J, <i>etc.</i>).
      *
-     * @return The type of loggers used for the implementation backend.
+     * @return the type of loggers used for the implementation backend.
      */
     public Class<L> getImplementationClass() {
         return loggerClass;
@@ -120,8 +120,8 @@ public abstract class LoggerFactory<L> {
      * framework redirects logging events to JDK logging, then this method shall return
      * {@code null} since we should not use wrapper at all.
      *
-     * @param  name The name of the logger.
-     * @return The logger as an object of the target logging framework (Log4J, SLF4J,
+     * @param  name  the name of the logger.
+     * @return the logger as an object of the target logging framework (Log4J, SLF4J,
      *         <i>etc.</i>), or {@code null} if the target framework would redirect
      *         to the JDK logging framework.
      */
@@ -130,9 +130,9 @@ public abstract class LoggerFactory<L> {
     /**
      * Wraps the specified {@linkplain #getImplementation(String) implementation} in a JDK logger.
      *
-     * @param  name The name of the logger.
-     * @param  implementation An implementation returned by {@link #getImplementation(String)}.
-     * @return A new logger wrapping the specified implementation.
+     * @param  name  the name of the logger.
+     * @param  implementation  an implementation returned by {@link #getImplementation(String)}.
+     * @return a new logger wrapping the specified implementation.
      */
     protected abstract Logger wrap(String name, L implementation);
 
@@ -141,8 +141,8 @@ public abstract class LoggerFactory<L> {
      * logger, or {@code null} if none. If the specified logger is not an instance of the expected
      * class, then this method should returns {@code null}.
      *
-     * @param  logger The logger to test.
-     * @return The implementation wrapped by the specified logger, or {@code null} if none.
+     * @param  logger  the logger to test.
+     * @return the implementation wrapped by the specified logger, or {@code null} if none.
      */
     protected abstract L unwrap(Logger logger);
 }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -134,7 +134,7 @@ public final class Logging extends Stati
     /**
      * Returns the factory used for obtaining {@link Logger} instances, or {@code null} if none.
      *
-     * @return The current logger factory, or {@code null} if none.
+     * @return the current logger factory, or {@code null} if none.
      */
     public static LoggerFactory<?> getLoggerFactory() {
         return factory;
@@ -311,7 +311,9 @@ public final class Logging extends Stati
                     }
                     final int length = paquet.length();
                     if (classname.length() > length) {
-                        // We expect '.' but we accept also '$' or end of string.
+                        /*
+                         * We expect '.' but we accept also '$' or end of string.
+                         */
                         final char separator = classname.charAt(length);
                         if (Character.isJavaIdentifierPart(separator)) {
                             continue;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -360,7 +360,7 @@ loop:   for (int i=0; ; i++) {
      * Returns the string to write on the left side of the first line of every log records, or {@code null} if none.
      * This is a string to be shown just before the level.
      *
-     * @return The string to write on the left side of the first line of every log records, or {@code null} if none.
+     * @return the string to write on the left side of the first line of every log records, or {@code null} if none.
      */
     public String getHeader() {
         final String header;
@@ -394,7 +394,7 @@ loop:   for (int i=0; ; i++) {
      * {@code org.apache.sis.util.logging.MonolineFormatter.time} property in the
      * {@code jre/lib/logging.properties} file.
      *
-     * @return The time pattern, or {@code null} if elapsed time is not formatted.
+     * @return the time pattern, or {@code null} if elapsed time is not formatted.
      */
     public String getTimeFormat() {
         synchronized (buffer) {
@@ -410,8 +410,8 @@ loop:   for (int i=0; ; i++) {
      * The {@code "HH:mm:ss.SSS"} pattern will display the elapsed time in hours, minutes, seconds
      * and milliseconds.</div>
      *
-     * @param  pattern The time pattern, or {@code null} to disable time formatting.
-     * @throws IllegalArgumentException If the given pattern is invalid.
+     * @param  pattern  the time pattern, or {@code null} to disable time formatting.
+     * @throws IllegalArgumentException if the given pattern is invalid.
      */
     public void setTimeFormat(final String pattern) throws IllegalArgumentException {
         synchronized (buffer) {
@@ -440,7 +440,7 @@ loop:   for (int i=0; ; i++) {
      * {@code org.apache.sis.util.logging.MonolineFormatter.source} property in the
      * {@code jre/lib/logging.properties} file.
      *
-     * @return The source format, or {@code null} if source is not formatted.
+     * @return the source format, or {@code null} if source is not formatted.
      */
     public String getSourceFormat() {
         synchronized (buffer) {
@@ -465,8 +465,8 @@ loop:   for (int i=0; ; i++) {
      * The source class name usually contains the logger name since (by convention) logger
      * names are package names, but this is not mandatory neither enforced.
      *
-     * @param  format The format for displaying the source, or {@code null} if the source shall not be formatted.
-     * @throws IllegalArgumentException If the given argument is not one of the recognized format names.
+     * @param  format  the format for displaying the source, or {@code null} if the source shall not be formatted.
+     * @throws IllegalArgumentException if the given argument is not one of the recognized format names.
      */
     public void setSourceFormat(final String format) throws IllegalArgumentException {
         synchronized (buffer) {
@@ -497,8 +497,8 @@ loop:   for (int i=0; ; i++) {
      * The current set of supported colors are {@code "red"}, {@code "green"}, {@code "yellow"}, {@code "blue"},
      * {@code "magenta"}, {@code "cyan"} and {@code "gray"}. This set may be extended in any future SIS version.
      *
-     * @param  level The level for which to get the color.
-     * @return The color for the given level, or {@code null} if none.
+     * @param  level  the level for which to get the color.
+     * @return the color for the given level, or {@code null} if none.
      */
     public String getLevelColor(final Level level) {
         synchronized (buffer) {
@@ -521,9 +521,9 @@ loop:   for (int i=0; ; i++) {
      * <p>The given {@code color} argument shall be one of the values documented in the
      * {@link #getLevelColor(Level)} method.</p>
      *
-     * @param  level The level for which to set a new color.
-     * @param  color The case-insensitive new color, or {@code null} if none.
-     * @throws IllegalArgumentException If the given color is not one of the recognized values.
+     * @param  level  the level for which to set a new color.
+     * @param  color  the case-insensitive new color, or {@code null} if none.
+     * @throws IllegalArgumentException if the given color is not one of the recognized values.
      */
     public void setLevelColor(final Level level, final String color) throws IllegalArgumentException {
         boolean changed = false;
@@ -620,8 +620,8 @@ loop:   for (int i=0; ; i++) {
      * Formats the given log record and return the formatted string.
      * See the <a href="#overview">class javadoc</a> for information on the log format.
      *
-     * @param  record The log record to be formatted.
-     * @return A formatted log record.
+     * @param  record  the log record to be formatted.
+     * @return a formatted log record.
      */
     @Override
     public String format(final LogRecord record) {
@@ -759,7 +759,7 @@ loop:   for (int i=0; ; i++) {
      * </ul>
      *
      * @param  record The log record from which to get a localized message.
-     * @return The localized message.
+     * @return the localized message.
      */
     @Override
     public String formatMessage(final LogRecord record) {
@@ -803,11 +803,11 @@ loop:   for (int i=0; ; i++) {
      * Prints an abridged stack trace. This method is invoked when the record is logged at
      * at low logging level (typically less than {@link Level#INFO}).
      *
-     * @param exception         The exception to be logged.
-     * @param writer            Where to print the stack trace.
-     * @param loggerName        The name of the logger when the log will be sent.
-     * @param sourceClassName   The name of the class that emitted the log.
-     * @param sourceMethodName  The name of the method that emitted the log.
+     * @param exception         the exception to be logged.
+     * @param writer            where to print the stack trace.
+     * @param loggerName        the name of the logger when the log will be sent.
+     * @param sourceClassName   the name of the class that emitted the log.
+     * @param sourceMethodName  the name of the method that emitted the log.
      */
     private static void printAbridged(Throwable exception, final Appendable writer,
             final String loggerName, final String sourceClassName, final String sourceMethodName) throws IOException
@@ -916,9 +916,9 @@ loop:   for (int i=0; ; i++) {
      * The current implementation does not check for duplicated {@code ConsoleHandler} instances,
      * and does not check if any child logger has a {@code ConsoleHandler}.</div>
      *
-     * @return The new or existing {@code MonolineFormatter}. The formatter output can be configured
+     * @return the new or existing {@code MonolineFormatter}. The formatter output can be configured
      *         using the {@link #setTimeFormat(String)} and {@link #setSourceFormat(String)} methods.
-     * @throws SecurityException If this method does not have the permission to install the formatter.
+     * @throws SecurityException if this method does not have the permission to install the formatter.
      */
     @Configuration
     public static MonolineFormatter install()  throws SecurityException {
@@ -958,11 +958,11 @@ loop:   for (int i=0; ; i++) {
      * This is mostly a convenience for temporary increase of logging verbosity for debugging purpose.
      * This functionality should not be used in production environment, since it overwrite user's level setting.
      *
-     * @param  logger The base logger to apply the change on.
-     * @param  level The desired level, or {@code null} if no level should be set.
-     * @return The new or existing {@code MonolineFormatter}. The formatter output can be configured
+     * @param  logger  the base logger to apply the change on.
+     * @param  level   the desired level, or {@code null} if no level should be set.
+     * @return the new or existing {@code MonolineFormatter}. The formatter output can be configured
      *         using the {@link #setTimeFormat(String)} and {@link #setSourceFormat(String)} methods.
-     * @throws SecurityException If this method does not have the permission to install the formatter.
+     * @throws SecurityException if this method does not have the permission to install the formatter.
      */
     @Debug
     @Configuration

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -101,9 +101,9 @@ public final class PerformanceLevel exte
     /**
      * Constructs a new logging level for monitoring performance.
      *
-     * @param name     The logging level name.
-     * @param value    The level value.
-     * @param duration The minimal duration (in nanoseconds) for logging a record.
+     * @param name      the logging level name.
+     * @param value     the level value.
+     * @param duration  the minimal duration (in nanoseconds) for logging a record.
      */
     private PerformanceLevel(final String name, final int value, final long duration) {
         super(name, value);
@@ -113,9 +113,9 @@ public final class PerformanceLevel exte
     /**
      * Returns the level to use for logging an event of the given duration.
      *
-     * @param  duration The event duration.
-     * @param  unit The unit of the given duration value.
-     * @return The level to use for logging an event of the given duration.
+     * @param  duration  the event duration.
+     * @param  unit      the unit of the given duration value.
+     * @return the level to use for logging an event of the given duration.
      */
     public static PerformanceLevel forDuration(long duration, final TimeUnit unit) {
         duration = unit.toNanos(duration);
@@ -129,8 +129,8 @@ public final class PerformanceLevel exte
     /**
      * Returns the minimal duration for logging an event at this level.
      *
-     * @param  unit The unit in which to express the minimal duration.
-     * @return The minimal duration in the given unit.
+     * @param  unit  the unit in which to express the minimal duration.
+     * @return the minimal duration in the given unit.
      */
     public long getMinDuration(final TimeUnit unit) {
         return unit.convert(minDuration, TimeUnit.NANOSECONDS);
@@ -152,9 +152,9 @@ public final class PerformanceLevel exte
      * However invoking this method on the {@code PERFORMANCE} field will ensure that every
      * {@code SLOW*} levels will have at least the given duration.</div>
      *
-     * @param  duration The minimal duration.
-     * @param  unit The unit of the given duration value.
-     * @throws IllegalArgumentException If the given duration is negative.
+     * @param  duration  the minimal duration.
+     * @param  unit      the unit of the given duration value.
+     * @throws IllegalArgumentException if the given duration is negative.
      */
     @Configuration
     @SuppressWarnings("fallthrough")

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -34,7 +34,7 @@ import java.util.logging.LogRecord;
  * The difference between using this listener or configuring the logging {@link java.util.logging.Handler} is
  * that listeners allow to handle the warnings on a per-{@code DataStore} (or any other emitter) instance.
  *
- * @param <S> The base type of objects that emit warnings (the <cite>source</cite>).
+ * @param  <S>  the base type of objects that emit warnings (the <cite>source</cite>).
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -50,7 +50,7 @@ public interface WarningListener<S> exte
      * This is typically, but not necessarily, the class having the name returned by
      * {@link LogRecord#getSourceClassName()}, or one of its parent classes.
      *
-     * @return The base type of objects that emit warnings (the <cite>source</cite>).
+     * @return the base type of objects that emit warnings (the <cite>source</cite>).
      */
     Class<S> getSourceClass();
 
@@ -68,8 +68,8 @@ public interface WarningListener<S> exte
      * Applications do not need to log the warning, since logging will be done automatically if the emitter has
      * no registered warning listeners.</p>
      *
-     * @param source  The object that emitted a warning, or {@code null} if not available.
-     * @param warning The warning message together with programmatic information.
+     * @param source   the object that emitted a warning, or {@code null} if not available.
+     * @param warning  the warning message together with programmatic information.
      */
     void warningOccured(S source, LogRecord warning);
 }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -280,8 +280,10 @@ public class IndexedResourceBundle exten
                  * differ from its parent in the way dates and numbers are formatted.
                  */
                 if (resources == null) {
-                    // If we get a NullPointerException or ClassCastException here,
-                    // it would be a bug in the way we create the chain of parents.
+                    /*
+                     * If we get a NullPointerException or ClassCastException here,
+                     * it would be a bug in the way we create the chain of parents.
+                     */
                     values = ((IndexedResourceBundle) parent).ensureLoaded(key);
                 } else {
                     /*
@@ -349,7 +351,9 @@ public class IndexedResourceBundle exten
      */
     @Override
     protected final Object handleGetObject(final String key) {
-        // Synchronization performed by 'ensureLoaded'
+        /*
+         * Note: Synchronization is performed by 'ensureLoaded'
+         */
         final String[] values = ensureLoaded(key);
         int keyID;
         try {
@@ -416,8 +420,10 @@ public class IndexedResourceBundle exten
             } else if (element instanceof ControlledVocabulary) {
                 replacement = Types.getCodeTitle((ControlledVocabulary) element).toString(getLocale());
             }
-            // No need to check for Numbers or Dates instances, since they are
-            // properly formatted in the ResourceBundle locale by MessageFormat.
+            /*
+             * No need to check for Numbers or Dates instances, since they are
+             * properly formatted in the ResourceBundle locale by MessageFormat.
+             */
             if (replacement != element) {
                 if (array == arguments) {
                     array = array.clone();                  // Protect the user-provided array from change.
@@ -462,7 +468,7 @@ public class IndexedResourceBundle exten
      * A space may or may not be added before ":", depending on the locale.
      * No space is added after the string; it is up to the caller to add such space if needed.
      *
-     * @param  key The key for the desired string.
+     * @param  key  the key for the desired string.
      * @return the string for the given key.
      * @throws MissingResourceException if no object for the given key can be found.
      */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -97,7 +97,7 @@ final class Loader extends ResourceBundl
         try {
             classe = Class.forName(baseName, true, loader);
         } catch (ClassNotFoundException e) {
-            return null; // This is the expected behavior as of Control.newBundle contract.
+            return null;        // This is the expected behavior as of Control.newBundle contract.
         }
         /*
          * Gets the filename relative to the class we created, since we assumes that UTF files

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java [UTF-8] Wed Jan 18 06:31:07 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/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=1779293&r1=1779292&r2=1779293&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] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java [UTF-8] Wed Jan 18 06:31:07 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] Wed Jan 18 06:31:07 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



Mime
View raw message