[overlord-commits] Overlord SVN: r1005 - in activity-monitor/trunk: gui/war/src/main/java/org/jboss/bpm/monitor/gui/public and 1 other directories.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2010-03-12 08:06:43 -0500 (Fri, 12 Mar 2010)
New Revision: 1005

Modified:
   activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java
   activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js
   activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java
Log:
fix creation of JSON datasets

Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java	2010-03-12 11:41:27 UTC (rev 1004)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/client/RecentActivityView.java	2010-03-12 13:06:43 UTC (rev 1005)
@@ -45,7 +45,8 @@
       // Chronoscope.enableHistorySupport(true);
       Chronoscope.setFontBookRendering(true);
       ChronoscopeOptions.setErrorReporting(true);
-      Chronoscope.setMicroformatsEnabled(true);
+      Chronoscope.setMicroformatsEnabled(false);
+      Chronoscope.setShowCredits(false);
       Chronoscope.initialize();
 
       Chronoscope chronoscope = Chronoscope.getInstance();
@@ -64,7 +65,7 @@
 
       final ChartPanel chartPanel = Chronoscope
           .createTimeseriesChart(dsArray, chartWidth, chartHeight);
-
+      
       chartPanel.setReadyListener(new ViewReadyCallback() {
         public void onViewReady(final View view) {
           /*Dataset dataset = datasets.get(0);

Modified: activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js
===================================================================
--- activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js	2010-03-12 11:41:27 UTC (rev 1004)
+++ activity-monitor/trunk/gui/war/src/main/java/org/jboss/bpm/monitor/gui/public/dataset.js	2010-03-12 13:06:43 UTC (rev 1005)
@@ -1,8 +1 @@
-var dataset = {
-"id": "OrderCheckoutProcess",
-"preferredRenderer": "line",
-"domain": [1267787761970,1267874161970,1267960561970,1268046961970,1268133361970,1268219761970,1268306161970],
-"range": [0,0,0,0,8,26,82],
-"label": "Process Instances last 7 days",
-"axis": "unit"
-}
+var dataset = {"id":"OrderCheckoutProcess","preferredRenderer": "line","domain": [1267789794540,1267876194540,1267962594540,1268048994540,1268135394540,1268221794540,1268308194540],"range" :[0,0,0,0,8,26,82],"label":"Process Instances last 7 days","axis":"Unit"}

Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java
===================================================================
--- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java	2010-03-12 11:41:27 UTC (rev 1004)
+++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/json/XYDataSetJSO.java	2010-03-12 13:06:43 UTC (rev 1005)
@@ -11,17 +11,13 @@
 public class XYDataSetJSO
 {
   /*
-  dataset = {
-    id: "unique id for this dataset",
-    mipped: true,
-    domain: [ [level 0 values], [level 1 values], ... ],  =>  [UTCTimeInMilliseconds_1, UTCtimeInMilliseconds_2, ...]
-    range: [ [level 0 values], [level 1 values], ... ],
-    rangeBottom: min over level 0 values,
-    rangeTop: max over level 0 values,
+ dataset = {
+    Id: "unique id for this dataset",
+    domain: [ UTCTimeInMilliseconds_1, UTCtimeInMilliseconds_2, ... ],
+    range: [ Value_1, Value_2, ... ],
     label: "default label for this dataset",
-    axis: "an axis identifier (usually units). Datasets with like axis ids
- share the same range Axis"
- }
+    axis: "unit"
+}
    */
 
   String id;
@@ -117,58 +113,46 @@
 
   public String toJSO()
   {
-    /*
-  dataset = {
-    id: "unique id for this dataset",
-    mipped: true,
-    domain: [ [level 0 values], [level 1 values], ... ],
-    range: [ [level 0 values], [level 1 values], ... ],
-    rangeBottom: min over level 0 values,
-    rangeTop: max over level 0 values,
-    label: "default label for this dataset",
-    axis: "an axis identifier (usually units). Datasets with like axis ids
- share the same range Axis"
- }*/
-
-
+   
     StringBuffer sb = new StringBuffer("{");
-    sb.append("id:\"").append(id).append("\",");
-    sb.append("mipped:").append(Boolean.valueOf(mipped).toString()).append(",");
+    sb.append("\"id\":\"").append(id).append("\",");
+    sb.append("\"preferredRenderer\": \"line\",");
+    //sb.append("mipped:").append(Boolean.valueOf(mipped).toString()).append(",");
 
-    sb.append("domain:[");
+    sb.append("\"domain\": [");
     int idx = 1;
     for(List<Long> list : domain)
     {
-      sb.append("[");
+      if(domain.size()>1)sb.append("[");
       for(Long d : list)
       {
         sb.append(d);
         if(idx<list.size()) sb.append(",");
         idx++;
       }
-      sb.append("]");
+      if(domain.size()>1)sb.append("]");
     }
     sb.append("],");
 
-    sb.append("range:[");
+    sb.append("\"range\" :[");
     idx = 1;
     for(List<Long> list : range)
     {
-      sb.append("[");
+      if(range.size()>1)sb.append("[");
       for(Long d : list)
       {
         sb.append(d);
         if(idx<list.size()) sb.append(",");
         idx++;
       }
-      sb.append("]");
+      if(range.size()>1)sb.append("]");
     }
     sb.append("],");
 
-    sb.append("rangeBottom:").append(rangeBottom).append(",");
-    sb.append("rangeTop:").append(rangeTop).append(",");
-    sb.append("label:\"").append(label).append("\",");
-    sb.append("axis:\"").append(label).append("\"");
+    //sb.append("\"rangeBottom\" :").append(rangeBottom).append(",");
+    //sb.append("\"rangeTop:\"").append(rangeTop).append(",");
+    sb.append("\"label\":\"").append(label).append("\",");
+    sb.append("\"axis\":\"").append("Unit").append("\"");
     sb.append("}");
     return sb.toString();
   }