Merge "lowered code smells in IdNameList & IdNameLookup"

2 files changed, 0 insertions, 51 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java
index 8f44e37b..154c94b4 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java
@@ -176,20 +176,6 @@ public class IdNameList extends Vector {
 	public void loadData(String pageNo, String searchString, String dbInfo) throws RaptorException {}
 	private void loadData(int pageNo, String searchString, String dbInfo) throws RaptorException {}	
 
-/*    
-	public void loadData(int pageNo, String dbInfo) throws RaptorException {
-	}
-
-    public void loadUserData(int pageNo, String dbInfo, String userId) throws RaptorException {
-    }
-
-
-
-
-	public void loadData(String pageNo, String searchString) throws RaptorException {
-	}
-
-*/
 	protected static String nvl(String s) {
 		return (s == null) ? "" : s;
 	}
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java
index f2a15f43..590fd1aa 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java
@@ -60,29 +60,6 @@ public class IdNameLookup extends IdNameSql {
 		this(dbTableName, dbIdField, dbNameField, null, "", false);
 	} // IdNameLookup
 
-/*    public IdNameLookup(String dbTableName, String dbIdField, String dbNameField,
-            String dbSortByField) {
-        super();
-
-        setDbTableName(dbTableName);
-        setDbIdField(dbIdField);
-        setDbNameField(dbNameField);
-        setDbSortByField(dbSortByField);
-        updateParentSQL();
-    } // IdNameLookup
-
-    public IdNameLookup(String dbTableName, String dbIdField, String dbNameField,
-			String dbSortByField, String defaultSQL) {
-		super();
-
-		setDbTableName(dbTableName);
-		setDbIdField(dbIdField);
-		setDbNameField(dbNameField);
-		setDbSortByField(dbSortByField);
-        setDefaultSQL(defaultSQL);        
-		updateParentSQL();
-	} // IdNameLookup
-*/
     public IdNameLookup(String dbTableName, String dbIdField, String dbNameField,
             String dbSortByField, boolean textField) {
         super();
@@ -153,10 +130,6 @@ public class IdNameLookup extends IdNameSql {
 							dbSortByField.indexOf(' ')) : dbSortByField) + " sort";
 
 		setSqlNoOrderBy(sql_start + sql_middle + sql_end);
-//        System.out.println("SQL Start " + sql_start);
-//        System.out.println("SQL Middle " + sql_middle);
-//        System.out.println("SQL End " + sql_end);
-//        System.out.println("DbSortByField " + dbSortByField);
         
 		setSql(sql_start + sql_middle + sql_end + " ORDER BY " + nvl(dbSortByField, "2"));
 	} // updateParentSQL
@@ -173,16 +146,6 @@ public class IdNameLookup extends IdNameSql {
 		return "SELECT " + dbIdField + " FROM " + dbTableName;
 	} // getBaseSQL
 	
-	/*
-	public void loadData(int pageNo) throws RaptorException {
-		loadData(pageNo, "");
-	} // loadData
-
-	public void loadData(String pageNo) throws RaptorException {
-		loadData(pageNo, "");
-	} // loadData
-*/
-	
 	public void loadData(String pageNo, String searchString, String dbInfo) throws RaptorException {
 		int iPageNo = 0;