Changeset 3514

Timestamp:

Sep 29, 2015, 12:27:32 PM (7 years ago)

Author:

olle

Message:

Refs #815. Java servlet class/file MeludiQuarterMonthReportServlet.java in src/net/sf/basedb/meludi/servlet/ updated:

1. Name of constants for number of decimals and chart variants changed to upper case with underscore separators, in order to increase visibility in code.
2. Private method String fetchProjectFocusFilterName(String projectFocusFilter) updated to use string constants already defined in class InstallServlet for project focus filter menu items, instead of explicit string values.
3. Private method String fetchChartHeaderTitle(String chartVariant, String viewType, String projectFocusFilter, Site site) updated by exchanging "MeLuDI extractions by" for "extracts by", in order to shorten the title, and prepare for adding more information in the future.

File:

• extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/MeludiQuarterMonthReportServlet.java (modified) (14 diffs)

extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/MeludiQuarterMonthReportServlet.java

@@ -48 +48 @@
   private ReportTableUtil tableUtil;
 
-  private static int numberOfDecimals = 1;
+  private static int NUM_DECIMALS = 1;
 
   // Use stored annotation snapshots for performance reasons
@@ -65 +65 @@
   public static final String quarterMonthView = "QUARTERMONTH";
   // Constants for chart variant choices
-  public static final String allCharts = "allcharts";
-  public static final String originalQuantityDnaChart = "originalquantitydna";
-  public static final String originalQuantityRnaChart = "originalquantityrna";
-  public static final String deltaCtDnaChart = "deltactdna";
+  public static final String ALL_CHARTS = "allcharts";
+  public static final String ORIGINAL_QUANTITY_DNA_CHART = "originalquantitydna";
+  public static final String ORIGINAL_QUANTITY_RNA_CHART = "originalquantityrna";
+  public static final String DELTA_CT_DNA_CHART = "deltactdna";
 
   private List<String> chartVariantList = null;
@@ -82 +82 @@
       // Initialize list with chart variants
       this.chartVariantList = new ArrayList<String>();
-      this.chartVariantList.add(originalQuantityDnaChart);
-      this.chartVariantList.add(originalQuantityRnaChart);
-      this.chartVariantList.add(deltaCtDnaChart);
+      this.chartVariantList.add(ORIGINAL_QUANTITY_DNA_CHART);
+      this.chartVariantList.add(ORIGINAL_QUANTITY_RNA_CHART);
+      this.chartVariantList.add(DELTA_CT_DNA_CHART);
     }
     return this.chartVariantList;
@@ -214 +214 @@
         Site site = sitePrefix != null ? Site.findByPrefix(sitePrefix) : null;
 //System.out.println(new Date() + " MeludiQuarterMonthReportServlet::doGet(): cmd = \"" + cmd + "\" startDate = " + startDate + " endDate = " + endDate + " viewType = " + viewType + " projectFocusFilter = " + projectFocusFilter + " sitePrefix = " + sitePrefix + " site = " + site);
-        String chartVariant = Values.getString(req.getParameter("cvariant"), originalQuantityDnaChart);
+        String chartVariant = Values.getString(req.getParameter("cvariant"), ORIGINAL_QUANTITY_DNA_CHART);
 //System.out.println(new Date() + " MeludiQuarterMonthReportServlet::doGet(): cmd = \"" + cmd + "\" startDate = " + startDate + " endDate = " + endDate + " viewType = " + viewType + " projectFocusFilter = " + projectFocusFilter + " sitePrefix = " + sitePrefix + " site = " + site + " chartVariant = " + chartVariant);
 
@@ -406 +406 @@
     // Create list of chart variants for plots
     List<String> chartVariantList;
-    if (chartVariant.equals(allCharts))
+    if (chartVariant.equals(ALL_CHARTS))
     {
       // Create several plots
@@ -708 +708 @@
     Float floatPct50 = calculatePercentile(floatList, 0.50f);
     Float floatPct75 = calculatePercentile(floatList, 0.75f);
-    int localNumberOfDecimals = numberOfDecimals;
+    int localNumberOfDecimals = NUM_DECIMALS;
     if (floatPct25 != null && floatPct25 < 1)
     {
-      localNumberOfDecimals = numberOfDecimals + 1;
+      localNumberOfDecimals = NUM_DECIMALS + 1;
     }
     // Create JSON object with sample statistics
@@ -853 +853 @@
     HashMap<String, List<Float>> periodStringFloatListHashMap = new HashMap<String, List<Float>>();
 
-    if (chartVariant.equals(originalQuantityDnaChart))
+    if (chartVariant.equals(ORIGINAL_QUANTITY_DNA_CHART))
     {
 //System.out.println(new Date() + " MeludiQuarterMonthReportServlet::createPeriodStringFloatListHashMap(): extractDnaList.size() = " + extractDnaList.size());
@@ -877 +877 @@
       }
     }
