Displaying differences for changeset
 
display as  

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-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.csip-lib-water-2.8.1.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-2.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.csip-lib-water-2.8.1.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-2.7.1.jar=lib/csip-lib-water-2.7.1.jar
+file.reference.csip-lib-water-2.8.1.jar=lib/csip-lib-water-2.8.1.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-2.7.1.jar}
+    ${file.reference.csip-lib-water-2.8.1.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-2.7.1.jar}</file>
+                    <file>${file.reference.csip-lib-water-2.8.1.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>

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

@@ -33,7 +33,7 @@
 import org.jfree.data.time.TimeSeries;
 
 /**
- * Last Updated: 21-November-2018
+ * Last Updated: 9-April-2019
  * @author Tyler Wible
  * @since 15-June-2012
  */
@@ -144,18 +144,6 @@
             reformatedData[i][0] = newDate; //date
             reformatedData[i][1] = allFlowData[i][1]; //flow
         }
-
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }
         len = String.valueOf(allFlowData.length);
         start = allFlowData[0][0];
         end = allFlowData[allFlowData.length - 1][0];
@@ -581,20 +569,6 @@
                 reformatedData.add("2 01472157                  0006000003                ENT");
             }
         }
-
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
-        }
         len = String.valueOf(allFlowData.length);
         start = allFlowData[0][0];
         end = allFlowData[allFlowData.length - 1][0];
@@ -913,6 +887,7 @@
         //Check if any flow data exists
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
         String[][] sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
+        dataSource = waterLib.getDataSourceCitation();
         
         //If the user wants the datasets (public and user) merged then retrieve the second dataset (user)
         String[][] sortableData_user = new String[0][0];

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

@@ -51,7 +51,7 @@
 import org.jfree.ui.TextAnchor;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 10-July-2012
 */
@@ -1143,6 +1143,7 @@
         //Check if any flow data exists
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
         String[][] sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
+        dataSource = waterLib.getDataSourceCitation();
         
         //If the user wants the datasets (public and user) merged then retrieve the second dataset (user)
         String[][] sortableData_user = new String[0][0];
@@ -1181,20 +1182,6 @@
             //If a drought limit is provided (aka greater than or equal to zero) then use this as the drought limit
             droughtInfo = generalDroughtAnalysis(sortedData_combined, droughtLimit);            
         }
-
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
-        }
         len = String.valueOf(sortedData_combined.length);
         start = String.valueOf(sortedData_combined[0][0]);
         end = String.valueOf(sortedData_combined[sortedData_combined.length - 1][0]);

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

@@ -35,7 +35,7 @@
 import org.jfree.data.xy.XYSeriesCollection;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 12-June-2011
 */
@@ -155,6 +155,7 @@
         //Check if any flow data exists
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
         String[][] sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
+        dataSource = waterLib.getDataSourceCitation();
         
         //If the user wants the datasets (public and user) merged then retrieve the second dataset (user)
         String[][] sortableData_user = new String[0][0];
@@ -506,6 +507,7 @@
         String[][] sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
         WaterDataInterface waterLib2 = WaterData.getNewWaterDataInterface(database, wqData_raw);
         String[][] WQdata = waterLib2.extractWaterQualityData_formatted(directory, orgId, stationId, startDate, endDate, wqTest);
+        dataSource = waterLib.getDataSourceCitation();
         
         //Find the user uploaded data file and uses this for a timeseries graph
         String[][] sortableData_user = new String[0][0];
