} element.
- * @param type {@code "xml"} if the element to process is XML rather than Java code.
+ * @param parent the root element where to put Java keywords in bold characters.
+ * This is typically a {@code } or {@code } element.
+ * @param type {@code "xml"} if the element to process is XML rather than Java code.
* @throws BookException if an element can not be processed.
*/
public void highlight(final Node parent, final String type) throws BookException {
final boolean isXML = "xml".equals(type);
- final boolean isJava = !isXML; // Future version may add more choices.
- Element syntaticElement = null; // E.g. comment block or a String.
- String stopCondition = null; // Identify 'syntaticElement' end.
+ final boolean isJava = !isXML; // Future version may add more choices.
+ Element syntaticElement = null; // E.g. comment block or a String.
+ String stopCondition = null; // Identify 'syntaticElement' end.
for (final Node node : toArray(parent.getChildNodes())) {
/*
* The following condition happen only if a quoted string or a comment started in a previous
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -78,7 +78,7 @@ public final class Doclet extends HtmlDo
/**
* Invoked by Javadoc for starting the doclet.
*
- * @param root The root document.
+ * @param root the root document.
* @return {@code true} on success, or {@code false} on failure.
*/
public static boolean start(final RootDoc root) {
@@ -151,9 +151,9 @@ public final class Doclet extends HtmlDo
* Copies the standard CSS file, then copies the custom CSS file.
* If the {@value #RENAMED_CSS} file already exists, it will not be overwritten.
*
- * @param inputFile The custom CSS file to copy in the destination directory.
- * @param outputDirectory The directory where to copy the CSS file.
- * @throws IOException If an error occurred while reading or writing.
+ * @param inputFile the custom CSS file to copy in the destination directory.
+ * @param outputDirectory the directory where to copy the CSS file.
+ * @throws IOException if an error occurred while reading or writing.
*/
private static void copyStylesheet(final File inputFile, final File outputDirectory) throws IOException {
final File stylesheetFile = new File(outputDirectory, STYLESHEET);
@@ -197,9 +197,9 @@ public final class Doclet extends HtmlDo
* directory can be specified with {@code }, I have been unable to make it work even
* with absolute paths.
*
- * @param inputFile The directory containing resources.
- * @param outputDirectory The directory where to copy the resource files.
- * @throws IOException If an error occurred while reading or writing.
+ * @param inputFile the directory containing resources.
+ * @param outputDirectory the directory where to copy the resource files.
+ * @throws IOException if an error occurred while reading or writing.
*/
private static void copyResources(final File inputDirectory, final File outputDirectory) throws IOException {
final File[] inputFiles = inputDirectory.listFiles((final File dir, final String name) ->
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Assembler.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -147,8 +147,8 @@ public class Assembler extends AbstractM
/**
* The filter to use for selecting the files to be included in the ZIP file.
*
- * @param directory The directory.
- * @param filename The filename.
+ * @param directory the directory.
+ * @param filename the filename.
* @return {@code true} if the given file should be included in the ZIP file.
*/
@Override
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Filenames.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -95,7 +95,7 @@ final class Filenames {
/**
* Returns the distribution directory, creating it if needed.
*
- * @param targetDirectory The {@code target} directory.
+ * @param targetDirectory the {@code target} directory.
*/
static File distributionDirectory(final File targetDirectory) throws IOException {
final File outDirectory = new File(targetDirectory, DISTRIBUTION_DIRECTORY);
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/JarCollector.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -23,6 +23,9 @@ import java.io.FileWriter;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.nio.file.FileSystemException;
import java.util.Set;
import java.util.LinkedHashSet;
import org.apache.maven.plugin.AbstractMojo;
@@ -36,11 +39,6 @@ import org.apache.maven.artifact.Artifac
import static org.apache.sis.internal.maven.Filenames.*;
-// Related to JDK7
-import java.nio.file.Path;
-import java.nio.file.Files;
-import java.nio.file.FileSystemException;
-
/**
* Collects .jar
files in a single "{@code target/binaries}" directory.
@@ -198,9 +196,9 @@ public final class JarCollector extends
* Returns the name of the given file. If the given file is a snapshot, then the
* {@code "SNAPSHOT"} will be replaced by the timestamp if possible.
*
- * @param file The file from which to get the filename.
- * @param artifact The artifact that produced the given file.
- * @return The filename to use.
+ * @param file the file from which to get the filename.
+ * @param artifact the artifact that produced the given file.
+ * @return the filename to use.
*/
private static String getFinalName(final File file, final Artifact artifact) {
String filename = file.getName();
@@ -222,8 +220,8 @@ public final class JarCollector extends
* On JDK6 or on platform that do not support links, this method rather
* updates the content.txt
file.
*
- * @param file The source file to read.
- * @param copy The destination file to create.
+ * @param file the source file to read.
+ * @param copy the destination file to create.
*/
private static void linkFileToDirectory(final File file, final File copy) throws IOException {
final Path source = file.toPath();
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackInput.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -83,7 +83,7 @@ final class PackInput implements Closeab
/**
* Opens the given JAR file in read-only mode.
*
- * @param file The file to open.
+ * @param file the file to open.
* @throws IOException if the file can't be open.
*/
PackInput(final File file) throws IOException {
@@ -104,7 +104,7 @@ final class PackInput implements Closeab
/**
* Returns the entries in the input JAR file.
*
- * @return The next entry, or {@code null} if the iteration is finished.
+ * @return the next entry, or {@code null} if the iteration is finished.
*/
JarEntry nextEntry() {
if (entries == null) {
@@ -119,7 +119,7 @@ final class PackInput implements Closeab
}
}
entry.setMethod(JarEntry.DEFLATED);
- entry.setCompressedSize(-1); // Change in method has changed the compression size.
+ entry.setCompressedSize(-1); // Change in method has changed the compression size.
return entry;
}
return entry = null;
@@ -150,9 +150,9 @@ final class PackInput implements Closeab
* Returns the input stream for the entry of the given name. This method must be invoked
* before the first call to {@link #nextEntry}. Each entry can be requested only once.
*
- * @param name The name of the entry
- * @return The input stream for the requested entry, or {@code null} if none.
- * @throws IOException If the entry can not be read.
+ * @param name the name of the entry
+ * @return the input stream for the requested entry, or {@code null} if none.
+ * @throws IOException if the entry can not be read.
* @throws IllegalStateException Programming error (pre-condition violated).
*/
InputStream getInputStream(final String name) throws IOException {
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/PackOutput.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -98,8 +98,8 @@ final class PackOutput implements Closea
/**
* Creates an output jar.
*
- * @param inputJARs The input JAR filenames together with their {@code PackInput} helpers.
- * @param outputJAR The output JAR filename.
+ * @param inputJARs the input JAR filenames together with their {@code PackInput} helpers.
+ * @param outputJAR the output JAR filename.
*/
PackOutput(final Map inputJARs, final File outputJAR) {
this.inputJARs = inputJARs;
@@ -117,8 +117,8 @@ final class PackOutput implements Closea
/**
* Opens the given JAR file for writing and creates its manifest.
*
- * @param projectName The project name, or {@code null} if none.
- * @param version The project version, or {@code null} if none.
+ * @param projectName the project name, or {@code null} if none.
+ * @param version the project version, or {@code null} if none.
* @throws IOException if the file can't be open.
*/
void open(final String projectName, final String version) throws IOException {
@@ -249,9 +249,9 @@ final class PackOutput implements Closea
* Copies fully the given input stream to the given destination.
* The given input stream is closed after the copy.
*
- * @param in The input stream from which to get the the content to copy.
- * @param buffer Temporary buffer to reuse at each method call.
- * @throws IOException If an error occurred during the copy.
+ * @param in the input stream from which to get the the content to copy.
+ * @param buffer temporary buffer to reuse at each method call.
+ * @throws IOException if an error occurred during the copy.
*/
void copy(final InputStream in, final byte[] buffer) throws IOException {
int n;
@@ -309,7 +309,7 @@ final class PackOutput implements Closea
/**
* Creates a Pack200 file from the output JAR, then delete the JAR.
*
- * @param out Where to write the Pack200. This stream will be closed by this method.
+ * @param out where to write the Pack200. This stream will be closed by this method.
* @throws IOException if an error occurred while packing the JAR.
*/
void pack(final OutputStream out) throws IOException {
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/maven/Packer.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -58,9 +58,9 @@ final class Packer implements FilenameFi
/**
* Creates a packer.
*
- * @param projectName The project name to declare in the manifest file, or {@code null} if none.
- * @param version The project version to declare in the manifest file, or {@code null} if none.
- * @param targetDirectory The Maven target directory.
+ * @param projectName the project name to declare in the manifest file, or {@code null} if none.
+ * @param version the project version to declare in the manifest file, or {@code null} if none.
+ * @param targetDirectory the Maven target directory.
* @throws FileNotFoundException if the {@code target/binaries} directory is not found.
*/
Packer(final String projectName, final String version, final File targetDirectory) throws FileNotFoundException {
@@ -76,8 +76,8 @@ final class Packer implements FilenameFi
/**
* Filter the input JAR files. This is for internal usage by {@link #createOutputJAR(String)} only.
*
- * @param directory The directory (ignored).
- * @param name The filename.
+ * @param directory the directory (ignored).
+ * @param name the filename.
* @return {@code true} if the given filename ends with {@code ".jar"}.
*/
@Override
@@ -115,8 +115,8 @@ final class Packer implements FilenameFi
*
* Callers needs to invoke one of the {@code PackOutput.pack(…)} methods on the returned object.
*
- * @param outputJAR The name of the JAR file to create before the Pack200 creation.
- * @throws IOException If an error occurred while collecting the target directory content.
+ * @param outputJAR the name of the JAR file to create before the Pack200 creation.
+ * @throws IOException if an error occurred while collecting the target directory content.
*/
PackOutput preparePack200(final String outputJAR) throws IOException {
/*
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Include.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -54,7 +54,7 @@ public final class Include extends Inlin
/**
* Register this taglet.
*
- * @param tagletMap the map to register this tag to.
+ * @param tagletMap the map to register this tag to.
*/
public static void register(final Map tagletMap) {
final Include tag = new Include();
@@ -71,7 +71,7 @@ public final class Include extends Inlin
/**
* Returns the name of this custom tag.
*
- * @return The tag name.
+ * @return the tag name.
*/
@Override
public String getName() {
@@ -81,8 +81,8 @@ public final class Include extends Inlin
/**
* Given the Tag
representation of this custom tag, return its string representation.
*
- * @param tag The tag to format.
- * @return A string representation of the given tag.
+ * @param tag the tag to format.
+ * @return a string representation of the given tag.
*/
@Override
public String toString(final Tag tag) {
@@ -122,7 +122,7 @@ public final class Include extends Inlin
}
start = line.indexOf(ANCHOR_START);
if (start >= 0 && line.lastIndexOf(ANCHOR_END) >= start) {
- break; // Found the next section - stop this one.
+ break; // Found the next section - stop this one.
}
if (line.contains(DOCUMENT_END)) {
break;
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -57,7 +57,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since SIS taglets can be used in overview.
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inOverview() {
@@ -67,7 +67,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since SIS taglets can be used in package documentation.
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inPackage() {
@@ -78,7 +78,7 @@ abstract class InlineTaglet implements T
* Returns {@code true} since SIS taglets can be used in type documentation
* (classes or interfaces).
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inType() {
@@ -88,7 +88,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since SIS taglets can be used in constructor
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inConstructor() {
@@ -98,7 +98,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since SIS taglets can be used in method documentation.
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inMethod() {
@@ -108,7 +108,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since SIS taglets can be used in field documentation.
*
- * @return Default to {@code true}.
+ * @return default to {@code true}.
*/
@Override
public boolean inField() {
@@ -118,7 +118,7 @@ abstract class InlineTaglet implements T
/**
* Returns {@code true} since this base class is all about inline tags.
*
- * @return Always {@code true}.
+ * @return always {@code true}.
*/
@Override
public final boolean isInlineTag() {
@@ -130,8 +130,8 @@ abstract class InlineTaglet implements T
* representation. This method should not be called since arrays of inline tags do
* not exist. However we define it as a matter of principle.
*
- * @param tags The tags to format.
- * @return A string representation of the given tags.
+ * @param tags the tags to format.
+ * @return a string representation of the given tags.
*/
@Override
public final String toString(final Tag[] tags) {
@@ -145,6 +145,7 @@ abstract class InlineTaglet implements T
/**
* Prints a warning message.
*/
+ @SuppressWarnings("UseOfSystemOutOrSystemErr")
static void printWarning(final SourcePosition position, final String message) {
final RootDoc root = getRootDoc();
if (root != null) {
@@ -157,6 +158,7 @@ abstract class InlineTaglet implements T
/**
* Prints an error message.
*/
+ @SuppressWarnings("UseOfSystemOutOrSystemErr")
static void printError(final SourcePosition position, final String message) {
final RootDoc root = getRootDoc();
if (root != null) {
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -34,7 +34,7 @@ public final class Module implements Tag
/**
* Register this taglet.
*
- * @param tagletMap the map to register this tag to.
+ * @param tagletMap the map to register this tag to.
*/
public static void register(final Map tagletMap) {
final Module tag = new Module();
@@ -56,7 +56,7 @@ public final class Module implements Tag
/**
* Returns the name of this custom tag.
*
- * @return The tag name.
+ * @return the tag name.
*/
@Override
public String getName() {
@@ -66,7 +66,7 @@ public final class Module implements Tag
/**
* Returns {@code false} since @module
can not be used in overview.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean inOverview() {
@@ -76,7 +76,7 @@ public final class Module implements Tag
/**
* Returns {@code true} since @module
can be used in package documentation.
*
- * @return Always {@code true}.
+ * @return always {@code true}.
*/
@Override
public boolean inPackage() {
@@ -87,7 +87,7 @@ public final class Module implements Tag
* Returns {@code true} since @module
can be used in type documentation
* (classes or interfaces). This is actually its main target.
*
- * @return Always {@code true}.
+ * @return always {@code true}.
*/
@Override
public boolean inType() {
@@ -97,7 +97,7 @@ public final class Module implements Tag
/**
* Returns {@code false} since @module
can not be used in constructor.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean inConstructor() {
@@ -107,7 +107,7 @@ public final class Module implements Tag
/**
* Returns {@code false} since @module
can not be used in method documentation.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean inMethod() {
@@ -117,7 +117,7 @@ public final class Module implements Tag
/**
* Returns {@code false} since @module
can not be used in field documentation.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean inField() {
@@ -127,7 +127,7 @@ public final class Module implements Tag
/**
* Returns {@code false} since @module
is not an inline tag.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean isInlineTag() {
@@ -138,8 +138,8 @@ public final class Module implements Tag
* Given the Tag
representation of this custom tag, return its string representation.
* The default implementation invokes the array variant of this method.
*
- * @param tag The tag to format.
- * @return A string representation of the given tag.
+ * @param tag the tag to format.
+ * @return a string representation of the given tag.
*/
@Override
public String toString(final Tag tag) {
@@ -150,8 +150,8 @@ public final class Module implements Tag
* Given an array of {@code Tag}s representing this custom tag, return its string
* representation.
*
- * @param tags The tags to format.
- * @return A string representation of the given tags.
+ * @param tags the tags to format.
+ * @return a string representation of the given tags.
*/
@Override
public String toString(final Tag[] tags) {
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Preformat.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -78,7 +78,7 @@ public final class Preformat extends Inl
/**
* Returns the name of this custom tag.
*
- * @return The tag name.
+ * @return the tag name.
*/
@Override
public String getName() {
@@ -88,7 +88,7 @@ public final class Preformat extends Inl
/**
* Returns {@code false} since @preformat
can not be used in overview.
*
- * @return Always {@code false}.
+ * @return always {@code false}.
*/
@Override
public boolean inOverview() {
@@ -99,7 +99,7 @@ public final class Preformat extends Inl
* Given the Tag
representation of this custom tag, return its string representation.
*
* @param tag The tag to format.
- * @return A string representation of the given tag.
+ * @return a string representation of the given tag.
*/
@Override
public String toString(final Tag tag) {
@@ -209,7 +209,7 @@ all: while (tk.hasMoreTokens()) {
}
break;
}
- case '\'': // fall through
+ case '\'': // fall through
case '"': {
quote = c;
buffer.append("").append(c);
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/JavaMaker.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -78,7 +78,7 @@ public final class JavaMaker extends Abs
* The output directory shall already exists. It should be the case if all
* sources files have been compiled before this method is invoked.
*
- * @return The number of files copied.
+ * @return the number of files copied.
*/
private static int copyClasses(final File sourceDirectory,
final File outputDirectory) throws IOException
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/unopkg/UnoPkg.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -114,8 +114,8 @@ public final class UnoPkg extends Abstra
/**
* Tests if a specified file should be included in a file list.
*
- * @param directory the directory in which the file was found.
- * @param name the name of the file.
+ * @param directory the directory in which the file was found.
+ * @param name the name of the file.
*/
@Override
public boolean accept(final File directory, final String name) {
@@ -222,7 +222,7 @@ public final class UnoPkg extends Abstra
/**
* Copies the content of the specified binary file to the specified output stream.
*
- * @param name The ZIP entry name, or {@code null} for using the name of the given file.
+ * @param name the ZIP entry name, or {@code null} for using the name of the given file.
*/
private static void copy(final File file, final ZipOutputStream out, String name) throws IOException {
if (name == null) {
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/IndexedResourceCompiler.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -127,7 +127,7 @@ class IndexedResourceCompiler implements
* @param sourceDirectory the source directory.
* @param buildDirectory the target directory where to write UTF files.
* @param resourcesToProcess the resource bundle base classes
- * (e.g. {@code org/apache/sis/util/resources/Vocabulary.java}).
+ * (e.g. {@code org/apache/sis/util/resources/Vocabulary.java}).
*/
IndexedResourceCompiler(final File sourceDirectory, final File buildDirectory, final File[] resourcesToProcess) {
this.sourceDirectory = sourceDirectory;
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerException.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -32,7 +32,7 @@ final class ResourceCompilerException ex
/**
* Creates an exception with the given detail message.
*
- * @param message The detail message.
+ * @param message the detail message.
*/
ResourceCompilerException(final String message) {
super(message);
@@ -41,7 +41,7 @@ final class ResourceCompilerException ex
/**
* Creates an exception with the given cause.
*
- * @param cause The cause of this exception.
+ * @param cause the cause of this exception.
*/
ResourceCompilerException(final Throwable cause) {
super(cause.getLocalizedMessage(), cause);
Modified: sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -155,7 +155,7 @@ public class ResourceCompilerMojo extend
private int processAllResourceDirectories(final File directory) throws ResourceCompilerException {
int errors = 0;
final File[] subdirs = directory.listFiles();
- if (subdirs != null) { // Appears to be sometime null with auto-generated sub-directories.
+ if (subdirs != null) { // Appears to be sometime null with auto-generated sub-directories.
for (final File subdir : subdirs) {
if (subdir.isDirectory()) {
File[] resourcesToProcess = subdir.listFiles(this);
@@ -222,8 +222,10 @@ public class ResourceCompilerMojo extend
break;
}
}
- // Accepts the property file only if we found at least one language.
- // Example: "Messages.properties" and "Messages_en.properties".
+ /*
+ * Accepts the property file only if we found at least one language.
+ * Example: "Messages.properties" and "Messages_en.properties".
+ */
if (i - fileIndex >= 2) {
resourcesToProcess[count++] = file;
}
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -61,7 +61,7 @@ public abstract class CodeListAdapternot copy the FRA-specific properties.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*/
public Constraints(final org.opengis.metadata.constraint.Constraints object) {
super(object);
@@ -82,7 +83,7 @@ public class Constraints extends Default
/**
* Returns the documents that specifies the nature of the constraints.
*
- * @return Citations to the current documents.
+ * @return citations to the current documents.
*/
@XmlElement(name = "citation")
public Collection getCitations() {
@@ -92,7 +93,7 @@ public class Constraints extends Default
/**
* Sets the documents that specifies the nature of the constraints.
*
- * @param newValues Citation to the new documents.
+ * @param newValues citation to the new documents.
*/
public void setCitations(final Collection extends Citation> newValues) {
citations = writeCollection(newValues, citations, Citation.class);
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -49,6 +49,7 @@ import org.apache.sis.metadata.iso.ident
* @since 0.4
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "FRA_DataIdentification_Type")
@XmlRootElement(name ="FRA_DataIdentification")
public class DataIdentification extends DefaultDataIdentification {
@@ -72,7 +73,7 @@ public class DataIdentification extends
* Constructs an instance initialized to a copy of the given object.
* This constructor does not copy the FRA-specific properties.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*/
public DataIdentification(final org.opengis.metadata.identification.DataIdentification object) {
super(object);
@@ -81,7 +82,7 @@ public class DataIdentification extends
/**
* Returns the documents at the origin of the creation of the identified resources.
*
- * @return Citations to the current documents.
+ * @return citations to the current documents.
*/
@XmlElement(name = "relatedCitation")
public Collection getRelatedCitations() {
@@ -91,7 +92,7 @@ public class DataIdentification extends
/**
* Sets the documents at the origin of the creation of the identified resources.
*
- * @param newValues Citation to the new documents.
+ * @param newValues citation to the new documents.
*/
public void setRelatedCitations(final Collection extends Citation> newValues) {
relatedCitations = writeCollection(newValues, relatedCitations, Citation.class);
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DirectReferenceSystem.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -60,7 +60,7 @@ public class DirectReferenceSystem exten
/**
* Creates a new reference system from the given one.
*
- * @param crs The reference system to partially copy.
+ * @param crs the reference system to partially copy.
*/
public DirectReferenceSystem(final ReferenceSystem crs) {
super(crs);
@@ -69,7 +69,7 @@ public class DirectReferenceSystem exten
/**
* Creates a new reference system from the given code.
*
- * @param identifier The reference system identifier.
+ * @param identifier the reference system identifier.
*/
public DirectReferenceSystem(final Identifier identifier) {
super(identifier);
@@ -78,8 +78,8 @@ public class DirectReferenceSystem exten
/**
* Compares this object with the given one for equality.
*
- * @param object The object to compare with this reference system.
- * @param mode The strictness level of the comparison.
+ * @param object the object to compare with this reference system.
+ * @param mode the strictness level of the comparison.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/IndirectReferenceSystem.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -60,7 +60,7 @@ public class IndirectReferenceSystem ext
/**
* Creates a new reference system from the given one.
*
- * @param crs The reference system to partially copy.
+ * @param crs the reference system to partially copy.
*/
public IndirectReferenceSystem(final ReferenceSystem crs) {
super(crs);
@@ -69,7 +69,7 @@ public class IndirectReferenceSystem ext
/**
* Creates a new reference system from the given code.
*
- * @param identifier The reference system identifier.
+ * @param identifier the reference system identifier.
*/
public IndirectReferenceSystem(final Identifier identifier) {
super(identifier);
@@ -78,8 +78,8 @@ public class IndirectReferenceSystem ext
/**
* Compares this object with the given one for equality.
*
- * @param object The object to compare with this reference system.
- * @param mode The strictness level of the comparison.
+ * @param object the object to compare with this reference system.
+ * @param mode the strictness level of the comparison.
* @return {@code true} if both objects are equal.
*/
@Override
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/LegalConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/LegalConstraints.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/LegalConstraints.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/LegalConstraints.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -50,6 +50,7 @@ import org.apache.sis.metadata.iso.const
* @since 0.4
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "FRA_LegalConstraints_Type")
@XmlRootElement(name="FRA_LegalConstraints")
public class LegalConstraints extends DefaultLegalConstraints {
@@ -73,7 +74,7 @@ public class LegalConstraints extends De
* Constructs an instance initialized to a copy of the given object.
* This constructor does not copy the FRA-specific properties.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*/
public LegalConstraints(final org.opengis.metadata.constraint.LegalConstraints object) {
super(object);
@@ -82,7 +83,7 @@ public class LegalConstraints extends De
/**
* Returns the documents that specifies the nature of the constraints.
*
- * @return Citations to the current documents.
+ * @return citations to the current documents.
*/
@XmlElement(name = "citation")
public Collection getCitations() {
@@ -92,7 +93,7 @@ public class LegalConstraints extends De
/**
* Sets the documents that specifies the nature of the constraints.
*
- * @param newValues Citation to the new documents.
+ * @param newValues citation to the new documents.
*/
public void setCitations(final Collection extends Citation> newValues) {
citations = writeCollection(newValues, citations, Citation.class);
Modified: sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/SecurityConstraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/SecurityConstraints.java?rev=1779788&r1=1779787&r2=1779788&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/SecurityConstraints.java [UTF-8] (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/SecurityConstraints.java [UTF-8] Sun Jan 22 10:23:03 2017
@@ -50,6 +50,7 @@ import org.apache.sis.metadata.iso.const
* @since 0.4
* @module
*/
+@SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones.
@XmlType(name = "FRA_SecurityConstraints_Type")
@XmlRootElement(name = "FRA_SecurityConstraints")
public class SecurityConstraints extends DefaultSecurityConstraints {
@@ -73,7 +74,7 @@ public class SecurityConstraints extends
* Constructs an instance initialized to a copy of the given object.
* This constructor does not copy the FRA-specific properties.
*
- * @param object The metadata to copy values from, or {@code null} if none.
+ * @param object the metadata to copy values from, or {@code null} if none.
*/
public SecurityConstraints(final org.opengis.metadata.constraint.SecurityConstraints object) {
super(object);
@@ -82,7 +83,7 @@ public class SecurityConstraints extends
/**
* Returns the documents that specifies the nature of the constraints.
*
- * @return Citations to the current documents.
+ * @return citations to the current documents.
*/
@XmlElement(name = "citation")
public Collection getCitations() {
@@ -92,7 +93,7 @@ public class SecurityConstraints extends
/**
* Sets the documents that specifies the nature of the constraints.
*
- * @param newValues Citation to the new documents.
+ * @param newValues citation to the new documents.
*/
public void setCitations(final Collection extends Citation> newValues) {
citations = writeCollection(newValues, citations, Citation.class);