Update to RAP 2.0M3
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java
index 19e4250..f1960fe 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java
@@ -21,7 +21,7 @@
import java.util.Date;
-import org.eclipse.rap.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.application.EntryPoint;
import org.eclipse.rap.rwt.visualization.google.AnnotatedTimeLine;
import org.eclipse.rap.rwt.visualization.google.AreaChart;
import org.eclipse.rap.rwt.visualization.google.BarChart;
@@ -49,7 +49,7 @@
* This class controls all aspects of the application's execution
* and is contributed through the plugin.xml.
*/
-public class Application implements IEntryPoint
+public class Application implements EntryPoint
{
public static Listener createSelectionListener () {
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChart.js b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChart.js
index 5a786d1..c38871f 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChart.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChart.js
@@ -131,7 +131,7 @@
this.selectedValue = dataTable.getValue(selObj.row, selObj.column);
//fire selection event
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(widgetId + ".selectedItem", this.selectedItem);
req.addParameter(widgetId + ".selectedRow", this.selectedRow);
req.addParameter(widgetId + ".selectedColumn", this.selectedColumn);
@@ -146,9 +146,12 @@
refreshWidgetData : function() {
try {
- var data = eval('(' + this.getWidgetData() + ')');
+ var jsonData = this.getWidgetData();
+ if (jsonData != null && jsonData != "") {
+ var data = eval('(' + jsonData + ')');
this._dataTable = new google.visualization.DataTable(data);
this.info("Setting data set to : "+this._dataTable);
+ }
}
catch (err) {
this.info("Attempted to set data but failed.");
@@ -190,11 +193,11 @@
//if (!org.eclipse.swt.EventUtil.getSuspended()) {
var wm = org.eclipse.swt.WidgetManager.getInstance();
var canvasId = wm.findIdByWidget(widget);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(canvasId + "." + field, value);
req.send();
//}
}
}
-} );
\ No newline at end of file
+} );
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/Geomap.js b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/Geomap.js
index c5e8cd2..63dca89 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/Geomap.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/Geomap.js
@@ -94,7 +94,7 @@
this.selectedItem = selection;
//fire selection event
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(widgetId + ".selectedItem", this.selectedItem);
req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
req.send();
@@ -148,7 +148,7 @@
//if (!org.eclipse.swt.EventUtil.getSuspended()) {
var wm = org.eclipse.swt.WidgetManager.getInstance();
var canvasId = wm.findIdByWidget(widget);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(canvasId + "." + field, value);
req.send();
//}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChart.js b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChart.js
index ee10ce7..4211a5b 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChart.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChart.js
@@ -126,7 +126,7 @@
//if (!org.eclipse.swt.EventUtil.getSuspended()) {
var wm = org.eclipse.swt.WidgetManager.getInstance();
var canvasId = wm.findIdByWidget(widget);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(canvasId + "." + field, value);
req.send();
//}
@@ -137,4 +137,4 @@
org.eclipse.rap.rwt.visualization.google.BaseChart.registerAdapter(
"org.eclipse.rap.rwt.visualization.google.MotionChart",
- org.eclipse.rap.rwt.visualization.google.MotionChart);
\ No newline at end of file
+ org.eclipse.rap.rwt.visualization.google.MotionChart);
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java b/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java
index 92a1136..cd3e8cf 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java
@@ -22,7 +22,9 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.rap.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.application.EntryPoint;
+import org.eclipse.rap.rwt.visualization.jit.AreaChart;
+import org.eclipse.rap.rwt.visualization.jit.BarChart;
import org.eclipse.rap.rwt.visualization.jit.AreaChart;
import org.eclipse.rap.rwt.visualization.jit.BarChart;
import org.eclipse.rap.rwt.visualization.jit.HyperTree;
@@ -52,7 +54,7 @@
* This class controls all aspects of the application's execution
* and is contributed through the plugin.xml.
*/
-public class Application implements IEntryPoint {
+public class Application implements EntryPoint {
public static Listener createSelectionListener () {
return new Listener()
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt.visualization.jit/META-INF/MANIFEST.MF
index 25739e8..9383d20 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@
org.eclipse.rap.ui.workbench,
org.eclipse.equinox.http.registry
Export-Package: org.eclipse.rap.rwt.visualization.jit
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/BaseVisualization.js b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/BaseVisualization.js
index a9084af..d6de86f 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/BaseVisualization.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/BaseVisualization.js
@@ -223,7 +223,32 @@
//if (!org.eclipse.swt.EventUtil.getSuspended()) {
var wm = org.eclipse.swt.WidgetManager.getInstance();
var canvasId = wm.findIdByWidget(widget);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
+ req.addParameter(canvasId + "." + field, value);
+ req.send();
+ //}
+ }
+ }
+
+} );
+ selectNode : function (id) {
+ try {
+ this.info("Forcing selection to : "+id);
+ var ht = this._viz;
+ if (ht != null) {
+ ht.onClick(id);
+ }
+ }
+ catch (e) {
+ this.info(e);
+ }
+ },
+
+ _sendResponse : function(widget, field, value) {
+ //if (!org.eclipse.swt.EventUtil.getSuspended()) {
+ var wm = org.eclipse.swt.WidgetManager.getInstance();
+ var canvasId = wm.findIdByWidget(widget);
+ var req = rwt.remote.Server.getInstance();
req.addParameter(canvasId + "." + field, value);
req.send();
//}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/hypertreekit/HyperTree.js b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/hypertreekit/HyperTree.js
index 90d0ebc..ee42a46 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/hypertreekit/HyperTree.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/hypertreekit/HyperTree.js
@@ -99,7 +99,7 @@
//qParent.selection = node;
//fire selection event
parent.info("Sending selected node: "+node.id);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(widgetId + ".selectedNode", node.id);
req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
req.send();
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/rgraphkit/RGraph.js b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/rgraphkit/RGraph.js
index 04088be..2f5a8b9 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/rgraphkit/RGraph.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/rgraphkit/RGraph.js
@@ -66,7 +66,7 @@
//qParent.selection = node;
//fire selection event
parent.info("Sending selected node: "+node.id);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(widgetId + ".selectedNode", node.id);
req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
req.send();
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTree.js b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTree.js
index 26f6e7c..cc8a284 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTree.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTree.js
@@ -106,7 +106,7 @@
// qParent.selection = node;
//fire selection event
parent.info("Sending selected node: "+node.id);
- var req = org.eclipse.swt.Request.getInstance();
+ var req = rwt.remote.Server.getInstance();
req.addParameter(widgetId + ".selectedNode", node.id);
req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
req.send();
diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/treemapkit/TreeMap.js b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/treemapkit/TreeMap.js
index 2da2d32..464934f 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/treemapkit/TreeMap.js
+++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/treemapkit/TreeMap.js
@@ -100,7 +100,7 @@
// var node = elem;
// qParent.selection = node;
// //fire selection event
-// var req = org.eclipse.swt.Request.getInstance();
+// var req = rwt.remote.Server.getInstance();
// req.addParameter(widgetId + ".selectedNode", node.id);
// req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
// req.send();
@@ -110,7 +110,7 @@
// this.out();
// qParent.selection = node;
// //fire selection event
-// var req = org.eclipse.swt.Request.getInstance();
+// var req = rwt.remote.Server.getInstance();
// req.addParameter(widgetId + ".selectedNode", this.shownTree.id);
// req.addEvent( "org.eclipse.swt.events.widgetSelected", widgetId );
// req.send();
@@ -148,4 +148,4 @@
org.eclipse.rap.rwt.visualization.jit.BaseVisualization.registerAdapter(
"org.eclipse.rap.rwt.visualization.jit.TreeMap",
- org.eclipse.rap.rwt.visualization.jit.TreeMap);
\ No newline at end of file
+ org.eclipse.rap.rwt.visualization.jit.TreeMap);