@@ -1361,24 +1363,6 @@
      */
     public String dynamicParagraph(String paragraphTitle) {
         String dynamic_paragraph = paragraphTitle + "\n\n";
-        
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        
-        //Determine if current source is USGS or STORET to give credit for the data
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data and water quality test data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            dataSource = "Stream flow data and water quality test data provided by the user. Flow analysis accessed: " + today;
-        }
-        
-        //Create the correct dynamic paragraph
         if(paragraphTitle.equals("Point Sources and Wastewater Sources: ")){
             dynamic_paragraph = dynamic_paragraph + "When the target load duration curve is exceeded primarily under Low Flow and Dry Conditions flow intervals; point sources and wastewater source pollution are the likely cause.  Note: in order to have wastewater pollution source there must be an upstream wastewater plant discharging into the watershed.  Solutions to this problem may include but are not limited to: point source controls, septic system inspection programs, and sanitary sewer overflow repair (Cleland 2003).  In urban areas solutions might involve detecting illicit connections from storm water programs (Cleland 2007).  In agricultural settings, solutions may include fencing livestock from riparian areas along waterways, or other similar basic management practices (Cleland 2007).\n";
             dynamic_paragraph = dynamic_paragraph + "The grey graphed lines are duration curves for each individual year within the analysis period.\n";

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

@@ -13,7 +13,7 @@
 import java.util.Date;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 13-June-2012
 */
@@ -125,6 +125,7 @@
             //Check if any flow data exists
             WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
             double[][] peakFlowData = waterLib.extractFloodData_formatted(directory, orgId, stationId, startDate, endDate);
+            dataSource = waterLib.getDataSourceCitation();
             
             //Check if merging the datasets is desired, if so get the user data
             double[][] peakFlowData_user = new double[0][0];
@@ -152,20 +153,6 @@
             //Run Bulletin 17 function and return graph
             Bulletin17B bulletin17B = new Bulletin17B();
             String[][] dataSummary = bulletin17B.b17(peakFlowData_combined, gg, MSERbar, directory, database, stationId, stationName, showLargeFloods, plotref, plottype);
-
-            //Get today's date for the source reference
-            Date currentDate = new Date();
-            SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-            String today = sourceDateFormat.format(currentDate);
-            if(database.equalsIgnoreCase("USGS")){
-                dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-            }else if(database.equalsIgnoreCase("CDWR")){
-                dataSource = "Stream flow data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-            }else if(database.equalsIgnoreCase("CDWR")){
-                dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-            }else{
-                dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
-            }
             len = String.valueOf(peakFlowData_combined.length);
             start = String.valueOf(peakFlowData_combined[0][0]);
             end = String.valueOf(peakFlowData_combined[peakFlowData_combined.length - 1][0]);

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

@@ -22,7 +22,7 @@
 import org.codehaus.jettison.json.JSONException;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible & Tyler Dell
 * @since 27-March-2013
 */
@@ -594,6 +594,7 @@
         String[][] sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
         WaterDataInterface waterLib2 = WaterData.getNewWaterDataInterface(database, wqData_raw);
         String[][] WQdata = waterLib2.extractWaterQualityData_formatted(directory, orgId, stationId, startDate, endDate, wqTest);
+        dataSource = waterLib.getDataSourceCitation();
         
         //Find the user uploaded data file and uses this if merged
         String[][] sortableData_user = new String[0][0];
@@ -746,20 +747,6 @@
         }else{
             graphUnits = "tons";
         }
-
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data and water quality test data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            dataSource = "Stream flow data and water quality test data provided by the user. Load-Estimator analysis accessed: " + today;
-        }
         start = sortedData_combined[0][0];
         end = sortedData_combined[sortedData_combined.length - 1][0];
         flowLen = String.valueOf(sortedData_combined.length);

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

@@ -18,7 +18,7 @@
 import org.jfree.chart.plot.XYPlot;
 
 /**
-* Last Updated: 20-June-2017
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 24-June-2014
 */
@@ -117,6 +117,7 @@
         //Get stage-discharge data
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, "");
         double[][] stageDischargeData = waterLib.extractStageDischarge_formatted(stationId);
