You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/04/03 10:58:07 UTC
svn commit: r1789948 [2/23] - in /sis/branches/JDK7: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-console/src/test/java/org/apache/sis/console/
application/sis-console/src/test/java/org/apache/sis/test/suite/ applica...
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 3 10:57:47 2017
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1788977
-/sis/branches/JDK9:1773327-1773512
+/sis/branches/JDK8:1584960-1789941
+/sis/branches/JDK9:1773327-1789793
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/AboutCommand.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -58,8 +58,8 @@ import org.apache.sis.internal.util.X364
* See {@link org.apache.sis.console} package javadoc for more information.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class AboutCommand extends CommandRunner {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CRSCommand.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import org.opengis.referencing.crs.Coord
* CRS are considered as a kind of metadata here.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class CRSCommand extends FormattedOutputCommand {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -70,8 +70,8 @@ import org.apache.sis.util.logging.Monol
* at the Java Virtual Machine startup time. See {@linkplain org.apache.sis.console package javadoc} for more information.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
public final class Command {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/CommandRunner.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -40,8 +40,8 @@ import org.apache.sis.internal.util.X364
* then the {@link #run()} method is invoked by {@link Command#run()}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
abstract class CommandRunner {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/FormattedOutputCommand.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -54,8 +54,8 @@ import org.apache.sis.xml.XML;
* The output format is controlled by {@link OutputFormat} enumeration.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
abstract class FormattedOutputCommand extends CommandRunner {
@@ -259,7 +259,7 @@ abstract class FormattedOutputCommand ex
connector.setOption(OptionKey.TIMEZONE, timezone);
connector.setOption(OptionKey.LOCALE, locale);
connector.setOption(OptionKey.ENCODING, encoding);
- try (final DataStore store = provider.open(connector)) {
+ try (DataStore store = provider.open(connector)) {
/*
* HACK: API used in this block is currently available only for GPX format,
* but we will generalize to more formats in a future Apache SIS version.
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.util.resources.Voc
* The "help" subcommand.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class HelpCommand extends CommandRunner {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -41,8 +41,8 @@ import org.apache.sis.util.resources.Voc
* The "identifier" sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class IdentifierCommand extends FormattedOutputCommand {
@@ -52,7 +52,7 @@ final class IdentifierCommand extends Fo
* <b>MAINTENANCE NOTE:</b> if this enumeration is modified,
* update {@code IdentifierState.properties} accordingly.
*/
- private static enum State {
+ private enum State {
VALID(" "), APPROXIMATIVE("~ "), AXIS_ORDER("! "), MISMATCH("!! "), UNKNOWN("? ");
/** The string representation. */ final String text;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -21,8 +21,8 @@ package org.apache.sis.console;
* Thrown when a unknown command has been given by the user on the command-line.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public class InvalidCommandException extends Exception {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/InvalidOptionException.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -21,8 +21,8 @@ package org.apache.sis.console;
* Thrown when an illegal option has been given by the user on the command-line.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public class InvalidOptionException extends Exception {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.metadata.iso.Defau
* The "metadata" sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class MetadataCommand extends FormattedOutputCommand {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -38,12 +38,13 @@ import org.apache.sis.util.CharSequences
* }
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.8
- * @module
*
* @see Files#probeContentType(Path)
* @see DataStores#probeContentType(Object)
+ *
+ * @since 0.4
+ * @module
*/
final class MimeTypeCommand extends CommandRunner {
/**
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -24,8 +24,8 @@ import org.apache.sis.util.resources.Err
* A command-line option.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
enum Option {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/OutputFormat.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -24,11 +24,12 @@ import org.apache.sis.storage.DataStoreP
* The output format specified by the user as an option.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
- * @module
*
* @see FormattedOutputCommand
+ *
+ * @since 0.8
+ * @module
*/
enum OutputFormat {
/**
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -51,8 +51,8 @@ import static org.apache.sis.internal.ut
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
@Fallback
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -79,8 +79,8 @@ import org.apache.sis.util.CharSequences
* The output is a comma separated values (CSV) file, with {@code '#'} as the first character of comment lines.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
* @module
*/
final class TransformCommand extends FormattedOutputCommand {
Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -47,8 +47,8 @@
* and Management Using JMX Technology</a> page.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
package org.apache.sis.console;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import static org.apache.sis.test.TestUt
* Tests the {@link AboutCommand} sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.4
+ * @since 0.3
* @module
*/
@DependsOn(CommandRunnerTest.class)
Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/CRSCommandTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -28,8 +28,8 @@ import static org.junit.Assert.*;
* Tests the {@link CRSCommand} sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
@DependsOn(CommandRunnerTest.class)
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -33,8 +33,8 @@ import static org.apache.sis.test.TestUt
* Tests the {@link CommandRunner} base class.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public final strictfp class CommandRunnerTest extends TestCase {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -28,8 +28,8 @@ import static org.junit.Assert.*;
* Tests the {@link HelpCommand} sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
@DependsOn(CommandRunnerTest.class)
Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MetadataCommandTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import static org.junit.Assert.*;
* Tests the {@link MetadataCommand} sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
@DependsOn(CommandRunnerTest.class)
Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import static org.junit.Assert.*;
* Tests the {@link MimeTypeCommand} sub-command.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.8
+ * @since 0.4
* @module
*/
@DependsOn(CommandRunnerTest.class)
Modified: sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/test/java/org/apache/sis/test/suite/ConsoleTestSuite.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.junit.BeforeClass;
* All tests from the {@code sis-console} module, in approximative dependency order.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
@Suite.SuiteClasses({
Modified: sis/branches/JDK7/application/sis-javafx/src/main/java/org/apache/sis/gui/ClientApplication.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-javafx/src/main/java/org/apache/sis/gui/ClientApplication.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-javafx/src/main/java/org/apache/sis/gui/ClientApplication.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-javafx/src/main/java/org/apache/sis/gui/ClientApplication.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -24,8 +24,8 @@ import javafx.stage.Stage;
* The starting point of SIS application for JavaFX.
*
* @author Roshan Lakmal
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public class ClientApplication extends Application {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/AnglePattern.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -37,8 +37,8 @@ import org.apache.sis.util.collection.Ca
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
final class AnglePattern {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CacheKey.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,11 +26,12 @@ import java.util.Objects;
/**
* Key of cached results.
*
- * @param <T> the type of cached values.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ *
+ * @param <T> the type of cached values.
+ *
+ * @since 0.8
* @module
*/
final class CacheKey<T> {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/CalcAddins.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -36,8 +36,8 @@ import org.apache.sis.util.logging.Loggi
* Base class for methods to export as formulas in the Apache OpenOffice spread sheet.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public abstract class CalcAddins extends WeakBase implements XServiceName, XServiceInfo, XLocalizable {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/ReferencingFunctions.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -51,8 +51,8 @@ import org.apache.sis.storage.DataStoreE
*
* @author Richard Deplanque (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public class ReferencingFunctions extends CalcAddins implements XReferencing {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Registration.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -46,8 +46,8 @@ import com.sun.star.registry.XRegistryKe
* which is the work of this {@code Registration} class.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public final class Registration implements FilenameFilter {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/Transformer.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -39,8 +39,8 @@ import org.apache.sis.storage.DataStoreE
* Applies a coordinate transformation between two CRS.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
final class Transformer {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/XReferencing.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -32,8 +32,8 @@ import com.sun.star.lang.IllegalArgument
* See {@code application/sis-openoffice/src/main/unopkg/build-instruction.html} for more information.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public interface XReferencing extends XInterface {
Modified: sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/main/java/org/apache/sis/openoffice/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@
* See {@code application/sis-openoffice/src/main/unopkg/build-instruction.html} for more information.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
package org.apache.sis.openoffice;
Modified: sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/ReferencingFunctionsTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -33,8 +33,8 @@ import static org.junit.Assume.assumeFal
* Tests {@link ReferencingFunctions}.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
@DependsOn(TransformerTest.class)
Modified: sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/openoffice/TransformerTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import static org.junit.Assume.assumeTru
* Tests {@link Transformer}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public final strictfp class TransformerTest extends TestCase {
Modified: sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-openoffice/src/test/java/org/apache/sis/test/suite/OpenOfficeTestSuite.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.junit.BeforeClass;
* All tests from the {@code sis-openoffice} add-ins, in approximative dependency order.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
@Suite.SuiteClasses({
Modified: sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/GeoRSSData.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -106,7 +106,7 @@ public class GeoRSSData implements QuadT
*/
public void saveToFile(Item item, GeoRSSModule geoRSSModule,
String directory) {
- if(!new File(directory).exists()) new File(directory).mkdirs();
+ if (!new File(directory).exists()) new File(directory).mkdirs();
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(directory
+ filename));
Modified: sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,7 +30,9 @@ import org.apache.sis.geometry.DirectPos
* Class to reload the quad tree index from file.
*
*/
-public class QuadTreeReader {
+public final class QuadTreeReader {
+ private QuadTreeReader() {
+ }
/**
* Loads the quad tree index from file.
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -64,8 +64,8 @@ import static org.apache.sis.internal.bo
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
*/
public final class Assembler {
/**
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -18,11 +18,11 @@ package org.apache.sis.internal.book;
/**
- * Throws when an error is found in the content of the HTML files used for building the developer guide.
+ * Thrown when an error is found in the content of the HTML files used for building the developer guide.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
*/
@SuppressWarnings("serial")
public class BookException extends Exception {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -39,8 +39,8 @@ import org.w3c.dom.NodeList;
* standard, in GeoAPI or in Apache SIS.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
public final class CodeColorizer {
@@ -75,7 +75,7 @@ public final class CodeColorizer {
/**
* The specifier of an identifier.
*/
- private static enum Specifier {
+ private enum Specifier {
OGC("OGC"), GEOAPI("GeoAPI"), SIS("SIS"), XML_PREFIX(null);
/** The value to put in the {@code class} attribute of {@code <code>} or elements, or {@code null} if none. */
@@ -113,7 +113,7 @@ public final class CodeColorizer {
if (in == null) {
throw new FileNotFoundException(filename);
}
- try (final BufferedReader r = new BufferedReader(new InputStreamReader(in, "UTF-8"))) {
+ try (BufferedReader r = new BufferedReader(new InputStreamReader(in, "UTF-8"))) {
String line;
while ((line = r.readLine()) != null) {
if (identifierSpecifiers.put(line, specifier) != null) {
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -23,10 +23,21 @@ import java.util.ListResourceBundle;
* Localized resources, for internal usage only.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
*/
public class Resources extends ListResourceBundle {
+ /**
+ * Invoked by resource bundle reflection mechanism.
+ */
+ public Resources() {
+ }
+
+ /**
+ * Returns resources as pair of key-value.
+ *
+ * @return an array of key-value pairs.
+ */
@Override
protected Object[][] getContents() {
return new Object[][] {
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_en.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_en.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_en.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_en.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -21,8 +21,13 @@ package org.apache.sis.internal.book;
* Localized resources, for internal usage only.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
*/
public final class Resources_en extends Resources {
+ /**
+ * Invoked by resource bundle reflection mechanism.
+ */
+ public Resources_en() {
+ }
}
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -21,10 +21,21 @@ package org.apache.sis.internal.book;
* Localized resources, for internal usage only.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
*/
public final class Resources_fr extends Resources {
+ /**
+ * Invoked by resource bundle reflection mechanism.
+ */
+ public Resources_fr() {
+ }
+
+ /**
+ * Returns resources as pair of key-value.
+ *
+ * @return an array of key-value pairs.
+ */
@Override
protected Object[][] getContents() {
final Object[][] resources = super.getContents();
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -24,7 +24,7 @@
* Other classes are helper classes that should be ignored.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
*/
package org.apache.sis.internal.book;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -51,8 +51,8 @@ import com.sun.tools.doclets.formats.htm
* <p>This class presumes that all CSS files are encoded in UTF-8.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.7
+ * @since 0.5
* @module
*/
public final class Doclet extends HtmlDoclet {
@@ -77,6 +77,12 @@ public final class Doclet extends HtmlDo
private static final String ENCODING = "UTF-8";
/**
+ * Invoked by reflection for creating the doclet.
+ */
+ public Doclet() {
+ }
+
+ /**
* Invoked by Javadoc for starting the doclet.
*
* @param root the root document.
@@ -164,8 +170,8 @@ public final class Doclet extends HtmlDo
* Copy the standard CSS file, skipping the import of DejaVu font
* since our custom CSS file does not use it.
*/
- try (final BufferedReader in = openReader(stylesheetFile);
- final BufferedWriter out = openWriter(standardFile))
+ try (BufferedReader in = openReader(stylesheetFile);
+ BufferedWriter out = openWriter(standardFile))
{
String line;
while ((line = in.readLine()) != null) {
@@ -179,8 +185,8 @@ public final class Doclet extends HtmlDo
/*
* Copy the custom CSS file, skipping comments for more compact file.
*/
- try (final BufferedReader in = openReader(inputFile);
- final BufferedWriter out = openWriter(stylesheetFile))
+ try (BufferedReader in = openReader(inputFile);
+ BufferedWriter out = openWriter(stylesheetFile))
{
String line;
while ((line = in.readLine()) != null) {
@@ -223,8 +229,8 @@ public final class Doclet extends HtmlDo
*/
final byte[] buffer = new byte[4096];
for (final File input : inputFiles) {
- try (final FileInputStream in = new FileInputStream(input);
- final FileOutputStream out = new FileOutputStream(new File(outputDirectory, input.getName())))
+ try (FileInputStream in = new FileInputStream(input);
+ FileOutputStream out = new FileOutputStream(new File(outputDirectory, input.getName())))
{
int c;
while ((c = in.read(buffer)) >= 0) {
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Rewriter.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -42,8 +42,8 @@ import java.io.Writer;
* We may revisit when JDK 9 become available, if their new standard doclet API is public.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
final class Rewriter {
@@ -123,7 +123,7 @@ final class Rewriter {
modified = false;
this.file = file;
content.setLength(0);
- try (final Reader in = new InputStreamReader(new FileInputStream(file), ENCODING)) {
+ try (Reader in = new InputStreamReader(new FileInputStream(file), ENCODING)) {
int n;
while ((n = in.read(buffer)) >= 0) {
content.append(buffer, 0, n);
@@ -137,7 +137,7 @@ final class Rewriter {
*/
private void save() throws IOException {
if (modified) {
- try (final Writer out = new OutputStreamWriter(new FileOutputStream(file), ENCODING)) {
+ try (Writer out = new OutputStreamWriter(new FileOutputStream(file), ENCODING)) {
out.append(content);
}
}
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -20,8 +20,8 @@
* Doclet performing post-processing after Javadoc generation.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.7
+ * @since 0.5
* @module
*/
package org.apache.sis.internal.doclet;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -48,8 +48,8 @@ import static org.apache.sis.internal.ma
* file for more information.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.7
+ * @since 0.4
* @module
*/
@Mojo(name = "dist", defaultPhase = LifecyclePhase.INSTALL)
@@ -68,6 +68,12 @@ public class Assembler extends AbstractM
private String rootDirectory;
/**
+ * Invoked by reflection for creating the MOJO.
+ */
+ public Assembler() {
+ }
+
+ /**
* Creates the distribution file.
*
* @throws MojoExecutionException if the plugin execution failed.
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/BundleCreator.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -42,8 +42,8 @@ import static org.apache.sis.internal.ma
* file for more information.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
@Mojo(name = "pack", defaultPhase = LifecyclePhase.INSTALL)
@@ -62,6 +62,12 @@ public class BundleCreator extends Abstr
private String rootDirectory;
/**
+ * Invoked by reflection for creating the MOJO.
+ */
+ public BundleCreator() {
+ }
+
+ /**
* Creates the Pack200 file from the JAR files collected in the "<code>target/binaries</code>" directory.
*
* @throws MojoExecutionException if the plugin execution failed.
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -28,8 +28,8 @@ import java.io.IOException;
* and Pack200 bundle</cite> section in the <code>src/site/apt/index.apt</code> file.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.4
+ * @since 0.4
* @module
*/
final class Filenames {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -47,8 +47,8 @@ import static org.apache.sis.internal.ma
* creates a "{@code target/binaries/content.txt}" file listing the dependencies.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
@Mojo(name = "collect-jars",
@@ -69,6 +69,12 @@ public final class JarCollector extends
private String rootDirectory;
/**
+ * Invoked by reflection for creating the MOJO.
+ */
+ public JarCollector() {
+ }
+
+ /**
* Copies the {@code *.jar} files to the collect directory.
*
* @throws MojoExecutionException if the plugin execution failed.
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -29,8 +29,8 @@ import java.io.InputStream;
* Those files will be open in read-only mode.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
final class PackInput implements Closeable {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ import static org.apache.sis.internal.ma
* A JAR file to be created for output by {@link Packer}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.4
+ * @since 0.3
* @module
*/
final class PackOutput implements Closeable {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import static org.apache.sis.internal.ma
* or listed in the {@code target/binaries/content.txt} file.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.4
+ * @since 0.3
* @module
*/
final class Packer implements FilenameFilter {
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -21,8 +21,8 @@
* for building Apache SIS. See the Maven-generated module description for more information.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
package org.apache.sis.internal.maven;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -36,8 +36,8 @@ import com.sun.tools.doclets.Taglet;
* just before the parts to copy in the javadoc.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class Include extends InlineTaglet {
@@ -97,7 +97,7 @@ public final class Include extends Inlin
file = new File(file.getParentFile(), reference.substring(0, sep));
final String anchor = reference.substring(sep + 1);
final StringBuilder buffer = new StringBuilder();
- try (final BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"))) {
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"))) {
/*
* Search the anchor.
*/
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -28,8 +28,8 @@ import com.sun.tools.doclets.formats.htm
* Base class of inline taglets.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
abstract class InlineTaglet implements Taglet {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import com.sun.tools.doclets.Taglet;
* The <code>@module</code> tag. This tag expects no argument.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.3
* @version 0.4
+ * @since 0.3
* @module
*/
public final class Module implements Taglet {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import org.apache.sis.internal.book.Code
* we can't use that character directly inside this taglet.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public final class Preformat extends InlineTaglet {
@@ -44,7 +44,7 @@ public final class Preformat extends Inl
* conform to the Java convention for enumeration constants, because we will use {@link Enum#name()}
* for getting the string to look for after {@code preformat}.
*/
- private static enum Style {
+ private enum Style {
java, math, wkt, xml, sql, shell, text
}
@@ -173,7 +173,7 @@ all: while (tk.hasMoreTokens()) {
* Adds syntactic coloration for the given line.
*/
private static void colorJava(final String line, final StringBuilder buffer) {
- char quote = 0; // The kind of quoting in progress (" or ').
+ char quote = 0; // The kind of quoting in progress (" or ').
final int length = line.length();
for (int i=0; i<length; i++) {
final char c = line.charAt(i);
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -20,8 +20,8 @@
* Javadoc taglets for processing custom tags in SIS source code comments.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
package org.apache.sis.internal.taglet;
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/FilteredJarFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/FilteredJarFile.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/FilteredJarFile.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/FilteredJarFile.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -40,8 +40,8 @@ import java.io.ByteArrayInputStream;
* in {@literal "SHA1 digest error for <JAR file>"} error messages.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
final class FilteredJarFile extends JarFile {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -39,8 +39,8 @@ import org.codehaus.plexus.util.FileUtil
* by {@code javac}), which is why the usual Maven resources mechanism doesn't fit.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
@Mojo(name = "javamaker", defaultPhase = LifecyclePhase.PROCESS_CLASSES)
@@ -58,6 +58,12 @@ public final class JavaMaker extends Abs
private String outputDirectory;
/**
+ * Invoked by reflection for creating the MOJO.
+ */
+ public JavaMaker() {
+ }
+
+ /**
* Copies the {@code .class} files generated by OpenOffice.
*
* @throws MojoExecutionException if the plugin execution failed.
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -39,8 +39,8 @@ import static java.util.jar.Pack200.Pack
* Creates an {@code .oxt} package for <a href="http://www.openoffice.org">OpenOffice.org</a> addins.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
@Mojo(name = "unopkg", defaultPhase = LifecyclePhase.PACKAGE)
@@ -112,6 +112,12 @@ public final class UnoPkg extends Abstra
private transient String prefixGroup;
/**
+ * Invoked by reflection for creating the MOJO.
+ */
+ public UnoPkg() {
+ }
+
+ /**
* Tests if a specified file should be included in a file list.
*
* @param directory the directory in which the file was found.
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -88,8 +88,8 @@
* }
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
package org.apache.sis.internal.unopkg;
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -32,8 +32,8 @@ import java.util.regex.Pattern;
* the command-line in a future version if this happen to be useful.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
class IndexedResourceCompiler implements FilenameFilter, Comparator<Object> {
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -23,8 +23,8 @@ import org.apache.maven.plugin.MojoExecu
* Thrown when the {@link ResourceCompilerMojo} exit abnormally.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
@SuppressWarnings("serial")
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=1789948&r1=1789947&r2=1789948&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] Mon Apr 3 10:57:47 2017
@@ -42,8 +42,8 @@ import static org.apache.sis.util.resour
*
* @author Martin Desruisseaux (Geomatys)
* @author Olivier Nouguier (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
@Mojo(name = "compile-resources", defaultPhase = LifecyclePhase.GENERATE_RESOURCES)
Modified: sis/branches/JDK7/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/test/java/org/apache/sis/util/resources/ResourceCompilerMojoTest.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import static org.junit.Assert.*;
* Tests {@link ResourceCompilerMojo}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public strictfp class ResourceCompilerMojoTest {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -48,12 +48,13 @@ import org.opengis.feature.MultiValuedPr
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
*
* @see AbstractFeature
* @see DefaultAssociationRole
+ *
+ * @since 0.5
+ * @module
*/
public abstract class AbstractAssociation extends Field<Feature> implements FeatureAssociation, Cloneable, Serializable {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -67,16 +67,17 @@ import org.opengis.feature.MultiValuedPr
* to support cloning.</li>
* </ul>
*
- * @param <V> the type of attribute values.
- *
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
+ *
+ * @param <V> the type of attribute values.
*
* @see AbstractFeature
* @see DefaultAttributeType
+ *
+ * @since 0.5
+ * @module
*/
@SuppressWarnings("CloneInNonCloneableClass") // Decision left to subclasses - see javadoc
public abstract class AbstractAttribute<V> extends Field<V> implements Attribute<V>, Serializable {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -77,11 +77,12 @@ import org.opengis.feature.Operation;
* @author Travis L. Pinney
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
*
* @see DefaultFeatureType#newInstance()
+ *
+ * @since 0.5
+ * @module
*/
public abstract class AbstractFeature implements Feature, Serializable {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ import org.opengis.feature.IdentifiedTyp
* Identification and description information inherited by property types and feature types.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
+ * @since 0.5
* @module
*/
public class AbstractIdentifiedType implements IdentifiedType, Deprecable, Serializable {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -61,11 +61,12 @@ import org.opengis.feature.Property;
* experience on this aspect of ISO 19109.</div>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.8
- * @module
*
* @see DefaultFeatureType
+ *
+ * @since 0.6
+ * @module
*/
public abstract class AbstractOperation extends AbstractIdentifiedType implements Operation {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AssociationView.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -35,8 +35,8 @@ import org.opengis.feature.FeatureAssoci
* implementation.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
class AssociationView extends PropertyView<Feature> implements FeatureAssociation {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AttributeView.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -37,8 +37,8 @@ import org.opengis.feature.AttributeType
* implementation.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
class AttributeView<V> extends PropertyView<V> implements Attribute<V> {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -36,8 +36,8 @@ import org.opengis.feature.PropertyNotFo
* This map holds only the attribute characteristics which have been explicitely set or requested.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.6
+ * @since 0.5
* @module
*/
final class CharacteristicMap extends AbstractMap<String,Attribute<?>> implements Cloneable {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -47,8 +47,8 @@ import org.apache.sis.internal.jdk8.JDK8
* amount of attribute instances.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
+ * @since 0.5
* @module
*/
final class CharacteristicTypeMap extends AbstractMap<String,AttributeType<?>> {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -53,12 +53,13 @@ import org.opengis.feature.FeatureAssoci
* Such immutable instances can be shared by many objects and passed between threads without synchronization.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
*
* @see DefaultFeatureType
* @see AbstractAssociation
+ *
+ * @since 0.5
+ * @module
*/
public class DefaultAssociationRole extends FieldType implements FeatureAssociationRole {
/**
@@ -80,7 +81,7 @@ public class DefaultAssociationRole exte
*
* @see #getTitleProperty()
*/
- private volatile transient String titleProperty;
+ private transient volatile String titleProperty;
/**
* Constructs an association to the given feature type. The properties map is given unchanged to
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -94,16 +94,17 @@ import org.opengis.feature.AttributeType
* This means that the same {@code defaultValue} instance may be shared by many {@link AbstractAttribute} instances.
* Consequently the default value should be immutable for avoiding unexpected behavior.</p>
*
- * @param <V> The type of attribute values.
- *
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
+ *
+ * @param <V> the type of attribute values.
*
* @see DefaultFeatureType
* @see AbstractAttribute
+ *
+ * @since 0.5
+ * @module
*/
public class DefaultAttributeType<V> extends FieldType implements AttributeType<V> {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -98,15 +98,16 @@ import org.opengis.feature.PropertyNotFo
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
- * @module
*
* @see DefaultAttributeType
* @see DefaultAssociationRole
* @see AbstractFeature
* @see org.apache.sis.metadata.iso.content.DefaultFeatureTypeInfo
* @see org.apache.sis.storage.FeatureNaming
+ *
+ * @since 0.5
+ * @module
*/
public class DefaultFeatureType extends AbstractIdentifiedType implements FeatureType {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,12 +38,13 @@ import org.opengis.feature.PropertyNotFo
*
* @author Martin Desruisseaux (Geomatys)
* @author Marc le Bihan
- * @since 0.5
* @version 0.6
- * @module
*
* @see SparseFeature
* @see DefaultFeatureType
+ *
+ * @since 0.5
+ * @module
*/
final class DenseFeature extends AbstractFeature implements Cloneable {
/**
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -69,8 +69,8 @@ import org.apache.sis.internal.jdk8.JDK8
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
final class EnvelopeOperation extends AbstractOperation {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -80,8 +80,8 @@ import org.apache.sis.util.Characters;
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
+ * @since 0.5
* @module
*/
public class FeatureFormat extends TabularFormat<Object> {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -106,8 +106,8 @@ import org.opengis.feature.PropertyType;
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
public final class FeatureOperations extends Static {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -45,8 +45,8 @@ import org.opengis.feature.PropertyType;
*
* @author Martin Desruisseaux (Geomatys)
* @author Johann Sorel (Geomatys)
- * @since 0.5
* @version 0.8
+ * @since 0.5
* @module
*/
public final class Features extends Static {
Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/Field.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import org.apache.sis.util.Deprecable;
* This include {@code Attribute} and {@code Association}, but not {@code Operation}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.8
+ * @since 0.5
* @module
*/
abstract class Field<V> implements Property {