Merge "removed code smells from some components"

6 files changed, 0 insertions, 49 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/XSSFilter.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/XSSFilter.java
index a1c8358a..f20b2116 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/XSSFilter.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/XSSFilter.java
@@ -43,26 +43,6 @@ package org.onap.portalsdk.analytics.util;
 	 * This class is used to filter javascript tags to avoid XSS attacks.
 	 */
 public class XSSFilter {
-
-	//	private static String[] filterChars = { "<", ">", "<", ">", "\"", "\\", "0x" };
-//	private static String[] replacementChars = { " ", " ", " ", " ", "'", "/", "0 x" };
-
-/*	public static synchronized String filterRequest(String param) {
-		String value = param;
-
-		if (param != null) {
-
-			for (int i = 0; i < filterChars.length; i++) {
-				value = filterCharacters(filterChars[i], replacementChars[i],
-						value);
-			}
-
-		}
-
-		return value;
-
-	}
-*/
 	
 	public static synchronized String filterRequestOnlyScript(String param) {
 		String value = "";
@@ -83,19 +63,6 @@ public class XSSFilter {
 		
 		return value;
 	}
-	
-//	private static synchronized String filterCharacters(String originalChar, String newChar,
-//			String param) {
-//		StringBuffer sb = new StringBuffer(param);
-//
-//		for (int position = param.toLowerCase().indexOf(originalChar); position >= 0;) {
-//			sb.replace(position, position + originalChar.length(), newChar);
-//			param = sb.toString();
-//			position = param.toLowerCase().indexOf(originalChar);
-//		}
-//
-//		return sb.toString();
-//	}
     
 	public static void main (String args[]) {
 		String value = XSSFilter.filterRequest("<s\nC\nr\nI\np\nT\n>\na\nl\ne\nr\nt\n('sundar');</SCRIPT>javascript:alert('Sundar');");
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java
index 1b56bdff..765ba3c5 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java
@@ -97,11 +97,6 @@ public class ColumnHeader extends org.onap.portalsdk.analytics.RaptorObject impl
 		setColSpan(colSpan);
 	} // ColumnHeader
 
-	//public ColumnHeader(String columnTitle, String columnWidth, int colSpan, String linkColId) {
-		//this(columnTitle, columnWidth, colSpan);
-		//setLinkColId(linkColId);
-	//} // ColumnHeader
-
 	public ColumnHeader(String columnTitle, String columnWidth, String alignment, int colSpan, String linkColId) {
 		this(columnTitle, columnWidth, colSpan);
 		setAlignment(alignment);
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeaderRow.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeaderRow.java
index 2f3a2cf1..f9b71ffa 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeaderRow.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeaderRow.java
@@ -101,10 +101,6 @@ public class ColumnHeaderRow extends Vector {
 		return (s == null) ? "" : s;
 	}
 
-//	private String nvl(String s, String sDefault) {
-//		return nvl(s).equals("") ? sDefault : s;
-//	}
-
 	public String getAlignment() {
 		return alignment;
 	}
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/CrossTabColumnValues.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/CrossTabColumnValues.java
index 4b94c8d4..9a017a8b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/CrossTabColumnValues.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/CrossTabColumnValues.java
@@ -52,7 +52,6 @@ public class CrossTabColumnValues extends org.onap.portalsdk.analytics.RaptorObj
 			throws RaptorException {
 		this.colId = colId;
 		DataSet ds = ConnectionUtils.getDataSet(loadValuesSQL, dbInfo);
-		// DataSet ds = DbUtils.executeQuery(loadValuesSQL);
 		columnValues = new Vector(ds.getRowCount());
 		for (int i = 0; i < ds.getRowCount(); i++)
 			columnValues.add(ds.getString(i, 0));
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java
index 401da422..e8c1993e 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java
@@ -213,8 +213,6 @@ public class DataValue extends org.onap.portalsdk.analytics.RaptorObject impleme
 			return getDisplayValueHtml();
 		else
 			return getFormattedLink(getValueHtml());
-		// return getFormattedValue("<a
-		// href=\""+drillDownURL+"\">"+getValueHtml()+"</a>");
 	} // getDisplayValueLinkHtml
 
 	public String getAlignmentHtml() {
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/HtmlFormatter.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/HtmlFormatter.java
index 7b5f548b..b1997a2b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/HtmlFormatter.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/HtmlFormatter.java
@@ -157,8 +157,6 @@ public class HtmlFormatter extends RaptorObject {
 			sb.append("font-style:italic;");
 		if (isUnderline())
 			sb.append("text-decoration:underline;");
-		// if(getBgColor().length()>0)
-		// sb.append("background-color:"+getBgColor()+";");
 		if (getFontColor().length() > 0)
 			sb.append("color:" + getFontColor() + ";");
 		if (getFontFace().length() > 0)
@@ -207,8 +205,6 @@ public class HtmlFormatter extends RaptorObject {
 			sb.append("font-style:italic;");
 		if (isUnderline())
 			sb.append("text-decoration:underline;");
-		// if(getBgColor().length()>0)
-		// sb.append("background-color:"+getBgColor()+";");
 		if (getFontColor().length() > 0)
 			sb.append("color:" + getFontColor() + ";");
 		if (getFontFace().length() > 0)