Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAustin Riddle2012-08-14 16:38:32 +0000
committerAustin Riddle2012-08-14 16:38:32 +0000
commit9658c1fb8a4877b675c2bd9237352997f8d9576a (patch)
tree72c7be787f9f2a6df4d9b2d01178e62fe47f6b70
parent5b49d0c37094901c674d812598f8b1f9ef2235fd (diff)
downloadorg.eclipse.rap.incubator.visualization-9658c1fb8a4877b675c2bd9237352997f8d9576a.tar.gz
org.eclipse.rap.incubator.visualization-9658c1fb8a4877b675c2bd9237352997f8d9576a.tar.xz
org.eclipse.rap.incubator.visualization-9658c1fb8a4877b675c2bd9237352997f8d9576a.zip
refs bug 377242 - updated to new RAP 2.0 standards
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java24
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchAdvisor.java20
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchWindowAdvisor.java2
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/AnnotatedTimeLine.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Gauge.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Geomap.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/IntensityMap.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/MotionChart.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Table.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/VisualizationWidget.java3
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPIResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java10
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapLCA.java7
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java20
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java4
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartLCA.java9
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartLCA.java9
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableLCA.java9
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableResource.java1
-rw-r--r--bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/json/JSONGoogleDataTable.java9
38 files changed, 119 insertions, 69 deletions
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 73351df..19e4250 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
@@ -80,6 +80,7 @@ public class Application implements IEntryPoint
private MotionChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -106,6 +107,7 @@ public class Application implements IEntryPoint
viz.setToolTipText("Motion Chart");
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -118,6 +120,7 @@ public class Application implements IEntryPoint
private AnnotatedTimeLine viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -134,6 +137,7 @@ public class Application implements IEntryPoint
viz.setToolTipText("Annotated Timeline");
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -146,6 +150,7 @@ public class Application implements IEntryPoint
private AreaChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -160,6 +165,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -172,6 +178,7 @@ public class Application implements IEntryPoint
private BarChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -186,6 +193,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -198,6 +206,7 @@ public class Application implements IEntryPoint
private ColumnChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -211,6 +220,7 @@ public class Application implements IEntryPoint
viz.setWidgetData(dataTable.toString());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -223,6 +233,7 @@ public class Application implements IEntryPoint
private Gauge viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -235,6 +246,7 @@ public class Application implements IEntryPoint
viz.setWidgetData(dataTable.toString());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -247,6 +259,7 @@ public class Application implements IEntryPoint
private Geomap viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -260,6 +273,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -272,6 +286,7 @@ public class Application implements IEntryPoint
private IntensityMap viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -287,6 +302,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -299,6 +315,7 @@ public class Application implements IEntryPoint
private LineChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -315,6 +332,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -327,6 +345,7 @@ public class Application implements IEntryPoint
private PieChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -341,6 +360,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -353,6 +373,7 @@ public class Application implements IEntryPoint
private ScatterChart viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -368,6 +389,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
@@ -380,6 +402,7 @@ public class Application implements IEntryPoint
private Table viz;
+ @Override
public void createPartControl (Composite parent)
{
JSONGoogleDataTable dataTable = new JSONGoogleDataTable();
@@ -393,6 +416,7 @@ public class Application implements IEntryPoint
viz.addListener(SWT.Selection, createSelectionListener());
}
+ @Override
public void setFocus()
{
viz.setFocus();
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchAdvisor.java b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchAdvisor.java
index 72f03fe..61deae5 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchAdvisor.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchAdvisor.java
@@ -24,16 +24,16 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
* This workbench advisor creates the window advisor, and specifies the
* perspective id for the initial window.
*/
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor
-{
+public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
- public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)
- {
- return new ApplicationWorkbenchWindowAdvisor(configurer);
- }
+ @Override
+ public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( IWorkbenchWindowConfigurer configurer )
+ {
+ return new ApplicationWorkbenchWindowAdvisor( configurer );
+ }
- public String getInitialWindowPerspectiveId()
- {
- return PerspectiveFactory.class.getName();
- }
+ @Override
+ public String getInitialWindowPerspectiveId() {
+ return PerspectiveFactory.class.getName();
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchWindowAdvisor.java b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchWindowAdvisor.java
index cbd8596..086deda 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchWindowAdvisor.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/ApplicationWorkbenchWindowAdvisor.java
@@ -30,6 +30,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
super(configurer);
}
+ @Override
public void preWindowOpen() {
IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
configurer.setShowMenuBar(false);
@@ -39,6 +40,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
configurer.setTitle("Custom RAP Widgets Demo - Google Visualizations");
}
+ @Override
public void postWindowCreate() {
IWorkbenchWindow window = getWindowConfigurer().getWindow();
Shell shell = window.getShell();
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/AnnotatedTimeLine.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/AnnotatedTimeLine.java
index b580370..8e39c7b 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/AnnotatedTimeLine.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/AnnotatedTimeLine.java
@@ -85,6 +85,7 @@ public class AnnotatedTimeLine extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI () {
return ANNOTATED_TIMELINE_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Gauge.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Gauge.java
index ef088b2..aefa00b 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Gauge.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Gauge.java
@@ -80,6 +80,7 @@ public class Gauge extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI() {
return GAUGE_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Geomap.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Geomap.java
index 7bde472..e8726ce 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Geomap.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Geomap.java
@@ -84,6 +84,7 @@ public class Geomap extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI() {
return GEOMAP_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/IntensityMap.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/IntensityMap.java
index 6caaaa6..b1066cf 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/IntensityMap.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/IntensityMap.java
@@ -83,6 +83,7 @@ public class IntensityMap extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI() {
return INTENSITY_MAP_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/MotionChart.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/MotionChart.java
index 45471c8..4419ec0 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/MotionChart.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/MotionChart.java
@@ -92,6 +92,7 @@ public class MotionChart extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI() {
return MOTION_CHART_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Table.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Table.java
index c17af26..7efc2bc 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Table.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/Table.java
@@ -84,6 +84,7 @@ public class Table extends VisualizationWidget {
super( parent, style );
}
+ @Override
public String getGoogleAPI() {
return TABLE_API;
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/VisualizationWidget.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/VisualizationWidget.java
index 3ea45c8..7a6d5f6 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/VisualizationWidget.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/VisualizationWidget.java
@@ -46,6 +46,7 @@ public abstract class VisualizationWidget extends Composite {
protected VisualizationWidget( final Composite parent, final int style ) {
super( parent, style );
this.addControlListener(new ControlAdapter() {
+ @Override
public void controlResized(ControlEvent e)
{
Point psz = getSize();
@@ -83,6 +84,7 @@ public abstract class VisualizationWidget extends Composite {
/**
* Sets the layout of the widget. Calling this method has no effect.
*/
+ @Override
public void setLayout( final Layout layout ) {
//noop
}
@@ -127,6 +129,7 @@ public abstract class VisualizationWidget extends Composite {
* Asks this widget to perform a redraw which will update the visualization according to the
* current widget data and options.
*/
+ @Override
public void redraw() {
super.redraw();
dirty = true;
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChartResource.java
index 15e405a..36a2cae 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/BaseChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class BaseChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/BaseChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPIResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPIResource.java
index b054d7c..8616b26 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPIResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPIResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class CoreChartAPIResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/CoreChartAPI.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java
index 69f74c5..708a565 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java
@@ -14,15 +14,14 @@ package org.eclipse.rap.rwt.visualization.google.internal;
import java.io.IOException;
-import org.eclipse.rap.rwt.visualization.google.VisualizationWidget;
import org.eclipse.rap.rwt.internal.protocol.ClientObjectFactory;
import org.eclipse.rap.rwt.internal.protocol.IClientObject;
import org.eclipse.rap.rwt.lifecycle.AbstractWidgetLCA;
import org.eclipse.rap.rwt.lifecycle.ControlLCAUtil;
import org.eclipse.rap.rwt.lifecycle.IWidgetAdapter;
-import org.eclipse.rap.rwt.lifecycle.JSWriter;
import org.eclipse.rap.rwt.lifecycle.WidgetLCAUtil;
import org.eclipse.rap.rwt.lifecycle.WidgetUtil;
+import org.eclipse.rap.rwt.visualization.google.VisualizationWidget;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Widget;
@@ -38,6 +37,7 @@ import org.eclipse.swt.widgets.Widget;
* be told to redraw.
* </p>
*/
+@SuppressWarnings("restriction")
public abstract class VisualizationWidgetLCA extends AbstractWidgetLCA {
protected static final String REDRAW_FUNC = "redraw";
protected static final String PROP_DATA = "widgetData";
@@ -45,8 +45,9 @@ public abstract class VisualizationWidgetLCA extends AbstractWidgetLCA {
private static final String[] ALLOWED_STYLES = new String[] { "BORDER" };
- public abstract Class getWidgetType();
+ public abstract Class<?> getWidgetType();
+ @Override
public void renderInitialization( final Widget widget ) throws IOException {
Control control = (Control)widget;
IClientObject clientObject = ClientObjectFactory.getClientObject( control );
@@ -56,6 +57,7 @@ public abstract class VisualizationWidgetLCA extends AbstractWidgetLCA {
clientObject.set( "style", WidgetLCAUtil.getStyles( control, ALLOWED_STYLES ) );
}
+ @Override
public void preserveValues( final Widget widget ) {
ControlLCAUtil.preserveValues( (Control)widget );
WidgetLCAUtil.preserveCustomVariant( widget );
@@ -65,6 +67,7 @@ public abstract class VisualizationWidgetLCA extends AbstractWidgetLCA {
adapter.preserve( PROP_DATA, ( ( VisualizationWidget )widget ).getWidgetData() );
}
+ @Override
public void renderChanges( final Widget widget ) throws IOException {
ControlLCAUtil.renderChanges( ( Control )widget );
WidgetLCAUtil.renderCustomVariant( widget );
@@ -87,6 +90,7 @@ public abstract class VisualizationWidgetLCA extends AbstractWidgetLCA {
}
}
+ @Override
public void renderDispose( final Widget widget ) throws IOException {
ClientObjectFactory.getClientObject( widget ).destroy();
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineLCA.java
index fef715b..af66217 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineLCA.java
@@ -16,8 +16,9 @@ import org.eclipse.rap.rwt.visualization.google.AnnotatedTimeLine;
import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class AnnotatedTimeLineLCA extends VisualizationWidgetLCA {
-
- public Class getWidgetType () {
- return AnnotatedTimeLine.class;
+
+ @Override
+ public Class<?> getWidgetType() {
+ return AnnotatedTimeLine.class;
}
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineResource.java
index 309deaf..1011cde 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLineResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class AnnotatedTimeLineResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/annotatedtimelinekit/AnnotatedTimeLine.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartLCA.java
index 17c0f1a..f04d881 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class AreaChartLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return AreaChart.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return AreaChart.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartResource.java
index 23661a6..ea56ae0 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class AreaChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/areachartkit/AreaChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartLCA.java
index 36f68c3..6d38cfa 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class BarChartLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return BarChart.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return BarChart.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartResource.java
index 8e371dc..dae63b0 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class BarChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/barchartkit/BarChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartLCA.java
index 626900d..00a9232 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class ColumnChartLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return ColumnChart.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return ColumnChart.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartResource.java
index 579d828..1681ced 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class ColumnChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/columnchartkit/ColumnChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeLCA.java
index e33c16f..c4cb15f 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class GaugeLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return Gauge.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return Gauge.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeResource.java
index 91ded20..dbae037 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/gaugekit/GaugeResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class GaugeResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/gaugekit/Gauge.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapLCA.java
index 9218835..9a6aab4 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class GeomapLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return Geomap.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return Geomap.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapResource.java
index 202f855..1796279 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/geomapkit/GeomapResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class GeomapResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/geomapkit/Geomap.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapLCA.java
index 15f6b4e..5a53b3c 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapLCA.java
@@ -17,7 +17,8 @@ import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class IntensityMapLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
- return IntensityMap.class;
- }
+ @Override
+ public Class<?> getWidgetType() {
+ return IntensityMap.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapResource.java
index 3b5f5c1..8a3d49d 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMapResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class IntensityMapResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/intensitymapkit/IntensityMap.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java
index e75d67a..e0a67ab 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java
@@ -12,29 +12,13 @@
******************************************************************************/
package org.eclipse.rap.rwt.visualization.google.internal.linechartkit;
-import java.io.IOException;
-
-import org.eclipse.rap.rwt.lifecycle.ControlLCAUtil;
-import org.eclipse.rap.rwt.lifecycle.JSWriter;
import org.eclipse.rap.rwt.visualization.google.LineChart;
import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
-import org.eclipse.swt.widgets.Widget;
public class LineChartLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
+ @Override
+ public Class<?> getWidgetType() {
return LineChart.class;
}
-
- public void renderChanges( final Widget widget ) throws IOException {
- super.renderChanges(widget);
- LineChart vWidget = ( LineChart )widget;
- ControlLCAUtil.writeChanges( vWidget );
- JSWriter writer = JSWriter.getWriterFor( vWidget );
- //HACK to force redraw when requested
- if (vWidget.isDirty()) {
- writer.call( REDRAW_FUNC, null );
- vWidget.setDirty(false);
- }
- }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartResource.java
index df0b462..bb9559b 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class LineChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java
index be663c2..d9815e1 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java
@@ -19,10 +19,12 @@ import org.eclipse.swt.widgets.Widget;
public class MotionChartLCA extends VisualizationWidgetLCA {
- public Class getWidgetType () {
+ @Override
+ public Class<?> getWidgetType() {
return MotionChart.class;
}
+ @Override
public void readData(Widget widget) {
super.readData(widget);
if (widget==null) return;
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartResource.java
index e191586..0b4084d 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class MotionChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartLCA.java
index aedeb02..e6ef645 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartLCA.java
@@ -16,8 +16,9 @@ import org.eclipse.rap.rwt.visualization.google.PieChart;
import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class PieChartLCA extends VisualizationWidgetLCA {
-
- public Class getWidgetType () {
- return PieChart.class;
- }
+
+ @Override
+ public Class<?> getWidgetType() {
+ return PieChart.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartResource.java
index 76a104c..8a2c382 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class PieChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/piechartkit/PieChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartLCA.java
index 9f2a391..1704ca0 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartLCA.java
@@ -16,8 +16,9 @@ import org.eclipse.rap.rwt.visualization.google.ScatterChart;
import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class ScatterChartLCA extends VisualizationWidgetLCA {
-
- public Class getWidgetType () {
- return ScatterChart.class;
- }
+
+ @Override
+ public Class<?> getWidgetType() {
+ return ScatterChart.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartResource.java
index 4eeca66..a2f48af 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChartResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class ScatterChartResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/scatterchartkit/ScatterChart.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableLCA.java
index 171471a..4ab5bb6 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableLCA.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableLCA.java
@@ -16,8 +16,9 @@ import org.eclipse.rap.rwt.visualization.google.Table;
import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA;
public class TableLCA extends VisualizationWidgetLCA {
-
- public Class getWidgetType () {
- return Table.class;
- }
+
+ @Override
+ public Class<?> getWidgetType() {
+ return Table.class;
+ }
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableResource.java
index 5bac337..164ccb2 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableResource.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/tablekit/TableResource.java
@@ -14,6 +14,7 @@ import org.eclipse.rap.rwt.visualization.google.internal.GoogleVisualizationReso
public class TableResource extends GoogleVisualizationResource {
+ @Override
public String getLocation() {
return "org/eclipse/rap/rwt/visualization/google/internal/tablekit/Table.js";
}
diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/json/JSONGoogleDataTable.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/json/JSONGoogleDataTable.java
index 846e16f..10f58fc 100644
--- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/json/JSONGoogleDataTable.java
+++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/json/JSONGoogleDataTable.java
@@ -189,10 +189,11 @@ public class JSONGoogleDataTable {
* Date objects are processed according to Google visualization requirements.
*/
//HACK [ar] : accomodation for bug 305278 - this is a bypass of JSONObject.toString().
+ @Override
public String toString() {
try {
JSONObject table = createTable();
- Iterator keys = table.keys();
+ Iterator<?> keys = table.keys();
StringBuffer sb = new StringBuffer("{");
while (keys.hasNext()) {
@@ -271,10 +272,10 @@ public class JSONGoogleDataTable {
return dateToString((Date)value);
}
if (value instanceof Map) {
- return new JSONObject((Map)value).toString();
+ return new JSONObject((Map<?,?>)value).toString();
}
if (value instanceof Collection) {
- return new JSONArray((Collection)value).toString();
+ return new JSONArray((Collection<?>)value).toString();
}
if (value.getClass().isArray()) {
return new JSONArray(value).toString();
@@ -309,7 +310,7 @@ public class JSONGoogleDataTable {
//HACK [ar] : accomodation for bug 305278 - this is a bypass of JSONObject.toString().
private static String jsonObjectToString (JSONObject jObj) {
try {
- Iterator keys = jObj.keys();
+ Iterator<?> keys = jObj.keys();
StringBuffer sb = new StringBuffer("{");
while (keys.hasNext()) {

Back to the top