Minor code formatting adjustments
Change-Id: I0d19da42d532bdc4450d7fb805ea1749bf7af86a
diff --git a/bundles/org.eclipse.rap.addons.chart/js/chart/nv/nv-line.js b/bundles/org.eclipse.rap.addons.chart/js/chart/nv/nv-line.js
index af394fc..3d70516 100644
--- a/bundles/org.eclipse.rap.addons.chart/js/chart/nv/nv-line.js
+++ b/bundles/org.eclipse.rap.addons.chart/js/chart/nv/nv-line.js
@@ -11,8 +11,8 @@
rwt.chart.register( "nv-line", function( widget ) {
var chart = nv.models.lineChart();
- chart.xAxis.tickFormat( d3.format("d" ) );
- chart.yAxis.tickFormat( d3.format("d" ) );
+ chart.xAxis.tickFormat( d3.format( "d" ) );
+ chart.yAxis.tickFormat( d3.format( "d" ) );
chart.lines.dispatch.on( "elementClick", function( item ) {
widget.notifySelection( item.seriesIndex, item.pointIndex );
});
diff --git a/tests/org.eclipse.rap.addons.chart.test/js/chart/chart-spec.js b/tests/org.eclipse.rap.addons.chart.test/js/chart/chart-spec.js
index 6ca198c..ef1bee0 100644
--- a/tests/org.eclipse.rap.addons.chart.test/js/chart/chart-spec.js
+++ b/tests/org.eclipse.rap.addons.chart.test/js/chart/chart-spec.js
@@ -39,8 +39,8 @@
getClientArea: function() { return [ 20, 30, 200, 300 ]; }
};
renderer = jasmine.createSpy();
- renderer.width = jasmine.createSpy().and.returnValue(renderer);
- renderer.height = jasmine.createSpy().and.returnValue(renderer);
+ renderer.width = jasmine.createSpy().and.returnValue( renderer );
+ renderer.height = jasmine.createSpy().and.returnValue( renderer );
generator = function() { return renderer; };
captor = [];
} );
@@ -51,8 +51,8 @@
chart = new rwt.chart.Chart( parent, generator );
expect( parent.append ).toHaveBeenCalled();
- expect( parent.append.calls.mostRecent().args[0] ).toEqual(jasmine.any(Element));
- expect( parent.append.calls.mostRecent().args[0].tagName ).toBe("DIV");
+ expect( parent.append.calls.mostRecent().args[0] ).toEqual( jasmine.any( Element ) );
+ expect( parent.append.calls.mostRecent().args[0].tagName ).toBe( "DIV" );
} );
describe( "svg element", function() {
diff --git a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/BarChart_Test.java b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/BarChart_Test.java
index 0cba0e6..63d8672 100644
--- a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/BarChart_Test.java
+++ b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/BarChart_Test.java
@@ -94,7 +94,7 @@
String expected = "[ { \"values\": [ { \"value\": 23, \"label\": \"foo\" },"
+ "{ \"value\": 42, \"label\": \"bar\" } ] } ]";
- verify( remoteObject ).set( "items", JsonValue.readFrom(expected) );
+ verify( remoteObject ).set( "items", JsonValue.readFrom( expected ) );
}
private Connection fakeConnection( RemoteObject remoteObject ) {
diff --git a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineChart_Test.java b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineChart_Test.java
index 7fdc1ff..dc8dfb9 100644
--- a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineChart_Test.java
+++ b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineChart_Test.java
@@ -150,10 +150,10 @@
public void testSetItems() {
reset( remoteObject );
- chart.setItems( new LineItem( new DataPoint[] { new DataPoint(1, 2),
- new DataPoint(3, 4) }, "foo" ),
- new LineItem( new DataPoint[] { new DataPoint(2, 4),
- new DataPoint(6, 8) }, "bar" ) );
+ chart.setItems( new LineItem( new DataPoint[] { new DataPoint( 1, 2 ),
+ new DataPoint( 3, 4 ) }, "foo" ),
+ new LineItem( new DataPoint[] { new DataPoint( 2, 4 ),
+ new DataPoint( 6, 8 ) }, "bar" ) );
String expected = "[{ \"values\": [{ \"x\": 1, \"y\": 2 },"
+ "{ \"x\": 3, \"y\": 4 }], \"key\": \"foo\" },"
diff --git a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineItem_Test.java b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineItem_Test.java
index 2d0eabf..0f61ae5 100644
--- a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineItem_Test.java
+++ b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/LineItem_Test.java
@@ -22,7 +22,7 @@
@Test
public void testToJson() {
- DataPoint[] points = new DataPoint[] { new DataPoint(1, 2), new DataPoint(3, 4) };
+ DataPoint[] points = new DataPoint[] { new DataPoint( 1, 2 ), new DataPoint( 3, 4 ) };
LineItem item = new LineItem( points, "foo", new RGB( 0, 8, 128 ) );
JsonObject json = item.toJson();
@@ -35,7 +35,7 @@
@Test
public void testToJson_skipsMissingColor() {
- DataPoint[] points = new DataPoint[] { new DataPoint(1, 2), new DataPoint(3, 4) };
+ DataPoint[] points = new DataPoint[] { new DataPoint( 1, 2 ), new DataPoint( 3, 4 ) };
LineItem item = new LineItem( points, "foo" );
JsonObject json = item.toJson();
@@ -47,7 +47,7 @@
@Test
public void testToJson_skipsMissingText() {
- DataPoint[] points = new DataPoint[] { new DataPoint(1, 2), new DataPoint(3, 4) };
+ DataPoint[] points = new DataPoint[] { new DataPoint( 1, 2 ), new DataPoint( 3, 4 ) };
LineItem item = new LineItem( points, null, new RGB( 0, 8, 128 ) );
JsonObject json = item.toJson();
diff --git a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/PieChart_Test.java b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/PieChart_Test.java
index 2cbabbe..a00bc66 100644
--- a/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/PieChart_Test.java
+++ b/tests/org.eclipse.rap.addons.chart.test/src/org/eclipse/rap/addons/chart/basic/PieChart_Test.java
@@ -115,7 +115,7 @@
String expected = "[{ \"value\": 23, \"label\": \"foo\" },"
+ "{ \"value\": 42, \"label\": \"bar\" }]";
- verify( remoteObject ).set( "items", JsonValue.readFrom(expected) );
+ verify( remoteObject ).set( "items", JsonValue.readFrom( expected ) );
}
private Connection fakeConnection( RemoteObject remoteObject ) {
