csip-cfa Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

src/java/cfa/DoubleArray.java

@@ -9,45 +9,8 @@

import java.util.Arrays;

import java.util.Calendar;

import java.util.Collections;

-import java.util.Comparator;

import java.util.Date;

import java.util.GregorianCalendar;

-

-class DateComparator implements Comparator<String[]>{

- //Compares the first entry of sorted data as flow values and sorts largest to smallest

- public int compare(final String[] entry1, final String[] entry2) {

- String value1 = entry1[0];

- String value2 = entry2[0];

- int comparison = value1.compareTo(value2);

- if(comparison>0){

- return 1;

- }else if(comparison<0){

- return -1;

- }else{

- return 0;

- }

- }

-}

-class FlowComparator implements Comparator<String[]>{

- //Compares the second entry of sorted data as flow values and sorts largest to smallest

- public int compare(final String[] entry1, final String[] entry2) {

- double value1 = 0;

- double value2 = 0;

- try{

- value1 = Double.parseDouble(entry1[1]);

- value2 = Double.parseDouble(entry2[1]);

- }catch(NumberFormatException e){

- e.printStackTrace();

- }

- if (value1 > value2){

- return -1;

- }else if (value1 < value2){

- return 1;

- }else{

- return 0;

- }

- }

-}

/**

* Last Updated: 1-July-2015

* @author Tyler Wible

src/java/cfa/Graphing.java

 @@ -26,16 +26,16 @@
   import org.jfree.ui.TextAnchor;
   /**
--* Last Updated: 9-November-2015
++* Last Updated: 4-February-2016
   * @author Tyler Wible
   * @since 3-February-2014
   */
   public class Graphing {
       private String fontFamily = "SansSerif";
--    Font titleFont = new Font(fontFamily, Font.BOLD, 30);
--    Font masterFont = new Font(fontFamily, Font.PLAIN, 22);
--    Font DClabelFont = new Font(fontFamily, Font.ITALIC, 20);
--    Font floodLabelFont = new Font(fontFamily, Font.PLAIN, 18);
++    public Font titleFont = new Font(fontFamily, Font.BOLD, 30);
++    public Font masterFont = new Font(fontFamily, Font.PLAIN, 22);
++    public Font DClabelFont = new Font(fontFamily, Font.ITALIC, 20);
++    public Font floodLabelFont = new Font(fontFamily, Font.PLAIN, 18);
       //Calibri
       //Georgia
       //SansSerif

src/java/m/cfa/ApplicationConfig.java

 @@ -35,15 +35,16 @@
           resources.add(csip.QueryService.class);
           resources.add(csip.ReportService.class);
           resources.add(csip.UIService.class);
--        resources.add(m.cfa.Baseflow_V1_0.class);
--        resources.add(m.cfa.Download_V1_0.class);
--        resources.add(m.cfa.Drought_V1_0.class);
--        resources.add(m.cfa.DurationCurve_V1_0.class);
--        resources.add(m.cfa.Flood_V1_0.class);
--        resources.add(m.cfa.LOADEST_V1_0.class);
--        resources.add(m.cfa.RegionalFlowDurationCurve_V1_0.class);
--        resources.add(m.cfa.StageDischarge_V1_0.class);
--        resources.add(m.cfa.Timeseries15min_V1_0.class);
--        resources.add(m.cfa.Timeseries_V1_0.class);
++        resources.add(m.cfa.baseflow.V1_0.class);
++        resources.add(m.cfa.download.V1_0.class);
++        resources.add(m.cfa.drought.V1_0.class);
++        resources.add(m.cfa.durationcurve.V1_0.class);
++        resources.add(m.cfa.flood.V1_0.class);
++        resources.add(m.cfa.loadest.V1_0.class);
++        resources.add(m.cfa.regionalfdc.V1_0.class);
++        resources.add(m.cfa.stagedischarge.V1_0.class);
++        resources.add(m.cfa.storetservice.V1_0.class);
++        resources.add(m.cfa.timeseries.V1_0.class);
++        resources.add(m.cfa.timeseries15min.V1_0.class);
       }
   }