Author: desruisseaux
Date: Thu Feb 5 17:34:45 2015
New Revision: 1657633
URL: http://svn.apache.org/r1657633
Log:
Do not copy stylesheet.css if the javadoc failed, in order to avoid adding an
other confusing error messages after the first one.
Typo fix in MetadataUtilities.
Modified:
sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
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=1657633&r1=1657632&r2=1657633&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] Thu Feb 5 17:34:45 2015
@@ -90,10 +90,10 @@ public final class Doclet extends HtmlDo
}
}
}
- final boolean status = HtmlDoclet.start(root);
- if (outputDirectory != null) try {
+ final boolean success = HtmlDoclet.start(root);
+ if (success && outputDirectory != null) try {
final File output = new File(outputDirectory);
- final File customCSS = customCSS(output);
+ final File customCSS = customCSS(output);
copyStylesheet(customCSS, output);
copyResources(customCSS.getParentFile(), output);
} catch (IOException e) {
@@ -103,7 +103,7 @@ public final class Doclet extends HtmlDo
root.printError(buffer.toString());
return false;
}
- return status;
+ return success;
}
/**
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1657633&r1=1657632&r2=1657633&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Feb 5 17:34:45 2015
@@ -148,7 +148,7 @@ public final class MetadataUtilities ext
}
/**
- * Formats an error message and logs it is we are (un)marshalling a
document, or return the message otherwise.
+ * Formats an error message and logs it if we are (un)marshalling a
document, or return the message otherwise.
* In the later case, it is caller's responsibility to use the message for
throwing an exception.
*
* @param classe The caller class, used only in case of warning
message to log.