-    else if (chartVariant.equals(deltaCtDnaChart))
+    else if (chartVariant.equals(DELTA_CT_DNA_CHART))
     {
 //System.out.println(new Date() + " MeludiQuarterMonthReportServlet::createPeriodStringFloatListHashMap(): extractDnaList.size() = " + extractDnaList.size());
@@ -901 +901 @@
       }
     }
-    else if (chartVariant.equals(originalQuantityRnaChart))
+    else if (chartVariant.equals(ORIGINAL_QUANTITY_RNA_CHART))
     {
 //System.out.println(new Date() + " MeludiQuarterMonthReportServlet::createPeriodStringFloatListHashMap(): extractRnaList.size() = " + extractRnaList.size());
@@ -1126 +1126 @@
    *  @param chartVariant String The chart variant to get a plot title for.
    *  @param viewType String The view type used for the period selection for the plot.
-   *  @param chartSite String The site used for the data selection for the plot.
+   *  @param projectFocusFilter String The project focus filter for the plot.
+   *  @param site String The site used for the data selection for the plot.
    *  @return String A plot title for the given chart variant string.
    */
@@ -1141 +1142 @@
       // String "\u00B5" is the micro character in unicode
       // String "\u223C" is the tilde character in unicode
-      if (chartVariant.equals(originalQuantityDnaChart))
-      {
-        title = "Total quantity DNA for " + projectFocus + "MeLuDI extractions by " + periodName;
+      if (chartVariant.equals(ORIGINAL_QUANTITY_DNA_CHART))
+      {
+        title = "Total quantity DNA for " + projectFocus + "extracts by " + periodName;
       }       
-      else if (chartVariant.equals(originalQuantityRnaChart))
-      {
-        title = "Total quantity RNA for " + projectFocus + "MeLuDI extractions by " + periodName;
+      else if (chartVariant.equals(ORIGINAL_QUANTITY_RNA_CHART))
+      {
+        title = "Total quantity RNA for " + projectFocus + "extracts by " + periodName;
       }       
-      else if (chartVariant.equals(deltaCtDnaChart))
-      {
-        title = "DNA ΔCt value for " + projectFocus + "MeLuDI extractions by " + periodName;
+      else if (chartVariant.equals(DELTA_CT_DNA_CHART))
+      {
+        title = "DNA ΔCt value for " + projectFocus + "extracts by " + periodName;
       }       
       if (site != null)
@@ -1174 +1175 @@
     if (projectFocusFilter != null)
     {
-      if (projectFocusFilter.equals("melanoma"))
+      if (projectFocusFilter.equals(InstallServlet.PROJECTFOCUS_MELANOMA))
       {
         projectFocusTitleName = "Melanoma ";
       }
-      else if (projectFocusFilter.equals("lungcancer"))
+      else if (projectFocusFilter.equals(InstallServlet.PROJECTFOCUS_LUNG_CANCER))
       {
         projectFocusTitleName = "Lung cancer ";
       }
-      else if (projectFocusFilter.equals("coloncancer"))
+      else if (projectFocusFilter.equals(InstallServlet.PROJECTFOCUS_COLON_CANCER))
       {
         projectFocusTitleName = "Colon cancer ";
       }
-      else if (projectFocusFilter.equals("GIST"))
+      else if (projectFocusFilter.equals(InstallServlet.PROJECTFOCUS_GIST))
       {
         projectFocusTitleName = "GIST ";
@@ -1232 +1233 @@
       // String "\u00B5" is the micro character in unicode
       // String "\u223C" is the tilde character in unicode
-      if (chartVariant.equals(originalQuantityDnaChart))
+      if (chartVariant.equals(ORIGINAL_QUANTITY_DNA_CHART))
       {
         title = "Original quantity DNA (\u00B5g)";
       }       
-      else if (chartVariant.equals(originalQuantityRnaChart))
+      else if (chartVariant.equals(ORIGINAL_QUANTITY_RNA_CHART))
       {
         title = "Original quantity RNA (\u00B5g)";
       }       
-      else if (chartVariant.equals(deltaCtDnaChart))
+      else if (chartVariant.equals(DELTA_CT_DNA_CHART))
       {
         title = "DNA ΔCt value";
@@ -1261 +1262 @@
       // String "\u00B5" is the micro character in unicode
       // String "\u223C" is the tilde character in unicode
-      if (chartVariant.equals(originalQuantityDnaChart))
+      if (chartVariant.equals(ORIGINAL_QUANTITY_DNA_CHART))
       {
         title = "\u00B5g";
       }       
-      else if (chartVariant.equals(originalQuantityRnaChart))
+      else if (chartVariant.equals(ORIGINAL_QUANTITY_RNA_CHART))
       {
         title = "\u00B5g";
       }       
-      else if (chartVariant.equals(deltaCtDnaChart))
+      else if (chartVariant.equals(DELTA_CT_DNA_CHART))
       {
         title = "ΔCt value";