Displaying differences for changeset
 
display as  

nbproject/project.properties

@@ -1,94 +1,94 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-build.classes.excludes=**/*.java,**/*.form
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-build.web.dir=${build.dir}/web
-build.web.excludes=${build.classes.excludes}
-client.urlPart=
-compile.jsps=false
-conf.dir=${source.root}/conf
-debug.classpath=${build.classes.dir}:${javac.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-display.browser=false
-dist.dir=dist
-dist.ear.war=${dist.dir}/${war.ear.name}
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.war=${dist.dir}/${war.name}
-endorsed.classpath=\
-    ${libs.javaee-endorsed-api-6.0.classpath}
-excludes=
-file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
-file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.jar
-file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
-file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
-includes=**
-j2ee.compile.on.save=true
-j2ee.copy.static.files.on.save=true
-j2ee.deploy.on.save=true
-j2ee.platform=1.6-web
-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.1.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/sqljdbc4.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-spdy.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
-j2ee.server.type=Tomcat
-jar.compress=false
-javac.classpath=\
-    ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${reference.csip-core.jar}:\
-    ${file.reference.commons-math-2.0.jar}:\
-    ${file.reference.Jama-1.0.2.jar}:\
-    ${file.reference.jcommon-1.0.16.jar}:\
-    ${file.reference.jfreechart-1.0.13.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.debug=true
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.preview=true
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-persistence.xml.dir=${conf.dir}
-platform.active=default_platform
-project.csip-core=../csip-core
-reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
-resource.dir=setup
-rest.config.type=ide
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
-source.encoding=UTF-8
-source.root=src
-src.dir=${source.root}/java
-test.src.dir=test
-war.content.additional=
-war.ear.name=${war.name}
-war.name=csip-cfa.war
-web.docbase.dir=web
-webinf.dir=web/WEB-INF
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+display.browser=false
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-6.0.classpath}
+excludes=
+file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
+file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.jar
+file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
+file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
+includes=**
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=true
+j2ee.platform=1.6-web
+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
+j2ee.server.type=Tomcat
+jar.compress=false
+javac.classpath=\
+    ${libs.CSIP-Jersey-2.16.classpath}:\
+    ${reference.csip-core.jar}:\
+    ${file.reference.commons-math-2.0.jar}:\
+    ${file.reference.Jama-1.0.2.jar}:\
+    ${file.reference.jcommon-1.0.16.jar}:\
+    ${file.reference.jfreechart-1.0.13.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.debug=true
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+project.csip-core=../csip-core
+reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
+resource.dir=setup
+rest.config.type=ide
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=${war.name}
+war.name=csip-cfa.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF

src/java/m/cfa/baseflow/guiBaseflow_Model.java

@@ -1,11 +1,11 @@
 package m.cfa.baseflow;
 
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.FlowComparator;
-import cfa.Graphing;
-import cfa.User_Data;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.FlowComparator;
+import m.cfa.Graphing;
+import m.cfa.User_Data;
 import csip.Executable;
 import java.awt.Color;
 import java.io.BufferedReader;

src/java/m/cfa/download/guiDownload_Data.java

@@ -1,8 +1,8 @@
 package m.cfa.download;
 
-import cfa.CDWR_Data;
-import cfa.STORET_Data;
-import cfa.USGS_Data;
+import m.cfa.CDWR_Data;
+import m.cfa.STORET_Data;
+import m.cfa.USGS_Data;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;

src/java/m/cfa/drought/AutoRegression.java

@@ -1,7 +1,7 @@
 package m.cfa.drought;
 
-import cfa.DoubleArray;
-import cfa.DoubleMath;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;

src/java/m/cfa/drought/guiDrought_Model.java

@@ -1,11 +1,11 @@
 package m.cfa.drought;
 
-import cfa.CircleDrawer;
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.Graphing;
-import cfa.User_Data;
+import m.cfa.CircleDrawer;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.Graphing;
+import m.cfa.User_Data;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;

src/java/m/cfa/durationcurve/guiDC_Model.java

@@ -1,11 +1,11 @@
 package m.cfa.durationcurve;
 
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.FlowStatistics;
-import cfa.Graphing;
-import cfa.User_Data;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.FlowStatistics;
+import m.cfa.Graphing;
+import m.cfa.User_Data;
 import java.awt.Color;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;

src/java/m/cfa/flood/Bulletin17B.java

@@ -1,9 +1,9 @@
 package m.cfa.flood;
 
-import cfa.CircleDrawer;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.Graphing;
+import m.cfa.CircleDrawer;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.Graphing;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.geom.Ellipse2D;

src/java/m/cfa/flood/guiFlood_Model.java

@@ -1,7 +1,7 @@
 package m.cfa.flood;
 
-import cfa.Data;
-import cfa.DoubleArray;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;

src/java/m/cfa/loadest/guiLOADEST_Model.java

@@ -1,9 +1,9 @@
 package m.cfa.loadest;
 
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.User_Data;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.User_Data;
 import csip.Executable;
 import java.io.BufferedReader;
 import java.io.File;

src/java/m/cfa/regionalfdc/guiRegionalFDC_Model.java

@@ -1,8 +1,8 @@
 package m.cfa.regionalfdc;
 
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.Graphing;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.Graphing;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Stroke;

src/java/m/cfa/stagedischarge/guiStageDischarge_Model.java

@@ -1,7 +1,7 @@
 package m.cfa.stagedischarge;
 
-import cfa.Data;
-import cfa.Graphing;
+import m.cfa.Data;
+import m.cfa.Graphing;
 import java.awt.Color;
 import java.io.File;
 import java.io.FileWriter;

src/java/m/cfa/storetservice/V1_0.java

@@ -1,6 +1,6 @@
 package m.cfa.storetservice;
 
-import cfa.STORET_Data;
+import m.cfa.STORET_Data;
 import csip.ModelDataService;
 import csip.annotations.Resource;
 import static csip.annotations.ResourceType.FILE;

src/java/m/cfa/timeseries/CDPHE_lowFlowStats.java

@@ -1,7 +1,7 @@
 package m.cfa.timeseries;
 
-import cfa.DoubleArray;
-import cfa.DoubleMath;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.ParseException;

src/java/m/cfa/timeseries/guiTimeseries_Model.java

@@ -1,11 +1,11 @@
 package m.cfa.timeseries;
 
-import cfa.FlowStatistics;
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.Graphing;
-import cfa.User_Data;
+import m.cfa.FlowStatistics;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.Graphing;
+import m.cfa.User_Data;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Paint;
@@ -518,7 +518,7 @@
         }
         
         //Write output for JHighChart timeseries for use on eRAMS
-        Arrays.sort(graphData, new cfa.DateComparator());
+        Arrays.sort(graphData, new m.cfa.DateComparator());
         doubleArray.writeTimeSeries(mainFolder, graphData, timeStep, getTimeseriesOutput().getName(), false);
         
         //Create TimeSeries graph of merged data

src/java/m/cfa/timeseries15min/gui15minTimeseries_Model.java

@@ -1,11 +1,11 @@
 package m.cfa.timeseries15min;
 
-import cfa.DateComparator;
-import cfa.Data;
-import cfa.DoubleArray;
-import cfa.DoubleMath;
-import cfa.Graphing;
-import cfa.User_Data;
+import m.cfa.DateComparator;
+import m.cfa.Data;
+import m.cfa.DoubleArray;
+import m.cfa.DoubleMath;
+import m.cfa.Graphing;
+import m.cfa.User_Data;
 import java.awt.Color;
 import java.io.File;
 import java.io.FileWriter;