+        dataSource = waterLib.getDataSourceCitation();
         
         //Check if any rating curve data exists
         if(stageDischargeData.length == 0){
@@ -133,7 +134,6 @@
         SimpleDateFormat desiredDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String today = desiredDateFormat.format(currentDate);
         if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stage-Discharge Rating Curve data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
             ratingWarning = "The stage-discharge rating provided in this file should be" +
                 " considered provisional and subject to change until published by USGS. Stage-discharge" +
                 " ratings change over time as the channel features that control" +
@@ -142,7 +142,6 @@
                 " rating before using it for decisions that concern personal or" +
                 " public safety or operational consequences.";
         }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stage-Discharge Rating Curve data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
             ratingWarning = "All data presented on the Colorado Division of Water Resources"
                     + " ColoradoWaterSMS web service are provisional and subject to revision. These"
                     + " data include water levels in lakes and reservoirs, and in streams, rivers,"

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

@@ -54,7 +54,7 @@
 import org.jfree.ui.RectangleInsets;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 24-June-2011
 */
@@ -1991,6 +1991,7 @@
             //Check if any flow data exists
             WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
             sortableData = waterLib.extractFlowData_formatted(directory, orgId, stationId, startDate, endDate);
+            dataSource = waterLib.getDataSourceCitation();
 
             //Define other graph information
             units = "cfs";
@@ -2007,6 +2008,7 @@
             //Search for WQ data
             WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, userData);
             sortableData = waterLib.extractWaterQualityData_formatted(directory, orgId, stationId, startDate, endDate, wqTest);
+            dataSource = waterLib.getDataSourceCitation();
             
             //Get Units and conversion for current WQ test
             String[] resultArray = WaterQualityInfo.getWqTestDataInfo(wqTest, database);
@@ -2238,19 +2240,6 @@
         createTimeseriesBoxplot(sortedData_combined, yAxisTitle);
         createTimeseriesHistogram(sortedData_combined, sortedData_user, period1Data, period2Data, period3Data, color, yAxisTitle);
         createTimeseriesCDF(sortedData_combined, sortedData_user, period1Data, period2Data, period3Data, color, color2, yAxisTitle);
-        
-        //Get today's date for the source reference
-        DateFormat sourceDateFormat = DoubleArray.getDateFormat("15-min", false);
-        String today = sourceDateFormat.format(new Date());
-        if(database.equalsIgnoreCase("USGS")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("STORET")){
-            dataSource = "Stream flow data and water quality test data retrieved from the U.S. Environmental Protection Agency, STORET. http://www.epa.gov/storet/index.html accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
-        }
         len = String.valueOf(sortedData_combined.length);
     }
     public static void main(String[] args) throws IOException, InterruptedException, Exception {

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

@@ -30,7 +30,7 @@
 import org.jfree.data.time.TimeSeries;
 
 /**
-* Last Updated: 21-November-2018
+* Last Updated: 9-April-2019
 * @author Tyler Wible
 * @since 23-June-2014
 */
@@ -307,6 +307,7 @@
         //Check if any flow data exists
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface(database, "");
         String[][] sortableData = waterLib.extractInstantaneousFlowData_formatted(directory, stationId, startDate, endDate);
+        dataSource = waterLib.getDataSourceCitation();
         
         //If the user wants the datasets (public and user) merged then retrieve the second dataset (user)
         String[][] sortableData_user = new String[0][0];
@@ -344,18 +345,6 @@
         
         //Graph the timeseries data
         createTimeseriesGraph(sortedData_combined, sortableData_user);
-        
-        //Get today's date for the source reference
-        Date currentDate = new Date();
-        SimpleDateFormat sourceDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String today = sourceDateFormat.format(currentDate);
-        if(database.equalsIgnoreCase("USGS")){
-            this.dataSource = "Stream flow data retrieved from the U.S. Geological Survey, National Water Information System: Web Interface. http://waterdata.usgs.gov/nwis, accessed: " + today;
-        }else if(database.equalsIgnoreCase("CDWR")){
-            this.dataSource = "Stream flow data retrieved from the Colorado Division of Water Resources, CDWR. http://www.dwr.state.co.us accessed: " + today;
-        }else{
-            this.dataSource = "Stream flow data provided by the user. Flow analysis accessed: " + today;
-        }
         this.len = String.valueOf(sortedData_combined.length);
         this.units = "cfs";
     }