nbproject/build-impl.xml
@@ -1012,7 +1012,7 @@ |
<copyfiles files="${file.reference.jcommon-1.0.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jfreechart-1.0.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.Jama-1.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.csip-lib-water-1.0.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.csip-lib-water-1.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<mkdir dir="${build.web.dir}/META-INF"/> |
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
</target> |
@@ -1023,7 +1023,7 @@ |
<copyfiles files="${file.reference.jcommon-1.0.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jfreechart-1.0.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.Jama-1.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.csip-lib-water-1.0.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.csip-lib-water-1.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
</target> |
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
<delete dir="${build.web.dir}/WEB-INF/lib"/> |
nbproject/project.properties
@@ -1,4 +1,4 @@ |
-file.reference.csip-lib-water-1.0.6.jar=lib/csip-lib-water-1.0.6.jar |
+file.reference.csip-lib-water-1.0.8.jar=C:\\Projects\\TylerWible\\CodeDirectories\\NetBeans\\csip-groundwater\\lib\\csip-lib-water-1.0.8.jar |
file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.jar |
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
#Fri May 06 09:05:19 MDT 2016 |
@@ -54,7 +54,7 @@ |
${file.reference.jcommon-1.0.16.jar}:\ |
${file.reference.jfreechart-1.0.13.jar}:\ |
${file.reference.Jama-1.0.2.jar}:\ |
- ${file.reference.csip-lib-water-1.0.6.jar} |
+ ${file.reference.csip-lib-water-1.0.8.jar} |
javadoc.noindex=false |
webinf.dir=web/WEB-INF |
annotation.processing.enabled.in.editor=true |
nbproject/project.xml
@@ -36,7 +36,7 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-lib-water-1.0.6.jar}</file> |
+ <file>${file.reference.csip-lib-water-1.0.8.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
</web-module-libraries> |
src/java/m/cfa/durationcurve/guiDC_Model.java
@@ -3,6 +3,7 @@ |
import WaterData.WaterData; |
import WaterData.WaterDataException; |
import WaterData.WaterDataInterface; |
+import WaterData.WaterQualityInfo; |
import m.cfa.DoubleArray; |
import m.cfa.DoubleMath; |
import m.cfa.FlowStatistics; |
@@ -19,7 +20,6 @@ |
import java.text.SimpleDateFormat; |
import java.util.ArrayList; |
import java.util.Date; |
-import m.cfa.WaterQualityInfo; |
import org.codehaus.jettison.json.JSONException; |
import org.jfree.chart.ChartUtilities; |
import org.jfree.chart.JFreeChart; |
@@ -35,7 +35,7 @@ |
import org.jfree.data.xy.XYSeriesCollection; |
|
/** |
-* Last Updated: 20-June-2017 |
+* Last Updated: 21-June-2017 |
* @author Tyler Wible |
* @since 12-June-2011 |
*/ |
src/java/m/cfa/loadest/guiLOADEST_Model.java
@@ -3,6 +3,7 @@ |
import WaterData.WaterData; |
import WaterData.WaterDataException; |
import WaterData.WaterDataInterface; |
+import WaterData.WaterQualityInfo; |
import m.cfa.DoubleArray; |
import m.cfa.DoubleMath; |
import csip.Executable; |
@@ -18,11 +19,10 @@ |
import java.text.SimpleDateFormat; |
import java.util.ArrayList; |
import java.util.Date; |
-import m.cfa.WaterQualityInfo; |
import org.codehaus.jettison.json.JSONException; |
|
/** |
-* Last Updated: 20-June-2017 |
+* Last Updated: 21-June-2017 |
* @author Tyler Wible & Tyler Dell |
* @since 27-March-2013 |
*/ |
src/java/m/cfa/timeseries/guiTimeseries_Model.java
@@ -2,6 +2,7 @@ |
|
import WaterData.WaterData; |
import WaterData.WaterDataInterface; |
+import WaterData.WaterQualityInfo; |
import csip.Executable; |
import m.cfa.FlowStatistics; |
import m.cfa.DoubleArray; |
@@ -21,7 +22,6 @@ |
import java.util.ArrayList; |
import java.util.Arrays; |
import java.util.Date; |
-import m.cfa.WaterQualityInfo; |
import org.jfree.chart.ChartUtilities; |
import org.jfree.chart.JFreeChart; |
import org.jfree.chart.axis.AxisLocation; |
@@ -54,7 +54,7 @@ |
import org.jfree.ui.RectangleInsets; |
|
/** |
-* Last Updated: 20-June-2017 |
+* Last Updated: 21-June-2017 |
* @author Tyler Wible |
* @since 24-June-2011 |
*/ |