From 19bacc384a579598ebe075378a82d9212757a1e7 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Tue, 5 Oct 2010 06:05:33 +0000 Subject: [PATCH] #5692 Generics and warnings cleanup: Ticket tests (with slight modifications from patch) svn changeset:15385/svn branch:6.5 --- .../vaadin/tests/tickets/Ticket1362Login.java | 25 +++++++++---------- .../tickets/Ticket1506_TestContainer.java | 16 ++++++------ .../tickets/Ticket1506_TestContainer2.java | 14 +++++------ .../com/vaadin/tests/tickets/Ticket1710.java | 20 +++++++-------- .../com/vaadin/tests/tickets/Ticket1804.java | 10 ++++---- .../com/vaadin/tests/tickets/Ticket1811.java | 12 ++++----- .../com/vaadin/tests/tickets/Ticket1819.java | 10 ++++---- .../com/vaadin/tests/tickets/Ticket1869.java | 2 -- .../com/vaadin/tests/tickets/Ticket1878.java | 7 +++--- .../com/vaadin/tests/tickets/Ticket1921.java | 4 +-- .../com/vaadin/tests/tickets/Ticket1966.java | 2 +- .../vaadin/tests/tickets/Ticket1966_2.java | 2 +- .../com/vaadin/tests/tickets/Ticket1970.java | 5 ++-- .../com/vaadin/tests/tickets/Ticket1982.java | 10 ++++---- .../com/vaadin/tests/tickets/Ticket2181.java | 1 + .../com/vaadin/tests/tickets/Ticket2204.java | 10 ++++---- .../com/vaadin/tests/tickets/Ticket2244.java | 7 +++--- .../com/vaadin/tests/tickets/Ticket3146.java | 4 +-- .../com/vaadin/tests/tickets/Ticket677.java | 2 +- .../com/vaadin/tests/tickets/Ticket736.java | 4 +-- 20 files changed, 84 insertions(+), 83 deletions(-) diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java index 6d20b7c1cd..5541b7259f 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java @@ -89,23 +89,22 @@ public class Ticket1362Login extends Application { private ParameterHandler paramHandler = new ParameterHandler() { - public void handleParameters(Map parameters) { + public void handleParameters(Map parameters) { if (parameters.containsKey("username")) { getWindow().addURIHandler(uriHandler); - HashMap params = new HashMap(); + HashMap params = new HashMap(); // expecting single params - for (Iterator it = parameters.keySet().iterator(); it + for (Iterator it = parameters.keySet().iterator(); it .hasNext();) { - String key = (String) it.next(); - String value = ((String[]) parameters.get(key))[0]; + String key = it.next(); + String value = (parameters.get(key))[0]; params.put(key, value); } LoginEvent event = new LoginEvent(params); - for (Iterator iterator = listeners.iterator(); iterator - .hasNext();) { - LoginListener listener = (LoginListener) iterator - .next(); + for (Iterator iterator = listeners + .iterator(); iterator.hasNext();) { + LoginListener listener = iterator.next(); listener.onLogin(event); } } @@ -125,7 +124,7 @@ public class Ticket1362Login extends Application { } }; - private LinkedList listeners = new LinkedList(); + private LinkedList listeners = new LinkedList(); private Window window; @@ -159,9 +158,9 @@ public class Ticket1362Login extends Application { */ public class LoginEvent { - private Map params; + private Map params; - private LoginEvent(Map params) { + private LoginEvent(Map params) { this.params = params; } @@ -173,7 +172,7 @@ public class Ticket1362Login extends Application { */ public String getLoginParameter(String name) { if (params.containsKey(name)) { - return (String) params.get(name); + return params.get(name); } else { return null; } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java index 071a5130b8..b8b6cfe5dd 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java @@ -16,7 +16,7 @@ import com.vaadin.data.util.PropertysetItem; * @version $Revision$, $Date$ */ public class Ticket1506_TestContainer implements Container { - private Map items = new HashMap(); + private Map items = new HashMap(); public static final String ITEM_1_ID = "1"; public static final String ITEM_2_ID = "2"; public static final String PROPERTY_1_ID = "property 1"; @@ -42,24 +42,24 @@ public class Ticket1506_TestContainer implements Container { if (items.isEmpty()) { loadItems(); } - return (Item) items.get(itemId); + return items.get(itemId); } - public Collection getContainerPropertyIds() { + public Collection getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); } - ArrayList a = new ArrayList(); + ArrayList a = new ArrayList(); a.add(PROPERTY_1_ID); a.add(PROPERTY_2_ID); return a; } - public Collection getItemIds() { + public Collection getItemIds() { if (items.isEmpty()) { loadItems(); } - ArrayList a = new ArrayList(); + ArrayList a = new ArrayList(); a.add(ITEM_1_ID); a.add(ITEM_2_ID); return a; @@ -69,14 +69,14 @@ public class Ticket1506_TestContainer implements Container { if (items.isEmpty()) { loadItems(); } - Item item = (Item) items.get(itemId); + Item item = items.get(itemId); if (item != null) { return item.getItemProperty(propertyId); } return null; } - public Class getType(Object propertyId) { + public Class getType(Object propertyId) { if (items.isEmpty()) { loadItems(); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java index 4a4c846ed0..c39454027a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java @@ -16,7 +16,7 @@ import com.vaadin.data.util.PropertysetItem; * @version $Revision$, $Date$ */ public class Ticket1506_TestContainer2 implements Container { - private Map items = new HashMap(); + private Map items = new HashMap(); public static final String ITEM_1_ID = "1"; public static final String ITEM_2_ID = "2"; public static final String PROPERTY_1_ID = "property 1"; @@ -37,20 +37,20 @@ public class Ticket1506_TestContainer2 implements Container { if (items.isEmpty()) { loadItems(); } - return (Item) items.get(itemId); + return items.get(itemId); } - public Collection getContainerPropertyIds() { + public Collection getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); } - ArrayList a = new ArrayList(); + ArrayList a = new ArrayList(); a.add(PROPERTY_1_ID); a.add(PROPERTY_2_ID); return a; } - public Collection getItemIds() { + public Collection getItemIds() { if (items.isEmpty()) { loadItems(); } @@ -61,14 +61,14 @@ public class Ticket1506_TestContainer2 implements Container { if (items.isEmpty()) { loadItems(); } - Item item = (Item) items.get(itemId); + Item item = items.get(itemId); if (item != null) { return item.getItemProperty(propertyId); } return null; } - public Class getType(Object propertyId) { + public Class getType(Object propertyId) { if (items.isEmpty()) { loadItems(); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/src/com/vaadin/tests/tickets/Ticket1710.java index 76e065a395..f0d0476d08 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1710.java @@ -1,7 +1,6 @@ package com.vaadin.tests.tickets; import java.util.Iterator; -import java.util.LinkedList; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; @@ -28,8 +27,7 @@ import com.vaadin.ui.Window; public class Ticket1710 extends com.vaadin.Application { - LinkedList listOfAllFields = new LinkedList(); - + @Override public void init() { setTheme("tests-tickets"); @@ -92,7 +90,7 @@ public class Ticket1710 extends com.vaadin.Application { elp.setVisible(false); el.setHeight(700); addFields(el); - Component firstComponent = (Component) el.getComponentIterator().next(); + Component firstComponent = el.getComponentIterator().next(); firstComponent.setSizeFull(); el.expand(firstComponent); lo.addComponent(elp); @@ -106,8 +104,7 @@ public class Ticket1710 extends com.vaadin.Application { elh.setWidth(2000); elh.setHeight(100); addFields(elh); - Component firstComponentElh = (Component) elh.getComponentIterator() - .next(); + Component firstComponentElh = elh.getComponentIterator().next(); firstComponentElh.setSizeFull(); elh.expand(firstComponentElh); lo.addComponent(elhp); @@ -129,7 +126,8 @@ public class Ticket1710 extends com.vaadin.Application { formPanel.addComponent(getFormPanelExample()); lo.addComponent(formPanel); - for (Iterator i = hidingControls.getComponentIterator(); i.hasNext();) { + for (Iterator i = hidingControls.getComponentIterator(); i + .hasNext();) { ((AbstractComponent) i.next()).setImmediate(true); } @@ -304,7 +302,8 @@ public class Ticket1710 extends com.vaadin.Application { testedLayout.setStyleName("tested-layout"); setStyleName("layout-testing-panel"); - for (Iterator i = controls.getComponentIterator(); i.hasNext();) { + for (Iterator i = controls.getComponentIterator(); i + .hasNext();) { ((AbstractComponent) i.next()).setImmediate(true); } } @@ -387,9 +386,10 @@ public class Ticket1710 extends com.vaadin.Application { } private void updateAlignments(int h, int v) { - for (Iterator i = testedLayout.getComponentIterator(); i.hasNext();) { + for (Iterator i = testedLayout.getComponentIterator(); i + .hasNext();) { ((Layout.AlignmentHandler) testedLayout).setComponentAlignment( - (Component) i.next(), h, v); + i.next(), h, v); } } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/src/com/vaadin/tests/tickets/Ticket1804.java index 92aa8587f4..8d8740895d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1804.java @@ -16,7 +16,7 @@ import com.vaadin.ui.Window; public class Ticket1804 extends com.vaadin.Application { - LinkedList listOfAllFields = new LinkedList(); + LinkedList(); @Override public void init() { @@ -73,8 +73,8 @@ public class Ticket1804 extends com.vaadin.Application { s.setComponentError(new SystemError("Test error message")); listOfAllFields.add(s); - for (Iterator i = listOfAllFields.iterator(); i.hasNext();) { - s = (Select) i.next(); + for (Iterator i = listOfAllFields.iterator(); i .hasNext();) { - AbstractField af = (AbstractField) i.next(); + AbstractField af = i.next(); msg.append("

