Updated hibernate pophelp bean, dashboardUtil dao and dashboardservice class

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182375 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/hibernate/bean/Pophelp.java

@@ -42,7 +42,7 @@ public class Pophelp implements java.io.Serializable
 	private String sqlInput;
 
 	@Column(name="MULTI_OPT")
-	private Integer multiOpt;
+	private String multiOpt;
 
 	@Column(name="AUTO_FILL_LEN")
 	private String autoFillLen;
@@ -59,8 +59,6 @@ public class Pophelp implements java.io.Serializable
 	@Column(name="THUMB_ALT_COL")
 	private String thumbAltCol;
 	
-	
-	
 	@Column(name="DIST_OPT")
 	private String distOpt;
 	
@@ -85,7 +83,7 @@ public class Pophelp implements java.io.Serializable
 	public Pophelp() {
 	}
 
-	public Pophelp(String fieldName, String modName, String sqlInput, Integer multiOpt, String autoFillLen, String dataModelName,
+	public Pophelp(String fieldName, String modName, String sqlInput, String multiOpt, String autoFillLen, String dataModelName,
 			String distOpt, String filterString, Integer defaultCol, String thumbObj, String thumbImageCol,
 			String thumbAltCol, String objNameDs, String validateData, String itemChange, String helpOption) {
 		super();
@@ -139,11 +137,11 @@ public class Pophelp implements java.io.Serializable
 		this.sqlInput = sqlInput;
 	}
 
-	public Integer getMultiOpt() {
+	public String getMultiOpt() {
 		return multiOpt;
 	}
 
-	public void setMultiOpt(Integer multiOpt) {
+	public void setMultiOpt(String multiOpt) {
 		this.multiOpt = multiOpt;
 	}
 

webitm-dashboard/ibase/dashboard/common/webService/DashboardService.java

@@ -11,6 +11,7 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import org.json.JSONArray;
+import org.json.JSONObject;
 
 //import com.sun.corba.se.impl.javax.rmi.CORBA.Util;
 
@@ -31,7 +32,7 @@ public class DashboardService {
 		String dashboardMetadataFilePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "dashboard" + File.separator + "metadataxml" + File.separator +dashboardFileName+".xml";
 		System.out.println("Final File Path =" + dashboardMetadataFilePath);
 		DashboardUtil util = new DashboardUtil();
-		JSONArray dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath);
+		JSONObject dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath);
 		
 		return dashboardMetadata.toString();
 	}