diff --git a/build.xml b/build.xml index 84ea539f8479df6aca19339e1b878a1598d6f195..cbc26093912aeaac129f87b8e572f6d2ac16b03e 100644 --- a/build.xml +++ b/build.xml @@ -11,6 +11,8 @@ <property name="dist.dir" value="dist/" /> <property name="javadoc.dir" value="../nshmp-haz.gh-pages/javadoc" /> + <defaultexcludes add="**/Scratch*.java"/> + <path id="library.classpath"> <fileset dir="${lib.dir}"> <include name="**/*.jar" /> @@ -38,7 +40,6 @@ <!-- Compile to classes/ --> <javac srcdir="${src.dir}" destdir="${classes.dir}" - excludes="**/Scratch*.java" classpathref="library.classpath" nowarn="true" fork="true" @@ -64,6 +65,7 @@ <target name="javadoc"> + <defaultexcludes echo="true"/> <!-- Clean the docs directory; .git data preserved by defaultexcludes --> <delete includeEmptyDirs="true" failonerror="yes" verbose="no"> <fileset dir="${javadoc.dir}" /> @@ -82,9 +84,8 @@ docencoding="UTF-8" charset="UTF-8"> - <fileset dir="${src.dir}" defaultexcludes="yes"> + <fileset dir="${src.dir}"> <include name="**/*.java" /> - <exclude name="**/Scratch*.java" /> </fileset> <link href="http://docs.oracle.com/javase/7/docs/api/" /> diff --git a/src/org/opensha2/calc/CalcConfig.java b/src/org/opensha2/calc/CalcConfig.java index e6aa3f5cbe118fb5dccead367fc0cc4249172c37..49f66ad85a7cbbd82457d53ca9309707888ee5d9 100644 --- a/src/org/opensha2/calc/CalcConfig.java +++ b/src/org/opensha2/calc/CalcConfig.java @@ -60,10 +60,8 @@ public final class CalcConfig { private static final String DEFAULT_OUT = "curves"; /** - * The resource from which {@code this} was derived. If this configuration - * was built using {@link Builder#extend(Builder)}, this field will reflect - * the field of the extending resource. If this configuration was built only - * from {@link Builder#withDefaults()}, this field will be empty. + * The resource from which {@code this} was derived. This field may be + * empty. */ public final transient Optional<Path> resource;