" + af.getCaption() + "

\n"); msg.append("Value=" + af.getValue() + "
\n"); if (af.isValid()) { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1811.java b/tests/src/com/vaadin/tests/tickets/Ticket1811.java index 35c3992bf0..307db4f47a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1811.java @@ -13,7 +13,7 @@ import com.vaadin.ui.Window; public class Ticket1811 extends com.vaadin.Application { - LinkedList listOfAllFields = new LinkedList(); + LinkedList listOfAllFields = new LinkedList(); @Override public void init() { @@ -44,8 +44,8 @@ public class Ticket1811 extends com.vaadin.Application { tf4.addValidator(strLenValidator); listOfAllFields.add(tf4); - for (Iterator i = listOfAllFields.iterator(); i.hasNext();) { - TextField tf = (TextField) i.next(); + for (Iterator i = listOfAllFields.iterator(); i.hasNext();) { + TextField tf = i.next(); main.addComponent(tf); tf.setImmediate(true); } @@ -56,9 +56,9 @@ public class Ticket1811 extends com.vaadin.Application { public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); - for (java.util.Iterator i = listOfAllFields.iterator(); i - .hasNext();) { - TextField tf = (TextField) i.next(); + for (Iterator i = listOfAllFields + .iterator(); i.hasNext();) { + TextField tf = i.next(); msg.append("

