From 524d9d8e71aa74bf0883dbc82f03d25c980a7c10 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 25 Mar 2016 10:11:45 -0600
Subject: [PATCH] build.xml cleaning
---
build.xml | 7 ++++---
src/org/opensha2/calc/CalcConfig.java | 6 ++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 84ea539f8..cbc260939 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 e6aa3f5cb..49f66ad85 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;
--
GitLab