improved code structure

Removed code smells

Issue-ID: PORTAL-865
Change-Id: I35c650ad0f0973e7665390cf1e56fefbe60781d5
Signed-off-by: Rupinder<rupinsi1@in.ibm.com>

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
index 19b7b13..52077aa 100644 (file)
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
@@ -59,10 +59,10 @@ import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+
 import org.apache.commons.lang.time.DateUtils;
 import org.onap.portalsdk.analytics.error.RaptorException;
 import org.onap.portalsdk.analytics.model.base.ChartSeqComparator;
@@ -291,7 +291,8 @@ public class ChartD3Helper {
                                                    if(!(nvl(dct.getColOnChart()).equals(AppConstants.GC_LEGEND))) {
                                                        if((dct.isChartSeries()!=null && dct.isChartSeries().booleanValue()) || (dct.getChartSeq()!=null && dct.getChartSeq()>0) ) {
                                                        
-                                                       if(nvl(dct.getChartColor()).length()>0) hasCustomizedChartColor = true;
+                                                       if(nvl(dct.getChartColor()).length()>0)
+                                                                               hasCustomizedChartColor = true;
                                                        if(hasCustomizedChartColor) {
                                                                //duplicates are avoided
                                                                if(!ts.contains(dct.getDisplayName()+"|"+nvl(dct.getChartColor())))
@@ -465,12 +466,14 @@ public class ChartD3Helper {
                                                              try {
                                                                         YAXISNUM = Integer.parseInt(ds.getString(i, columnMap.get((hasCustomizedChartColor?(uniqueElement.indexOf("|")!=-1?uniqueElement.substring(0, uniqueElement.indexOf("|")):uniqueElement):uniqueElement))));
                                                                         //if(MAXNUM < YAXISNUM) MAXNUM = YAXISNUM;
-                                                                                        if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                        if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                MAXDOUBLENUM = YAXISNUM;
                                                                      } catch (NumberFormatException ex) {
                                                                                          try {
                                                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, columnMap.get((hasCustomizedChartColor?(uniqueElement.indexOf("|")!=-1?uniqueElement.substring(0, uniqueElement.indexOf("|")):uniqueElement):uniqueElement))));
                                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                          } catch (NumberFormatException ex1) {
                                                                                                  flagNull = 1;
                                                                                          }
@@ -507,12 +510,14 @@ public class ChartD3Helper {
                                                                        YAXISNUM = Integer.parseInt(ds.getString(i, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1)?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
                                                                         dateStrList.add(new Long(date.getTime()).toString());
 
-                                                                                        if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                        if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                MAXDOUBLENUM = YAXISNUM;
                                                                      } catch (NumberFormatException ex) {
                                                                                          try {
                                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1) ?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
                                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                          } catch (NumberFormatException ex1) {
                                                                                                  flagNull = 1;
                                                                                          }
@@ -579,12 +584,14 @@ public class ChartD3Helper {
                                                                          dateStrList.add("'"+dateStr+"'");
                                                                              try {
                                                                                         YAXISNUM = Integer.parseInt(ds.getString(i, 3));
-                                                                                        if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                        if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                                MAXDOUBLENUM = YAXISNUM;
                                                                                      } catch (NumberFormatException ex) {
                                                                                                          try {
                                                                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, 3));
                                                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                                           } catch (NumberFormatException ex1) {
                                                                                                                          flagNull = 1;
                                                                                                           }
@@ -630,12 +637,14 @@ public class ChartD3Helper {
                                                                dateStrList.add(new Long(date.getTime()).toString());
                                                                      try {
                                                                                 YAXISNUM = Integer.parseInt(ds.getString(i, 3));
-                                                                                if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                        MAXDOUBLENUM = YAXISNUM;
                                                                              } catch (NumberFormatException ex) {
                                                                                                          try {
                                                                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, 3));
                                                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                                 if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                                           } catch (NumberFormatException ex1) {
                                                                                                                          flagNull = 1;
                                                                                                           }
@@ -939,8 +948,10 @@ public class ChartD3Helper {
                                                                }
                                                           wholeScript.append("             .axisLabel('" + chartLeftAxisLabel  + "') \n");
                                                        
-                                                        if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 ) MAXNUMDECIMALPLACES = 2;
-                                                        if( MAXNUMDECIMALPLACES >=3 ) MAXNUMDECIMALPLACES = 2;
+                                                        if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 )
+                                                                MAXNUMDECIMALPLACES = 2;
+                                                        if( MAXNUMDECIMALPLACES >=3 )
+                                                                MAXNUMDECIMALPLACES = 2;
                                                          if(!logScale)
                                                                wholeScript.append("        .tickFormat(d3.format(',."+MAXNUMDECIMALPLACES+"f')); \n");
                                                          else 
@@ -1085,7 +1096,8 @@ public class ChartD3Helper {
                                                    //System.out.println(dct.getDisplayName() + " " + yText);
                                                    if(!(nvl(dct.getColOnChart()).equals(AppConstants.GC_LEGEND))) {
                                                        if(yTextSeries.contains((String)dct.getDisplayName())) {
-                                                               if(nvl(dct.getChartColor()).length()>0) hasCustomizedChartColor = true;
+                                                               if(nvl(dct.getChartColor()).length()>0)
+                                                                                       hasCustomizedChartColor = true;
                                                                if(hasCustomizedChartColor) {
                                                                        //duplicates are avoided
                                                                        if(!ts.contains(dct.getDisplayName()+"|"+nvl(dct.getChartColor())))
@@ -1251,7 +1263,8 @@ public class ChartD3Helper {
                                                                 date = getDateFromDateStr(dateStr);
                                                                 formatFlag = getFlagFromDateStr(dateStr);
                                                         } 
-                                                        if(date==null && timeAxis) continue;
+                                                        if(date==null && timeAxis)
+                                                                continue;
                                                        
                                                         
                                                         //if(ds.getString(i, 2).equals(uniqueElements[j])) {
@@ -1260,13 +1273,15 @@ public class ChartD3Helper {
                                                    uniqueElement = (String)uniqueRevElements[j];
                                                      try {
                                                         YAXISNUM = Integer.parseInt(ds.getString(i, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1)?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
-                                                        if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                        if(MAXDOUBLENUM < YAXISNUM)
+                                                                                MAXDOUBLENUM = YAXISNUM;
                                                      } catch (NumberFormatException ex) {
                                                          try {
                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1) ?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
                                                                  if(RIGHTAXISSERIES!=j) {
                                                                          MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                             if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                             if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                 MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                  }
                                                          } catch (NumberFormatException ex1) {
                                                                  flagNull = 1;
@@ -1289,13 +1304,15 @@ public class ChartD3Helper {
                                                                                 if(i<ds.getRowCount()-1) {
                                                                              try {
                                                                                         YAXISNUM = Integer.parseInt(ds.getString(i+1, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1)?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
-                                                                                        if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                        if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                                MAXDOUBLENUM = YAXISNUM;
                                                                                      } catch (NumberFormatException ex) {
                                                                                          try {
                                                                                          YAXISDOUBLENUM = Double.parseDouble(ds.getString(i+1, columnMap.get(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1) ?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))));
                                                                                          if(RIGHTAXISSERIES!=j) {
                                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                     if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                     if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                          }
                                                                                          } catch (NumberFormatException ex1) {
                                                                                                  flagSecondNull = 1;
@@ -1343,7 +1360,8 @@ public class ChartD3Helper {
                                                                 formatFlag = getFlagFromDateStr(dateStr);
                                                         }
                                                
-                                                        if(date==null && timeAxis) continue;
+                                                        if(date==null && timeAxis)
+                                                                continue;
                                                         
                                                    uniqueElement = (String)uniqueRevElements[j];
                                                         //date = MMDDYYYYFormat.parse(ds.getString(i, 1), new ParsePosition(0));
@@ -1352,13 +1370,15 @@ public class ChartD3Helper {
                                                        //  minTime = date.getTime();
                                                      try {
                                                                 YAXISNUM = Integer.parseInt(ds.getString(i, 3));
-                                                                     if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                     if(MAXDOUBLENUM < YAXISNUM)
+                                                                                         MAXDOUBLENUM = YAXISNUM;
                                                              } catch (NumberFormatException ex) {
                                                                  try {
                                                                          YAXISDOUBLENUM = Double.parseDouble(ds.getString(i, 3));
                                                                          if(RIGHTAXISSERIES!=j) {
                                                                                  MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                     if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                     if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                         MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                  
                                                                          }
                                                                          } catch (NumberFormatException ex1) {
@@ -1383,13 +1403,15 @@ public class ChartD3Helper {
                                                                                                          if (ds.getString(k, 2).equals(((hasCustomizedChartColor||nvl(chartRightAxisLabel).length()>0) && (uniqueElement.lastIndexOf("|") != -1) ?uniqueElement.substring(0, uniqueElement.lastIndexOf("|")):uniqueElement))) {
                                                                                                                  try {
                                                                                                                          YAXISNUM = Integer.parseInt(ds.getString(k, 3));
-                                                                                                             if(MAXDOUBLENUM < YAXISNUM) MAXDOUBLENUM = YAXISNUM;
+                                                                                                             if(MAXDOUBLENUM < YAXISNUM)
+                                                                                                                                 MAXDOUBLENUM = YAXISNUM;
                                                                                                                  } catch (NumberFormatException ex) {
                                                                                                                          try {
                                                                                                                                  YAXISDOUBLENUM = Double.parseDouble(ds.getString(k, 3));
                                                                                                                                  if(RIGHTAXISSERIES!=j) {
                                                                                                                         MAXNUMDECIMALPLACES = getNumberOfDecimalPlaces(YAXISDOUBLENUM);
-                                                                                                                             if(MAXDOUBLENUM < YAXISDOUBLENUM) MAXDOUBLENUM = YAXISDOUBLENUM;
+                                                                                                                             if(MAXDOUBLENUM < YAXISDOUBLENUM)
+                                                                                                                                                 MAXDOUBLENUM = YAXISDOUBLENUM;
                                                                                                                                  }
                                                                                                                          } catch (NumberFormatException ex1) {
                                                                                                                                  flagSecondNull = 1;
@@ -1588,8 +1610,10 @@ public class ChartD3Helper {
                                                 }
                                                        wholeScript.append("             .axisLabel('" + chartLeftAxisLabel  + "') \n");
                                                        //if(nvl(subType).length() > 0 && subType.equals("area")) {     
-                                                        if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 ) MAXNUMDECIMALPLACES = 2;
-                                                        if( MAXNUMDECIMALPLACES >=3 ) MAXNUMDECIMALPLACES = 2;
+                                                        if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 )
+                                                                MAXNUMDECIMALPLACES = 2;
+                                                        if( MAXNUMDECIMALPLACES >=3 )
+                                                                MAXNUMDECIMALPLACES = 2;
                                                                wholeScript.append("        .tickFormat(d3.format(',."+MAXNUMDECIMALPLACES+"f')); \n");
                                                        /*} else {
                                                                wholeScript.append("        .tickFormat(d3.format(',.2f')); \n");
@@ -1614,7 +1638,8 @@ public class ChartD3Helper {
                                                 }
                                                 wholeScript.append("             .axisLabel('" + chartLeftAxisLabel  + "') \n");
                                                        //if(nvl(subType).length() > 0 && subType.equals("area")) {
-                                                if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 ) MAXNUMDECIMALPLACES = 2;
+                                                if(MAXDOUBLENUM <=5 && MAXNUMDECIMALPLACES == 0 )
+                                                        MAXNUMDECIMALPLACES = 2;
                                                 if( MAXNUMDECIMALPLACES >=3 ) {
                                                         MAXNUMDECIMALPLACES = 2;
                                                 }
@@ -2902,7 +2927,8 @@ public class ChartD3Helper {
                                        int rowCount = ds.getRowCount();
                                        for (int i = 0; i < ds.getRowCount(); i++) {
                                                s.append("{ \"name\": \""+ ds.getString(i,"ei1") +"\" , \"group\":"+ ds.getString(i,"groups") +", \"level\":2   }");
-                                               if (i < (rowCount-1)) s.append(",");
+                                               if (i < (rowCount-1))
+                                                       s.append(",");
                                                dataStr.append(s);
                                                s = new StringBuilder("");
                                        }
@@ -2911,7 +2937,8 @@ public class ChartD3Helper {
                                dataStr.append("\"links\":[");
                                        for (int i = 0; i < ds.getRowCount(); i++) {
                                                s.append("{ \"source\": "+ ds.getString(i,"source") +" , \"target\":"+ ds.getString(i,"target") +", \"value\":2   }");
-                                       if (i < (rowCount-1)) s.append(",");
+                                       if (i < (rowCount-1))
+                                                       s.append(",");
                                                dataStr.append(s);
                                                s = new StringBuilder("");
                                        }
@@ -3306,7 +3333,8 @@ public class ChartD3Helper {
                                                } else if (filter == 1 && (dc.isCreateInNewChart()==null || !dc.isCreateInNewChart().booleanValue())) {
                                                        chartValueCols.add(dc);
                                                }
-                                               else if(filter == 0) chartValueCols.add(dc);
+                                               else if(filter == 0)
+                                                       chartValueCols.add(dc);
                                        } else chartValueCols.add(dc);
                                }
 //                             } else
@@ -3577,116 +3605,142 @@ public class ChartD3Helper {
                                */
 
                                date = MMDDYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0));
-                   if(date!=null) formatFlag = SECFLAG;
+                   if(date!=null)
+                                       formatFlag = SECFLAG;
                    if(date==null) {
                        date = EEEMMDDYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYOFTHEWEEKFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYOFTHEWEEKFLAG;
                    }
                    if(date==null) {
                        date = MMDDYYYYHHMMFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MINFLAG;
+                       if(date!=null)
+                                               formatFlag = MINFLAG;
                    }
                    if(date==null) {
                        //MMDDYYYYHHFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
                        date = MMDDYYYYHHFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = HOURFLAG;
+                       if(date!=null)
+                                               formatFlag = HOURFLAG;
                    }            
                    if(date==null) {
                        date = MMDDYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    if(date==null) {
                        date = YYYYMMDDFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    if(date==null) {
                        date = timestampFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                               formatFlag = SECFLAG;
                    }
                    if(date==null) {
                        date = timestampHrFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = HOURFLAG;
+                       if(date!=null)
+                                               formatFlag = HOURFLAG;
                    }
                    if(date==null) {
                        date = timestampDayFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    if(date==null) { 
                        date = MONYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MONTHFLAG;
+                       if(date!=null)
+                                               formatFlag = MONTHFLAG;
                    }
                    if(date==null) { 
                        date = MMYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MONTHFLAG;
+                       if(date!=null)
+                                               formatFlag = MONTHFLAG;
                    }
                    if(date==null) { 
                        date = MMMMMDDYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    if(date==null) { 
                        date = MONTHYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MONTHFLAG;
+                       if(date!=null)
+                                               formatFlag = MONTHFLAG;
                    }
                    
                    if(date==null) { 
                        date = YYYYMMDDHHMMSSFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                               formatFlag = SECFLAG;
                    }
                    
                    if(date==null) { 
                        date = YYYYMMDDHHMMFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MINFLAG;
+                       if(date!=null)
+                                               formatFlag = MINFLAG;
                    }
                    
                    if(date==null) { 
                        date = DDMONYYYYHHMMSSFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                               formatFlag = SECFLAG;
                    }
                    
                    if(date==null) { 
                        date = DDMONYYYYHHMMFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MINFLAG;
+                       if(date!=null)
+                                               formatFlag = MINFLAG;
                    }
                    
                    if(date==null) { 
                        date = DDMONYYYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    
                    if(date==null) { 
                        date = MMDDYYHHMMSSFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                               formatFlag = SECFLAG;
                    }
                    
                    if(date==null) { 
                        date = MMDDYYHHMMFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = MINFLAG;
+                       if(date!=null)
+                                               formatFlag = MINFLAG;
                    }
                    
                    if(date==null) { 
                        date = MMDDYYFormat.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = DAYFLAG;
+                       if(date!=null)
+                                               formatFlag = DAYFLAG;
                    }
                    
                    if(date==null) { 
                        date = timestampFormat1.parse(dateStr, new ParsePosition(0));
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                               formatFlag = SECFLAG;
                    }
                    
                    if(date==null) {
                        date = MMDDYYYYHHMMZFormat.parse(dateStr, new ParsePosition(0));            
-                       if(date!=null) formatFlag = MINFLAG;
+                       if(date!=null)
+                                               formatFlag = MINFLAG;
                    }
                    
                    if(date==null) {
                        date = YYYYFormat.parse(dateStr, new ParsePosition(0));
                        /* Some random numbers should not satisfy this year format. */
-                       if(dateStr.length()>4) date = null;
-                       if(date!=null) formatFlag = YEARFLAG;
+                       if(dateStr.length()>4)
+                                               date = null;
+                       if(date!=null)
+                                               formatFlag = YEARFLAG;
                    }
                    if(date==null) {
                        date = timestamp_W_dash.parse(dateStr, new ParsePosition(0));            
-                       if(date!=null) formatFlag = SECFLAG;
+                       if(date!=null)
+                                           formatFlag = SECFLAG;
                    }
                    if(date==null)
                        date = null;
@@ -3713,8 +3767,10 @@ public class ChartD3Helper {
 
        public boolean getBooleanValue(String s, Boolean defaultValue) {
           s = nvl(s);
-          if(s.length()<=0 && defaultValue!=null) return defaultValue.booleanValue();
-          else if(s.length()<=0) return false;
+          if(s.length()<=0 && defaultValue!=null)
+                          return defaultValue.booleanValue();
+          else if(s.length()<=0)
+                          return false;
           else {
           if(s.toUpperCase().startsWith("Y") || s.toLowerCase().equals("true"))
               return true;
@@ -3819,7 +3875,8 @@ public class ChartD3Helper {
                                                        value.append("(");
                                                }
                                                for(int j = 0 ; j < vals.length; j++) {
-                                                       if(isMultiValue) value.append("'");
+                                                       if(isMultiValue)
+                                                               value.append("'");
                                                        try {
                                                                if(vals[j] !=null && vals[j].length() > 0) {
                                                                        vals[j] = Utils.oracleSafe(vals[j]);
@@ -3834,7 +3891,8 @@ public class ChartD3Helper {
                                                        }
                
                
-                                                       if(isMultiValue) value.append("'"); 
+                                                       if(isMultiValue)
+                                                               value.append("'"); 
                                                        
                                                        if(j != vals.length -1) {
                                                                value.append(",");