Adds style to Cell.
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil.java
index f8e3e9f..35b3094 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil.java
@@ -51,7 +51,11 @@
}
public static String[] filterStyles( Widget widget, String... allowedStyles ) {
- List<String> containedStyles = findContainedStyles( widget, allowedStyles );
+ return filterStyles( widget.getStyle(), allowedStyles );
+ }
+
+ public static String[] filterStyles( int styles, String... allowedStyles ) {
+ List<String> containedStyles = findContainedStyles( styles, allowedStyles );
if( containedStyles.isEmpty() ) {
containedStyles.add( "NONE" );
}
@@ -59,14 +63,14 @@
return containedStyles.toArray( result );
}
- private static List<String> findContainedStyles( Widget widget, String... allowedStyles ) {
+ private static List<String> findContainedStyles( int styles, String... allowedStyles ) {
List<String> containedStyles = new ArrayList<String>();
for( String allowedStyle : allowedStyles ) {
Integer object = availableStyles.get( allowedStyle );
if( object == null ) {
throw new IllegalArgumentException( allowedStyle + " is not an existing SWT style" );
}
- if( ( widget.getStyle() & object.intValue() ) != 0 ) {
+ if( ( styles & object.intValue() ) != 0 ) {
containedStyles.add( allowedStyle );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/CellImpl.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/CellImpl.java
index dc6e417..d6bea77 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/CellImpl.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/CellImpl.java
@@ -21,6 +21,9 @@
public class CellImpl implements Cell {
+ static final String[] ALLOWED_STYLES = new String[] {
+ "TOP", "BOTTOM", "LEFT", "RIGHT", "CENTER", "FILL", "WRAP"
+ };
static final String PROPERTY_LEFT = "left";
static final String PROPERTY_TOP = "top";
static final String PROPERTY_RIGHT = "right";
@@ -36,11 +39,13 @@
private final Map<String, Object> attributes;
private final String type;
+ private final int style;
- public CellImpl( RowTemplate template, String type ) {
+ public CellImpl( RowTemplate template, String type, int style ) {
checkType( type );
checkTemplate( template );
this.type = type;
+ this.style = style;
this.attributes = new HashMap<String, Object>();
template.addCell( this );
}
@@ -61,6 +66,10 @@
return type;
}
+ public int getStyle() {
+ return style;
+ }
+
public Cell setName( String name ) {
checkNotNullOrEmpty( name );
attributes.put( PROPERTY_NAME, name );
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/Cells.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/Cells.java
index 938c7a5..e6b576b 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/Cells.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/Cells.java
@@ -13,6 +13,9 @@
import org.eclipse.swt.graphics.Image;
+/*
+ * Supported styles: SWT.TOP, SWT.BOTTOM, SWT.LEFT, SWT.RIGHT, SWT.CENTER, SWT.FILL, SWT.WRAP
+ */
public final class Cells {
static final String TYPE_IMAGE = "image";
@@ -20,27 +23,27 @@
static final String TYPE_TEXT = "text";
static final String PROPERTY_DEFAULT_TEXT = "defaultText";
- public static Cell createTextCell( RowTemplate template ) {
+ public static Cell createTextCell( RowTemplate template, int style ) {
checkNotNull( template, "RowTemplate" );
- CellImpl cell = new CellImpl( template, TYPE_TEXT );
+ CellImpl cell = new CellImpl( template, TYPE_TEXT, style );
return cell;
}
- public static Cell createTextCell( RowTemplate template, String defaultText ) {
- CellImpl cell = ( CellImpl )createTextCell( template );
+ public static Cell createTextCell( RowTemplate template, int style, String defaultText ) {
+ CellImpl cell = ( CellImpl )createTextCell( template, style );
checkNotNull( defaultText, "Text" );
cell.addAttribute( PROPERTY_DEFAULT_TEXT, defaultText );
return cell;
}
- public static Cell createImageCell( RowTemplate template ) {
+ public static Cell createImageCell( RowTemplate template, int style ) {
checkNotNull( template, "RowTemplate" );
- CellImpl cell = new CellImpl( template, TYPE_IMAGE );
+ CellImpl cell = new CellImpl( template, TYPE_IMAGE, style );
return cell;
}
- public static Cell createImageCell( RowTemplate template, Image image ) {
- CellImpl cell = ( CellImpl )createImageCell( template );
+ public static Cell createImageCell( RowTemplate template, int style, Image image ) {
+ CellImpl cell = ( CellImpl )createImageCell( template, style );
checkNotNull( image, "Image" );
cell.addAttribute( PROPERTY_DEFAULT_IMAGE, image );
return cell;
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer.java
index 64382b0..04687ca 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer.java
@@ -17,7 +17,9 @@
import org.eclipse.rap.json.JsonArray;
import org.eclipse.rap.json.JsonObject;
import org.eclipse.rap.json.JsonValue;
+import org.eclipse.rap.rwt.internal.protocol.JsonUtil;
import org.eclipse.rap.rwt.internal.protocol.ProtocolUtil;
+import org.eclipse.rap.rwt.internal.protocol.StylesUtil;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
@@ -28,6 +30,7 @@
public class TemplateSerializer {
private static final String PROPERTY_TYPE = "type";
+ private static final String PROPERTY_STYLE = "style";
private final RowTemplate template;
@@ -60,10 +63,16 @@
private void addCell( JsonArray serializedCells, CellImpl cell ) {
JsonObject serializedCell = new JsonObject();
serializedCell.add( PROPERTY_TYPE, cell.getType() );
+ addStyles( cell, serializedCell );
addAttributes( cell, serializedCell );
serializedCells.add( serializedCell );
}
+ private void addStyles( CellImpl cell, JsonObject serializedCell ) {
+ String[] styles = StylesUtil.filterStyles( cell.getStyle(), CellImpl.ALLOWED_STYLES );
+ serializedCell.add( PROPERTY_STYLE, JsonUtil.createJsonArray( styles ) );
+ }
+
private void addAttributes( CellImpl cell, JsonObject serializedCell ) {
Map<String, Object> attributes = cell.getAttributes();
for( Entry<String, Object> entry : attributes.entrySet() ) {
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil_Test.java
index 471cd6c..c21a47b 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/protocol/StylesUtil_Test.java
@@ -42,6 +42,14 @@
@Test
public void testHasOneStyle() {
+ String[] styles = StylesUtil.filterStyles( SWT.PUSH, new String[] { "PUSH" } );
+
+ assertEquals( 1, styles.length );
+ assertEquals( "PUSH", styles[ 0 ] );
+ }
+
+ @Test
+ public void testHasOneStyleWithWidget() {
Button button = new Button( shell, SWT.PUSH );
String[] styles = StylesUtil.filterStyles( button, new String[] { "PUSH" } );
@@ -52,6 +60,15 @@
@Test
public void testHasTwoStyles() {
+ String[] styles = StylesUtil.filterStyles( SWT.PUSH | SWT.BORDER, new String[] { "PUSH", "BORDER" } );
+
+ assertEquals( 2, styles.length );
+ assertEquals( "PUSH", styles[ 0 ] );
+ assertEquals( "BORDER", styles[ 1 ] );
+ }
+
+ @Test
+ public void testHasTwoStylesWithWidget() {
Button button = new Button( shell, SWT.PUSH | SWT.BORDER );
String[] styles = StylesUtil.filterStyles( button, new String[] { "PUSH", "BORDER" } );
@@ -63,6 +80,14 @@
@Test
public void testHasOnlyOneOfTwoPossibleStyles() {
+ String[] styles = StylesUtil.filterStyles( SWT.PUSH, new String[] { "PUSH", "BORDER" } );
+
+ assertEquals( 1, styles.length );
+ assertEquals( "PUSH", styles[ 0 ] );
+ }
+
+ @Test
+ public void testHasOnlyOneOfTwoPossibleStylesWithWidget() {
Button button = new Button( shell, SWT.PUSH );
String[] styles = StylesUtil.filterStyles( button, new String[] { "PUSH", "BORDER" } );
@@ -73,6 +98,14 @@
@Test
public void testHasNoAllowedStyles() {
+ String[] styles = StylesUtil.filterStyles( SWT.NONE, new String[] {} );
+
+ assertEquals( 1, styles.length );
+ assertEquals( "NONE", styles[ 0 ] );
+ }
+
+ @Test
+ public void testHasNoAllowedStylesWithWidget() {
Button button = new Button( shell, SWT.NONE );
String[] styles = StylesUtil.filterStyles( button, new String[] {} );
@@ -92,7 +125,24 @@
}
@Test
+ public void testNoneStylesWithWidget() {
+ String[] styles = StylesUtil.filterStyles( SWT.NONE, new String[] { "NO_RADIO_GROUP" } );
+
+ assertEquals( 1, styles.length );
+ assertEquals( "NONE", styles[ 0 ] );
+ }
+
+ @Test
public void testWithNonExistingStyle() {
+ try {
+ StylesUtil.filterStyles( SWT.NONE, new String[] { "FOO" } );
+ fail();
+ } catch( IllegalArgumentException expected ) {
+ }
+ }
+
+ @Test
+ public void testWithNonExistingStyleWithWidget() {
Button button = new Button( shell, SWT.NONE );
try {
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/CellImpl_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/CellImpl_Test.java
index af06817..2e11f2c 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/CellImpl_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/CellImpl_Test.java
@@ -15,6 +15,7 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -45,24 +46,37 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWithoutTemplate() {
- new CellImpl( null, "foo" );
+ new CellImpl( null, "foo", SWT.NONE );
}
@Test( expected = IllegalArgumentException.class )
public void testFailsWithoutType() {
- new CellImpl( new RowTemplate(), null );
+ new CellImpl( new RowTemplate(), null, SWT.NONE );
}
@Test( expected = IllegalArgumentException.class )
public void testFailsEmptyType() {
- new CellImpl( new RowTemplate(), "" );
+ new CellImpl( new RowTemplate(), "", SWT.NONE );
+ }
+
+ @Test
+ public void testHasAllAllowedStyles() {
+ List<String> styles = Arrays.asList( CellImpl.ALLOWED_STYLES );
+
+ assertTrue( styles.contains( "TOP" ) );
+ assertTrue( styles.contains( "BOTTOM" ) );
+ assertTrue( styles.contains( "LEFT" ) );
+ assertTrue( styles.contains( "RIGHT" ) );
+ assertTrue( styles.contains( "CENTER" ) );
+ assertTrue( styles.contains( "FILL" ) );
+ assertTrue( styles.contains( "WRAP" ) );
}
@Test
public void testAddsItselfToTemplate() {
RowTemplate template = new RowTemplate();
- Cell cell = new CellImpl( template, "foo" );
+ Cell cell = new CellImpl( template, "foo", SWT.NONE );
List<Cell> cells = template.getCells();
assertEquals( cells.size(), 1 );
@@ -71,7 +85,7 @@
@Test
public void testHasType() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
String type = cell.getType();
@@ -80,7 +94,7 @@
@Test
public void testNameIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object name = cell.getAttributes().get( CellImpl.PROPERTY_NAME );
@@ -89,21 +103,30 @@
@Test( expected = IllegalArgumentException.class )
public void testSetNameFailsWithNullName() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setName( null );
}
@Test( expected = IllegalArgumentException.class )
public void testSetNameFailsWithEmptyName() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setName( "" );
}
@Test
+ public void testSetsStyle() {
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.LEFT | SWT.FILL );
+
+ int style = cell.getStyle();
+
+ assertEquals( SWT.LEFT | SWT.FILL, style );
+ }
+
+ @Test
public void testSetsName() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setName( "bar" );
@@ -113,7 +136,7 @@
@Test
public void testSetNameReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setName( "bar" );
@@ -122,7 +145,7 @@
@Test
public void testSelectableIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object selectable = cell.getAttributes().get( CellImpl.PROPERTY_SELECTABLE );
@@ -131,7 +154,7 @@
@Test
public void testSetsSelectable() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setSelectable( true );
@@ -141,7 +164,7 @@
@Test
public void testSetSelectableReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setSelectable( true );
@@ -151,7 +174,7 @@
@Test
public void testSetsForeground() {
Color color = new Color( display, 100, 100, 100 );
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setForeground( color );
@@ -161,7 +184,7 @@
@Test( expected = IllegalArgumentException.class )
public void testSetForegroundFailsWithNull() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setForeground( null );
}
@@ -169,7 +192,7 @@
@Test
public void testSetForegroundReturnsCell() {
Color color = new Color( display, 100, 100, 100 );
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setForeground( color );
@@ -179,7 +202,7 @@
@Test
public void testSetsBackground() {
Color color = new Color( display, 100, 100, 100 );
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBackground( color );
@@ -189,7 +212,7 @@
@Test( expected = IllegalArgumentException.class )
public void testSetBackgroundFailsWithNull() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBackground( null );
}
@@ -197,7 +220,7 @@
@Test
public void testSetBackgroundReturnsCell() {
Color color = new Color( display, 100, 100, 100 );
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setBackground( color );
@@ -207,7 +230,7 @@
@Test
public void testSetsFont() {
Font font = new Font( display, "Arial", 22, SWT.NONE );
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setFont( font );
@@ -217,7 +240,7 @@
@Test( expected = IllegalArgumentException.class )
public void testSetFontFailsWithNull() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setFont( null );
}
@@ -225,7 +248,7 @@
@Test
public void testSetFontReturnsCell() {
Font font = new Font( display, "Arial", 22, SWT.NONE );
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setFont( font );
@@ -234,7 +257,7 @@
@Test
public void testBindingIndexIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object index = cell.getAttributes().get( CellImpl.PROPERTY_BINDING_INDEX );
@@ -243,7 +266,7 @@
@Test
public void testSetsBindingIndex() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBindingIndex( 1 );
@@ -253,7 +276,7 @@
@Test
public void testSetsBindingIndexToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBindingIndex( 0 );
@@ -263,7 +286,7 @@
@Test
public void testSetBindingIndexReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setBindingIndex( 1 );
@@ -272,14 +295,14 @@
@Test( expected = IllegalArgumentException.class )
public void testSetBindingIndexFailsWithNegativeBindingIndex() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBindingIndex( -1 );
}
@Test
public void testLeftIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object left = cell.getAttributes().get( CellImpl.PROPERTY_LEFT );
@@ -288,7 +311,7 @@
@Test
public void testSetsLeft() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setLeft( 23 );
@@ -298,7 +321,7 @@
@Test
public void testSetsLeftToNegative() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setLeft( -1 );
@@ -308,7 +331,7 @@
@Test
public void testSetsLeftToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setLeft( 0 );
@@ -318,7 +341,7 @@
@Test
public void testSetLeftReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setLeft( 23 );
@@ -327,7 +350,7 @@
@Test
public void testRightIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object right = cell.getAttributes().get( CellImpl.PROPERTY_RIGHT );
@@ -336,7 +359,7 @@
@Test
public void testSetsRight() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setRight( 23 );
@@ -346,7 +369,7 @@
@Test
public void testSetsRightToNegative() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setRight( -1 );
@@ -356,7 +379,7 @@
@Test
public void testSetsRightToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setRight( 0 );
@@ -366,7 +389,7 @@
@Test
public void testSetRightReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setRight( 23 );
@@ -375,7 +398,7 @@
@Test
public void testTopIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object top = cell.getAttributes().get( CellImpl.PROPERTY_TOP );
@@ -384,7 +407,7 @@
@Test
public void testSetsTop() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setTop( 23 );
@@ -394,7 +417,7 @@
@Test
public void testSetsTopToNegative() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setTop( -1 );
@@ -404,7 +427,7 @@
@Test
public void testSetsTopToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setTop( 0 );
@@ -414,7 +437,7 @@
@Test
public void testSetTopReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setTop( 23 );
@@ -423,7 +446,7 @@
@Test
public void testBottomIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object bottom = cell.getAttributes().get( CellImpl.PROPERTY_BOTTOM );
@@ -432,7 +455,7 @@
@Test
public void testSetsBottom() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBottom( 23 );
@@ -442,7 +465,7 @@
@Test
public void testSetsBottomToNegative() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBottom( -1 );
@@ -452,7 +475,7 @@
@Test
public void testSetsBottomToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBottom( 0 );
@@ -462,7 +485,7 @@
@Test
public void testSetBottomReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setBottom( 23 );
@@ -471,7 +494,7 @@
@Test
public void testWidthIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object width = cell.getAttributes().get( CellImpl.PROPERTY_WIDTH );
@@ -480,7 +503,7 @@
@Test
public void testSetsWidth() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setWidth( 23 );
@@ -490,7 +513,7 @@
@Test
public void testSetsWidthToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setWidth( 0 );
@@ -500,7 +523,7 @@
@Test
public void testSetWidthReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setWidth( 23 );
@@ -509,14 +532,14 @@
@Test( expected = IllegalArgumentException.class )
public void testSetWidthFailsWithNegativeValue() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setWidth( -23 );
}
@Test
public void testHeightIsNullByDefault() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object height = cell.getAttributes().get( CellImpl.PROPERTY_HEIGHT );
@@ -525,7 +548,7 @@
@Test
public void testSetsHeight() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setHeight( 23 );
@@ -535,7 +558,7 @@
@Test
public void testSetsHeightToZero() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setHeight( 0 );
@@ -545,7 +568,7 @@
@Test
public void testSetHeightReturnsCell() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Cell actualCell = cell.setHeight( 23 );
@@ -554,14 +577,14 @@
@Test( expected = IllegalArgumentException.class )
public void testSetHeightFailsWithNegativeValue() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setHeight( -23 );
}
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Left_Right_Width() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setLeft( 10 );
cell.setRight( 10 );
@@ -571,7 +594,7 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Width_Right_Left() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setWidth( 10 );
cell.setRight( 10 );
@@ -581,7 +604,7 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Width_Left_Right() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setLeft( 10 );
cell.setWidth( 10 );
@@ -591,7 +614,7 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Top_Bottom_Height() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setTop( 10 );
cell.setBottom( 10 );
@@ -601,7 +624,7 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Bottom_Height_Top() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setBottom( 10 );
cell.setHeight( 10 );
@@ -611,7 +634,7 @@
@Test( expected = IllegalArgumentException.class )
public void testFailsWith_Height_Top_Bottom() {
- Cell cell = new CellImpl( new RowTemplate(), "foo" );
+ Cell cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.setHeight( 10 );
cell.setTop( 10 );
@@ -621,7 +644,7 @@
@Test
public void testAddsAttribute() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object attribute = new Object();
cell.addAttribute( "foo", attribute );
@@ -633,7 +656,7 @@
@Test
public void testAddsAllAttribute() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object attribute1 = new Object();
Object attribute2 = new Object();
@@ -648,7 +671,7 @@
@Test
public void testAttributesAreSafeCopy() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Map<String, Object> attributes = cell.getAttributes();
cell.addAttribute( "foo", new Object() );
@@ -658,7 +681,7 @@
@Test( expected = IllegalArgumentException.class )
public void testAddAttributeFailsWithNullKey() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object attribute = new Object();
cell.addAttribute( null, attribute );
@@ -666,7 +689,7 @@
@Test( expected = IllegalArgumentException.class )
public void testAddAttributeFailsWithEmptyKey() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
Object attribute = new Object();
cell.addAttribute( "", attribute );
@@ -674,7 +697,7 @@
@Test( expected = IllegalArgumentException.class )
public void testAddAttributeFailsWithNullValue() {
- CellImpl cell = new CellImpl( new RowTemplate(), "foo" );
+ CellImpl cell = new CellImpl( new RowTemplate(), "foo", SWT.NONE );
cell.addAttribute( "foo", null );
}
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/Cells_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/Cells_Test.java
index 3338d7c..0608773 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/Cells_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/Cells_Test.java
@@ -15,6 +15,7 @@
import static org.junit.Assert.assertSame;
import org.eclipse.rap.rwt.testfixture.Fixture;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.junit.After;
@@ -39,28 +40,28 @@
@Test( expected = IllegalArgumentException.class )
public void testCreateTextCellFailsWithNullTemplateButWithText() {
- Cell cell = Cells.createTextCell( null, "text" );
+ Cell cell = Cells.createTextCell( null, SWT.NONE, "text" );
assertNotNull( cell );
}
@Test( expected = IllegalArgumentException.class )
public void testCreateTextCellFailsWithNullTemplate() {
- Cell cell = Cells.createTextCell( null );
+ Cell cell = Cells.createTextCell( null, SWT.NONE );
assertNotNull( cell );
}
@Test( expected = IllegalArgumentException.class )
public void testCreateTextCellFailsWithNullText() {
- Cell cell = Cells.createTextCell( new RowTemplate(), null );
+ Cell cell = Cells.createTextCell( new RowTemplate(), SWT.NONE, null );
assertNotNull( cell );
}
@Test
public void testCreateTextCellUsesTextTypeWithText() {
- CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), "text" );
+ CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), SWT.NONE, "text" );
String type = cell.getType();
@@ -69,7 +70,7 @@
@Test
public void testCreateTextCellUsesTextType() {
- CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate() );
+ CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), SWT.NONE );
String type = cell.getType();
@@ -77,15 +78,33 @@
}
@Test
+ public void testCreateTextCellSetsStyle() {
+ CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), SWT.TOP );
+
+ int style = cell.getStyle();
+
+ assertEquals( SWT.TOP, style );
+ }
+
+ @Test
+ public void testCreateTextCellWithTextSetsStyle() {
+ CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), SWT.TOP, "text" );
+
+ int style = cell.getStyle();
+
+ assertEquals( SWT.TOP, style );
+ }
+
+ @Test
public void testCreateTextCellReturnsCell() {
- Cell cell = Cells.createTextCell( new RowTemplate(), "text" );
+ Cell cell = Cells.createTextCell( new RowTemplate(), SWT.NONE, "text" );
assertNotNull( cell );
}
@Test
public void testCreateTextCellSetsTextAsAttribute() {
- CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), "foo" );
+ CellImpl cell = ( CellImpl )Cells.createTextCell( new RowTemplate(), SWT.NONE, "foo" );
Object text = cell.getAttributes().get( Cells.PROPERTY_DEFAULT_TEXT );
assertEquals( "foo", text );
@@ -93,28 +112,30 @@
@Test( expected = IllegalArgumentException.class )
public void testCreateImageCellFailsWithNullTemplateButWithImage() {
- Cell cell = Cells.createImageCell( null, createImage( Fixture.IMAGE_100x50 ) );
+ Cell cell = Cells.createImageCell( null, SWT.NONE, createImage( Fixture.IMAGE_100x50 ) );
assertNotNull( cell );
}
@Test( expected = IllegalArgumentException.class )
public void testCreateImageCellFailsWithNullTemplate() {
- Cell cell = Cells.createImageCell( null );
+ Cell cell = Cells.createImageCell( null, SWT.NONE );
assertNotNull( cell );
}
@Test( expected = IllegalArgumentException.class )
public void testCreateImageCellFailsWithNullImage() {
- Cell cell = Cells.createImageCell( new RowTemplate(), null );
+ Cell cell = Cells.createImageCell( new RowTemplate(), SWT.NONE, null );
assertNotNull( cell );
}
@Test
public void testCreateImageCellUsesImageTypeWithImage() {
- CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(), createImage( Fixture.IMAGE_100x50 ) );
+ CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(),
+ SWT.NONE,
+ createImage( Fixture.IMAGE_100x50 ) );
String type = cell.getType();
@@ -123,7 +144,7 @@
@Test
public void testCreateImageCellUsesImageType() {
- CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate() );
+ CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(), SWT.NONE );
String type = cell.getType();
@@ -131,8 +152,30 @@
}
@Test
+ public void testCreateImageCellSetsStyle() {
+ CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(), SWT.TOP );
+
+ int style = cell.getStyle();
+
+ assertEquals( SWT.TOP, style );
+ }
+
+ @Test
+ public void testCreateImageCellWithImageSetsStyle() {
+ CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(),
+ SWT.TOP,
+ createImage( Fixture.IMAGE_100x50 ) );
+
+ int style = cell.getStyle();
+
+ assertEquals( SWT.TOP, style );
+ }
+
+ @Test
public void testCreateImageCellReturnsCell() {
- Cell cell = Cells.createImageCell( new RowTemplate(), createImage( Fixture.IMAGE_100x50 ) );
+ Cell cell = Cells.createImageCell( new RowTemplate(),
+ SWT.NONE,
+ createImage( Fixture.IMAGE_100x50 ) );
assertNotNull( cell );
}
@@ -141,7 +184,7 @@
public void testCreateImageCellSetsImageAsAttribute() {
Image image = createImage( Fixture.IMAGE_100x50 );
- CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(), image );
+ CellImpl cell = ( CellImpl )Cells.createImageCell( new RowTemplate(), SWT.NONE, image );
Object attribtue = cell.getAttributes().get( Cells.PROPERTY_DEFAULT_IMAGE );
assertSame( image, attribtue );
diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer_Test.java
index c11b3ab..634171c 100644
--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer_Test.java
+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/rap/rwt/internal/template/TemplateSerializer_Test.java
@@ -62,7 +62,7 @@
@Test
public void testSerializesEmptyCell() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" );
+ new CellImpl( template, "foo", SWT.NONE );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -71,9 +71,38 @@
}
@Test
+ public void testSerializesCellStyle() {
+ RowTemplate template = new RowTemplate();
+ new CellImpl( template, "foo", SWT.TOP );
+ TemplateSerializer serializer = new TemplateSerializer( template );
+
+ JsonArray cells = serializer.toJson().asArray();
+
+ JsonObject cell = cells.get( 0 ).asObject();
+ JsonArray styles = cell.get( "style" ).asArray();
+ assertEquals( styles.size(), 1 );
+ assertEquals( styles.get( 0 ).asString(), "TOP" );
+ }
+
+ @Test
+ public void testSerializesCellStyles() {
+ RowTemplate template = new RowTemplate();
+ new CellImpl( template, "foo", SWT.TOP | SWT.FILL );
+ TemplateSerializer serializer = new TemplateSerializer( template );
+
+ JsonArray cells = serializer.toJson().asArray();
+
+ JsonObject cell = cells.get( 0 ).asObject();
+ JsonArray styles = cell.get( "style" ).asArray();
+ assertEquals( styles.size(), 2 );
+ assertEquals( styles.get( 0 ).asString(), "TOP" );
+ assertEquals( styles.get( 1 ).asString(), "FILL" );
+ }
+
+ @Test
public void testSerializesCellType() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" );
+ new CellImpl( template, "foo", SWT.NONE );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -85,7 +114,7 @@
@Test
public void testSerializesCellName() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" ).setName( "bar" );
+ new CellImpl( template, "foo", SWT.NONE ).setName( "bar" );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -97,7 +126,7 @@
@Test
public void testSerializesSelectable() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" ).setSelectable( true );
+ new CellImpl( template, "foo", SWT.NONE ).setSelectable( true );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -109,9 +138,9 @@
@Test
public void testSerializesAllCells() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" );
- new CellImpl( template, "foo" );
- new CellImpl( template, "foo" );
+ new CellImpl( template, "foo", SWT.NONE );
+ new CellImpl( template, "foo", SWT.NONE );
+ new CellImpl( template, "foo", SWT.NONE );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -122,7 +151,7 @@
@Test
public void testCellWith_Left_Top() {
RowTemplate template = new RowTemplate();
- Cell cell = new CellImpl( template, "foo" );
+ Cell cell = new CellImpl( template, "foo", SWT.NONE );
cell.setLeft( 23 );
cell.setTop( 42 );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -137,7 +166,7 @@
@Test
public void testCellWith_Left_Top_Wight_Height() {
RowTemplate template = new RowTemplate();
- Cell cell = new CellImpl( template, "foo" );
+ Cell cell = new CellImpl( template, "foo", SWT.NONE );
cell.setLeft( 23 );
cell.setTop( 42 );
cell.setWidth( 100 );
@@ -156,7 +185,7 @@
@Test
public void testCellWith_Right_Bottom() {
RowTemplate template = new RowTemplate();
- Cell cell = new CellImpl( template, "foo" );
+ Cell cell = new CellImpl( template, "foo", SWT.NONE );
cell.setRight( 23 );
cell.setBottom( 42 );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -171,7 +200,7 @@
@Test
public void testCellWith_Right_Bottom_Height_Width() {
RowTemplate template = new RowTemplate();
- Cell cell = new CellImpl( template, "foo" );
+ Cell cell = new CellImpl( template, "foo", SWT.NONE );
cell.setRight( 23 );
cell.setBottom( 42 );
cell.setWidth( 100 );
@@ -191,7 +220,7 @@
public void testCellWithForeground() {
RowTemplate template = new RowTemplate();
Color color = new Color( display, 255, 255, 255 );
- new CellImpl( template, "foo" ).setForeground( color );
+ new CellImpl( template, "foo", SWT.NONE ).setForeground( color );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -209,7 +238,7 @@
public void testCellWithBackground() {
RowTemplate template = new RowTemplate();
Color color = new Color( display, 255, 255, 255 );
- new CellImpl( template, "foo" ).setBackground( color );
+ new CellImpl( template, "foo", SWT.NONE ).setBackground( color );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -226,7 +255,7 @@
@Test
public void testSerializesCellWithFont() {
RowTemplate template = new RowTemplate();
- new CellImpl( template, "foo" ).setFont( new Font( display, "Arial", 22, SWT.NONE ) );
+ new CellImpl( template, "foo", SWT.NONE ).setFont( new Font( display, "Arial", 22, SWT.NONE ) );
TemplateSerializer serializer = new TemplateSerializer( template );
JsonArray cells = serializer.toJson().asArray();
@@ -243,7 +272,7 @@
@Test
public void testSerializesAllAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", "bar" );
cell.addAttribute( "foo1", "bar1" );
cell.addAttribute( "foo2", "bar2" );
@@ -260,7 +289,7 @@
@Test
public void testSerializesTextAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", "bar" );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -273,7 +302,7 @@
@Test
public void testSerializesImageAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", createImage( Fixture.IMAGE_100x50 ) );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -290,7 +319,7 @@
@Test
public void testSerializesColorAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", new Color( display, 255, 255, 255 ) );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -308,7 +337,7 @@
@Test
public void testSerializesRGBAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", new RGB( 255, 255, 255 ) );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -326,7 +355,7 @@
@Test
public void testSerializesFontAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", new Font( display, "Arial", 22, SWT.NONE ) );
TemplateSerializer serializer = new TemplateSerializer( template );
@@ -344,7 +373,7 @@
@Test
public void testSerializesFontDataAttribute() {
RowTemplate template = new RowTemplate();
- CellImpl cell = new CellImpl( template, "foo" );
+ CellImpl cell = new CellImpl( template, "foo", SWT.NONE );
cell.addAttribute( "foo", new Font( display, "Arial", 22, SWT.NONE ).getFontData()[ 0 ] );
TemplateSerializer serializer = new TemplateSerializer( template );
