Changed GenomeStat from normal Java object to Javascript Overlay Type

Author: timeu

src/main/java/at/gmi/nordborglab/widgets/geneviewer/client/datasource/GenomeStat.java

@@ -2,43 +2,50 @@
 
 import java.util.List;
 
-public class GenomeStat {
-	
-	private final String name;
-	private final String label;
-	private final String color;
-	private final boolean isStepPlot;
-	private final boolean isStackable;
-	
-	public GenomeStat(String name,String color,boolean isStackable,boolean isStepPlot,String label) {
-		this.name = name;
-		this.color = color;
-		this.isStackable = isStackable;
-		this.isStepPlot = isStepPlot;
-		this.label = label;
-	}
+import com.google.gwt.core.client.JavaScriptObject;
+
+public class GenomeStat extends JavaScriptObject{
 
-	public String  getName() {
-		return name;
-	}
 
-	public String getLabel() {
+	protected GenomeStat() {}
+	
+	public final native String getName() /*-{
+		return this.name;
+	}-*/;
+	
+	public final String getDisplayName() {
+		String label = getLabel();
 		if (label == null || label.isEmpty())
-			return name;
+			return getName();
 		return label;
 	}
 
-	public String  getColor() {
-		return color;
-	}
+	public final native String getLabel() /*-{
+		if (typeof this.label != 'undefined') {
+			return this.label;
+		}
+		return null;
+	}-*/;
 
-	public boolean isStackable() {
-		return isStackable;
-	}
 
-	public boolean isStepPlot() {
-		return isStepPlot;
-	}
+	
+	public final native String getColor() /*-{
+		return this.color;
+	}-*/;
+	
+	public final native boolean isStackable() /*-{
+		if (typeof this.isStackable != 'undefined') {
+			return this.isStackable;
+		}
+		return true;
+	}-*/;
+	
+	public final native boolean isStepPlot() /*-{
+		if (typeof this.isStepPlot != 'undefined') {
+			return this.isStepPlot;
+		}
+		return false;
+	}-*/;
 
 	public static GenomeStat getFromName(List<GenomeStat> stats,String name) {
 		for (GenomeStat stat: stats) {

src/main/java/at/gmi/nordborglab/widgets/geneviewer/client/datasource/impl/JBrowseDataSourceImpl.java

@@ -15,6 +15,7 @@
 import at.gmi.nordborglab.widgets.geneviewer.client.datasource.SearchGeneCallback;
 
 import com.google.gwt.core.client.JsArray;
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwt.http.client.Request;
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.http.client.RequestCallback;
@@ -229,19 +230,9 @@ public void onResponseReceived(Request request, Response response) {
 				JSONObject retval = value.isObject();
 				if (retval.get("status").isString().stringValue().equals("OK"))
 				{
-					JSONArray stats_array = retval.get("stats").isArray();
-					for (int i = 0;i<stats_array.size();i++) {
-						JSONObject stats_item = stats_array.get(i).isObject();
-						boolean isStackable = true;
-						boolean isStepPlot = false;
-						String label = null;
-						if (stats_item.containsKey("isStepPlot"))
-							isStepPlot = stats_item.get("isStepPlot").isBoolean().booleanValue();
-						if (stats_item.containsKey("isStackable"))
-							isStackable = stats_item.get("isStackable").isBoolean().booleanValue();
-						if (stats_item.containsKey("label"))
-							label = stats_item.get("label").isString().stringValue();
-						genomeStats.add(new GenomeStat(stats_item.get("name").isString().stringValue(), "blue",isStackable,isStepPlot,label));
+					JsArray<GenomeStat> array = JsonUtils.safeEval(retval.get("stats").toString());
+					for (int i =0;i<array.length();i++) {
+						genomeStats.add(array.get(i));
 					}
 					callback.onFetchGenomeStatsList(genomeStats);
 				}