" + tf.getCaption() + "

\n"); if (tf.isValid()) { msg.append("VALID\n
"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1819.java b/tests/src/com/vaadin/tests/tickets/Ticket1819.java index 836d6b4ae9..6f06055fc4 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1819.java @@ -12,7 +12,7 @@ import com.vaadin.ui.Window; public class Ticket1819 extends com.vaadin.Application { - LinkedList listOfAllFields = new LinkedList(); + LinkedList(); @Override public void init() { @@ -30,8 +30,8 @@ public class Ticket1819 extends com.vaadin.Application { s.setNullSelectionAllowed(false); listOfAllFields.add(s); - for (Iterator i = listOfAllFields.iterator(); i.hasNext();) { - s = (Select) i.next(); + for (Iterator i = listOfAllFields.iterator(); i .hasNext();) { - AbstractField af = (AbstractField) i.next(); + AbstractField af = i.next(); msg.append("

" + af.getCaption() + "

\n"); msg.append("Value=" + af.getValue() + "
\n"); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1869.java b/tests/src/com/vaadin/tests/tickets/Ticket1869.java index 6c101441a6..452006b201 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1869.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1869.java @@ -10,8 +10,6 @@ import com.vaadin.ui.Window; public class Ticket1869 extends com.vaadin.Application { - LinkedList listOfAllFields = new LinkedList(); - @Override public void init() { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1878.java b/tests/src/com/vaadin/tests/tickets/Ticket1878.java index 711bb533f8..8de24cbdcf 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1878.java @@ -13,6 +13,7 @@ import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Component; import com.vaadin.ui.ExpandLayout; import com.vaadin.ui.Field; import com.vaadin.ui.Form; @@ -184,9 +185,9 @@ public class Ticket1878 extends Application { Random r = new Random(); GridLayout l1 = new GridLayout(1, 3); form = createForm(l1, "200px", "500px"); - BeanItem item = new BeanItem(new FormObject()); + BeanItem item = new BeanItem(new FormObject()); form.setItemDataSource(item); - for (Iterator i = item.getItemPropertyIds().iterator(); i.hasNext();) { + for (Iterator i = item.getItemPropertyIds().iterator(); i.hasNext();) { Object property = i.next(); Field f = form.getField(property); @@ -247,7 +248,7 @@ public class Ticket1878 extends Application { switchToFormsButton.setEnabled(true); b.setEnabled(false); - java.util.Iterator i = mainLayout.getComponentIterator(); + Iterator i = mainLayout.getComponentIterator(); i.next(); Layout l = (Layout) i.next(); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1921.java b/tests/src/com/vaadin/tests/tickets/Ticket1921.java index 0bb79f224a..f9477f9df0 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1921.java @@ -102,8 +102,8 @@ public class Ticket1921 extends Application implements ParameterHandler { } } - public void handleParameters(Map parameters) { - String[] s = (String[]) parameters.get("state"); + public void handleParameters(Map parameters) { + String[] s = parameters.get("state"); if (s == null || s.length != 1) { return; } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966.java b/tests/src/com/vaadin/tests/tickets/Ticket1966.java index 2d0ec54992..b89610c1f6 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1966.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1966.java @@ -21,7 +21,7 @@ public class Ticket1966 extends Application { private static final int VCENTER = OrderedLayout.ALIGNMENT_VERTICAL_CENTER; private static final int BOTTOM = OrderedLayout.ALIGNMENT_BOTTOM; - private static Map names = new HashMap(); + private static Map names = new HashMap(); static { names.put(new Integer(LEFT), "Left"); names.put(new Integer(CENTER), "Center"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java index e325922abc..444eb5fea7 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java @@ -22,7 +22,7 @@ public class Ticket1966_2 extends Application { private static final int VCENTER = OrderedLayout.ALIGNMENT_VERTICAL_CENTER; private static final int BOTTOM = OrderedLayout.ALIGNMENT_BOTTOM; - private static Map names = new HashMap(); + private static Map names = new HashMap(); static { names.put(new Integer(LEFT), "Left"); names.put(new Integer(CENTER), "Center"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1970.java b/tests/src/com/vaadin/tests/tickets/Ticket1970.java index c39f28bb86..1442c9ea5b 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1970.java @@ -40,8 +40,9 @@ public class Ticket1970 extends Application { public void buttonClick(ClickEvent event) { String openWindows = ""; - for (Iterator i = getWindows().iterator(); i.hasNext();) { - Window t = (Window) i.next(); + for (Iterator i = getWindows().iterator(); i + .hasNext();) { + Window t = i.next(); openWindows += (openWindows.length() > 0 ? "," : "") + t.getName(); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1982.java b/tests/src/com/vaadin/tests/tickets/Ticket1982.java index 8d0f22f6a3..fe5f759428 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1982.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Window; public class Ticket1982 extends Application { - private List components = new ArrayList(); + private List components = new ArrayList(); @Override public void init() { @@ -41,10 +41,10 @@ public class Ticket1982 extends Application { private void restoreComponents(GridLayout gl) { gl.removeAllComponents(); - gl.addComponent((TitleBar) components.get(0)); - gl.addComponent((TitleBar) components.get(1)); - gl.addComponent((TitleBar) components.get(2)); - gl.addComponent((TitleBar) components.get(3)); + gl.addComponent(components.get(0)); + gl.addComponent(components.get(1)); + gl.addComponent(components.get(2)); + gl.addComponent(components.get(3)); } private class TitleBar extends ExpandLayout { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2181.java b/tests/src/com/vaadin/tests/tickets/Ticket2181.java index 98bfdce04c..2754ad2541 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2181.java @@ -76,6 +76,7 @@ public class Ticket2181 extends Application implements Button.ClickListener { } private void set() { + @SuppressWarnings("unchecked") Set values = (Set) options.getValue(); TextField[] tfs = new TextField[] { tf1, tf2 }; for (TextField tf : tfs) { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2204.java b/tests/src/com/vaadin/tests/tickets/Ticket2204.java index 6401867289..0ba1b5e346 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2204.java @@ -58,7 +58,7 @@ public class Ticket2204 extends Application { ts = new TabSheet(); layout.addComponent(ts); - for (Class c : classes) { + for (Class c : classes) { ts.addTab(createComponent(c), c.getSimpleName(), null); } rta = new RichTextArea(); @@ -95,7 +95,7 @@ public class Ticket2204 extends Application { c.setVisible(!c.isVisible()); } - private Component createComponent(Class c) { + private Component createComponent(Class c) { RichTextArea textArea = new RichTextArea(); textArea.setVisible(false); textArea.setCaption("This is the textArea"); @@ -105,7 +105,7 @@ public class Ticket2204 extends Application { Component cc = null; try { - cc = (Component) c.newInstance(); + cc = c.newInstance(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -124,7 +124,7 @@ public class Ticket2204 extends Application { Form f = (Form) cc; f.setFieldFactory(new FieldFactory() { - public Field createField(Class type, Component uiContext) { + public Field createField(Class type, Component uiContext) { return createField(); } @@ -149,7 +149,7 @@ public class Ticket2204 extends Application { } }); - f.setItemDataSource(new BeanItem(new Object() { + f.setItemDataSource(new BeanItem(new Object() { private int a; public int getA() { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2244.java b/tests/src/com/vaadin/tests/tickets/Ticket2244.java index 1330116d80..e9ae3ac720 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2244.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2244.java @@ -25,7 +25,7 @@ public class Ticket2244 extends Application { gl.newLine(); form = new Form(gl); - form.setItemDataSource(new BeanItem(new MyBean())); + form.setItemDataSource(new BeanItem(new MyBean())); gl.addComponent(new Label("After form")); @@ -34,7 +34,7 @@ public class Ticket2244 extends Application { w.addComponent(new Button("new item", new Button.ClickListener() { public void buttonClick(ClickEvent event) { - form.setItemDataSource(new BeanItem(new MyBean())); + form.setItemDataSource(new BeanItem(new MyBean())); } @@ -43,7 +43,8 @@ public class Ticket2244 extends Application { new Button.ClickListener() { public void buttonClick(ClickEvent event) { - form.setItemDataSource(new BeanItem(new MyBiggerBean())); + form.setItemDataSource(new BeanItem( + new MyBiggerBean())); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket3146.java b/tests/src/com/vaadin/tests/tickets/Ticket3146.java index 623b88f616..6afa25efda 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket3146.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket3146.java @@ -76,7 +76,7 @@ public class Ticket3146 extends Application { } void clearSelection2() { - table.setValue(new HashSet()); + table.setValue(new HashSet()); } void clearSelection3() { @@ -87,7 +87,7 @@ public class Ticket3146 extends Application { void printSelection() { String selection = ""; - for (Object item : (Collection) table.getValue()) { + for (Object item : (Collection) table.getValue()) { selection = selection + item + ' '; } result.setValue(selection); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java index ca9c9227b2..d551278659 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket677.java @@ -120,7 +120,7 @@ public class Ticket677 extends Application { } }); - form.setItemDataSource(new BeanItem(new MyBean())); + form.setItemDataSource(new BeanItem(new MyBean())); root.addComponent(form); table = new Table("Enabled"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket736.java b/tests/src/com/vaadin/tests/tickets/Ticket736.java index 0530f4eb66..49cfb5d708 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket736.java @@ -28,8 +28,8 @@ public class Ticket736 extends Application { // Create form for editing address final Form f = new Form(); - f.setItemDataSource(new BeanItem(address, new String[] { "name", - "street", "zip", "city", "state", "country" })); + f.setItemDataSource(new BeanItem
(address, new String[] { + "name", "street", "zip", "city", "state", "country" })); f.setCaption("Office address"); f.setIcon(new ThemeResource("../runo/icons/16/document.png")); f.setDescription("Jep jpe, this is form description."); -- 2.39.5