From e110414f3d1946c2ff313367ea8752aeece3469c Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 16 Apr 2012 14:05:09 +0300 Subject: [PATCH] Reformatted all source files --- .../client/ui/AbstractComponentConnector.java | 6 ++- .../client/ui/AbstractLayoutConnector.java | 1 - .../customlayout/CustomLayoutConnector.java | 1 - .../ui/orderedlayout/VHorizontalLayout.java | 1 - .../ui/orderedlayout/VVerticalLayout.java | 1 - .../ui/splitpanel/VSplitPanelHorizontal.java | 1 - .../ui/splitpanel/VSplitPanelVertical.java | 1 - .../gwt/client/ui/table/TableConnector.java | 4 +- .../CustomWidgetMapGenerator.java | 3 +- .../EagerWidgetMapGenerator.java | 10 ++-- .../LazyWidgetMapGenerator.java | 4 +- .../gwt/widgetsetutils/RpcProxyGenerator.java | 3 +- src/com/vaadin/ui/FormLayout.java | 1 - src/com/vaadin/ui/HorizontalLayout.java | 1 - src/com/vaadin/ui/HorizontalSplitPanel.java | 1 - src/com/vaadin/ui/NativeButton.java | 1 - src/com/vaadin/ui/VerticalSplitPanel.java | 1 - .../data/util/sqlcontainer/DataGenerator.java | 11 ++-- .../util/sqlcontainer/FreeformQueryUtil.java | 20 ++++---- .../data/util/sqlcontainer/UtilTest.java | 7 +-- .../connection/MockInitialContextFactory.java | 9 ++-- .../TestAbstractBeanContainerListeners.java | 3 +- ...estAbstractInMemoryContainerListeners.java | 3 +- .../tests/server/TestPropertyFormatter.java | 34 +++++++------ .../AbstractListenerMethodsTest.java | 9 ++-- ...stAbstractComponentContainerListeners.java | 3 +- .../TestAbstractOrderedLayoutListeners.java | 3 +- .../TestAbstractSplitPanelListeners.java | 3 +- .../component/table/TableListeners.java | 3 +- .../component/tabsheet/TestTabSheet.java | 2 +- .../component/window/AttachDetachWindow.java | 2 +- .../tests/TestForChildComponentRendering.java | 7 ++- .../components/LayoutAttachListenerInfo.java | 4 +- .../combobox/ComboBoxTextFieldEventOrder.java | 1 + .../form/FormClearDatasourceRepaint.java | 5 +- .../components/form/FormDescription.java | 9 ++-- .../FormWithPropertyFormatterConnected.java | 8 +-- .../menubar/MenuBarInSplitPanel.java | 4 +- .../components/select/TwinColSelectTest.java | 1 - .../components/table/LongMultiselect.java | 50 +++++++++---------- .../table/TablePageLengthUpdate.java | 3 +- .../tabsheet/TabSheetIndexOperations.java | 28 ++++++----- .../tabsheet/TabSheetTabTheming.java | 1 + ...angeListenerChangingNonTextProperties.java | 11 ++-- .../TextChangeTimeoutAfterDetach.java | 8 +-- .../textfield/TextFieldWithProperty.java | 13 ++--- .../tree/TreeDragAndDropFromTable.java | 1 - .../window/SubWindowWithUndefinedHeight.java | 5 +- ...oubleConverterWithThreeFractionDigits.java | 3 +- .../tests/dd/ActiveDragSourceClassName.java | 13 ++--- .../com/vaadin/tests/dd/DragAndDropFiles.java | 3 +- 51 files changed, 172 insertions(+), 159 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java index 8ab5590700..e5d2fc14cc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java @@ -151,14 +151,16 @@ public abstract class AbstractComponentConnector extends AbstractConnector if (newWidth.endsWith("%") != lastKnownWidth.endsWith("%")) { ComponentContainerConnector parent = getParent(); if (parent instanceof ManagedLayout) { - getLayoutManager().setNeedsHorizontalLayout((ManagedLayout) parent); + getLayoutManager().setNeedsHorizontalLayout( + (ManagedLayout) parent); } } if (newHeight.endsWith("%") != lastKnownHeight.endsWith("%")) { ComponentContainerConnector parent = getParent(); if (parent instanceof ManagedLayout) { - getLayoutManager().setNeedsVerticalLayout((ManagedLayout) parent); + getLayoutManager().setNeedsVerticalLayout( + (ManagedLayout) parent); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java index ec9d60d0a0..175e67807f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java @@ -3,7 +3,6 @@ */ package com.vaadin.terminal.gwt.client.ui; - public abstract class AbstractLayoutConnector extends AbstractComponentContainerConnector { diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java index 98ac83147c..5e8f01258f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java @@ -3,7 +3,6 @@ */ package com.vaadin.terminal.gwt.client.ui.customlayout; - import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Widget; diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java index 4520f2be55..5bf377642e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java @@ -3,7 +3,6 @@ */ package com.vaadin.terminal.gwt.client.ui.orderedlayout; - public class VHorizontalLayout extends VMeasuringOrderedLayout { public static final String CLASSNAME = "v-horizontallayout"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java index ba5f24fd67..e44c576941 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java @@ -3,7 +3,6 @@ */ package com.vaadin.terminal.gwt.client.ui.orderedlayout; - public class VVerticalLayout extends VMeasuringOrderedLayout { public static final String CLASSNAME = "v-verticallayout"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java index e19bc6418b..9048a59d7d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java +++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java @@ -4,7 +4,6 @@ package com.vaadin.terminal.gwt.client.ui.splitpanel; - public class VSplitPanelHorizontal extends VAbstractSplitPanel { public VSplitPanelHorizontal() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java index 0fcb638630..d22ebed5d9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java +++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java @@ -4,7 +4,6 @@ package com.vaadin.terminal.gwt.client.ui.splitpanel; - public class VSplitPanelVertical extends VAbstractSplitPanel { public VSplitPanelVertical() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java index d84b8f01e0..f16ee3463f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java @@ -291,8 +291,8 @@ public class TableConnector extends AbstractComponentContainerConnector getLayoutManager().setNeedsMeasure(TableConnector.this); getLayoutManager().setNeedsMeasure( TableConnector.this.getParent()); - getLayoutManager() - .setNeedsVerticalLayout(TableConnector.this); + getLayoutManager().setNeedsVerticalLayout( + TableConnector.this); getLayoutManager().layoutNow(); } }); diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java index 809cf073e9..f0d6f0453b 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java @@ -25,7 +25,8 @@ public abstract class CustomWidgetMapGenerator extends WidgetMapGenerator { private Collection> deferredPaintables = new HashSet>(); @Override - protected LoadStyle getLoadStyle(Class connector) { + protected LoadStyle getLoadStyle( + Class connector) { if (eagerPaintables == null) { init(); } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java index 7a68c1971b..8a1dfee3b5 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java @@ -21,10 +21,10 @@ import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle; * */ public class EagerWidgetMapGenerator extends WidgetMapGenerator { - - - @Override - protected LoadStyle getLoadStyle(Class connector) { - return LoadStyle.EAGER; + + @Override + protected LoadStyle getLoadStyle( + Class connector) { + return LoadStyle.EAGER; } } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java index 9d90a5bd0f..729a999a21 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java @@ -6,7 +6,6 @@ package com.vaadin.terminal.gwt.widgetsetutils; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle; - /** * WidgetMap generator that builds a widgetset that optimizes the transferred * data. Widgets are loaded only when used if the widgetset is built with this @@ -17,7 +16,8 @@ import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle; */ public class LazyWidgetMapGenerator extends WidgetMapGenerator { @Override - protected LoadStyle getLoadStyle(Class connector) { + protected LoadStyle getLoadStyle( + Class connector) { return LoadStyle.LAZY; } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java index 3b83edaf25..ad4e513049 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/RpcProxyGenerator.java @@ -53,8 +53,7 @@ public class RpcProxyGenerator extends Generator { + requestedType.getName().replaceAll("[$.]", "_"); JClassType initializableInterface = typeOracle - .findType(InitializableServerRpc.class - .getCanonicalName()); + .findType(InitializableServerRpc.class.getCanonicalName()); ClassSourceFileComposerFactory composer = new ClassSourceFileComposerFactory( requestedType.getPackage().getName(), generatedClassName); diff --git a/src/com/vaadin/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java index 63a973e30d..c0be784a7b 100644 --- a/src/com/vaadin/ui/FormLayout.java +++ b/src/com/vaadin/ui/FormLayout.java @@ -4,7 +4,6 @@ package com.vaadin.ui; - /** * FormLayout is used by {@link Form} to layout fields. It may also be used * separately without {@link Form}. diff --git a/src/com/vaadin/ui/HorizontalLayout.java b/src/com/vaadin/ui/HorizontalLayout.java index 807704e7cf..b9dc1c13ca 100644 --- a/src/com/vaadin/ui/HorizontalLayout.java +++ b/src/com/vaadin/ui/HorizontalLayout.java @@ -3,7 +3,6 @@ */ package com.vaadin.ui; - /** * Horizontal layout * diff --git a/src/com/vaadin/ui/HorizontalSplitPanel.java b/src/com/vaadin/ui/HorizontalSplitPanel.java index 7ea07cc61c..5bd6c8a075 100644 --- a/src/com/vaadin/ui/HorizontalSplitPanel.java +++ b/src/com/vaadin/ui/HorizontalSplitPanel.java @@ -3,7 +3,6 @@ */ package com.vaadin.ui; - /** * A horizontal split panel contains two components and lays them horizontally. * The first component is on the left side. diff --git a/src/com/vaadin/ui/NativeButton.java b/src/com/vaadin/ui/NativeButton.java index f14b448674..6eb4379261 100644 --- a/src/com/vaadin/ui/NativeButton.java +++ b/src/com/vaadin/ui/NativeButton.java @@ -3,7 +3,6 @@ */ package com.vaadin.ui; - @SuppressWarnings("serial") public class NativeButton extends Button { diff --git a/src/com/vaadin/ui/VerticalSplitPanel.java b/src/com/vaadin/ui/VerticalSplitPanel.java index 7c4a523ba4..0630240e9c 100644 --- a/src/com/vaadin/ui/VerticalSplitPanel.java +++ b/src/com/vaadin/ui/VerticalSplitPanel.java @@ -3,7 +3,6 @@ */ package com.vaadin.ui; - /** * A vertical split panel contains two components and lays them vertically. The * first component is above the second component. diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java index 6fa807b007..489f780d61 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java @@ -12,11 +12,12 @@ import com.vaadin.data.util.sqlcontainer.AllTests.DB; import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; public class DataGenerator { - - @Test - public void testDummy(){ - // Added dummy test so JUnit will not complain about "No runnable methods". - } + + @Test + public void testDummy() { + // Added dummy test so JUnit will not complain about + // "No runnable methods". + } public static void addPeopleToDatabase(JDBCConnectionPool connectionPool) throws SQLException { diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java index 2579a38aa1..b0e2a232ca 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java @@ -11,11 +11,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; public class FreeformQueryUtil { - @Test - public void testDummy(){ - // Added dummy test so JUnit will not complain about "No runnable methods". - } - + @Test + public void testDummy() { + // Added dummy test so JUnit will not complain about + // "No runnable methods". + } + public static StatementHelper getQueryWithFilters(List filters, int offset, int limit) { StatementHelper sh = new StatementHelper(); @@ -30,8 +31,7 @@ public class FreeformQueryUtil { query.append(") AS rownum, * FROM \"PEOPLE\""); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") AS a WHERE a.rownum BETWEEN ").append(offset) .append(" AND ").append(Integer.toString(offset + limit)); @@ -46,8 +46,7 @@ public class FreeformQueryUtil { query.append("SELECT * FROM (SELECT x.*, ROWNUM AS " + "\"rownum\" FROM (SELECT * FROM \"PEOPLE\""); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } query.append(") x) WHERE \"rownum\" BETWEEN ? AND ?"); sh.addParameterValue(offset); @@ -57,8 +56,7 @@ public class FreeformQueryUtil { } else { StringBuilder query = new StringBuilder("SELECT * FROM people"); if (!filters.isEmpty()) { - query.append(QueryBuilder.getWhereStringForFilters( - filters, sh)); + query.append(QueryBuilder.getWhereStringForFilters(filters, sh)); } if (limit != 0 || offset != 0) { query.append(" LIMIT ? OFFSET ?"); diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java index d6a6a72300..31bdf2b81b 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java @@ -21,7 +21,7 @@ public class UtilTest { @Test public void escapeSQL_severalQuotes_returnsEscapedString() { Assert.assertEquals("asdf''ghjk''qwerty", - SQLUtil.escapeSQL("asdf'ghjk'qwerty")); + SQLUtil.escapeSQL("asdf'ghjk'qwerty")); } @Test @@ -32,12 +32,13 @@ public class UtilTest { @Test public void escapeSQL_multipleDoubleQuotes_returnsEscapedString() { Assert.assertEquals("asdf\\\"foo\\\"bar", - SQLUtil.escapeSQL("asdf\"foo\"bar")); + SQLUtil.escapeSQL("asdf\"foo\"bar")); } @Test public void escapeSQL_backslashes_returnsEscapedString() { - Assert.assertEquals("foo\\\\nbar\\\\r", SQLUtil.escapeSQL("foo\\nbar\\r")); + Assert.assertEquals("foo\\\\nbar\\\\r", + SQLUtil.escapeSQL("foo\\nbar\\r")); } @Test diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java index 19019eed0b..3ee260245a 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java @@ -11,11 +11,12 @@ import org.junit.Test; */ public class MockInitialContextFactory implements InitialContextFactory { private static Context mockCtx = null; - + @Test - public void testDummy(){ - // Added dummy test so JUnit will not complain about "No runnable methods". - } + public void testDummy() { + // Added dummy test so JUnit will not complain about + // "No runnable methods". + } public static void setMockContext(Context ctx) { mockCtx = ctx; diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java index d6598a3b62..0d8433d1c6 100644 --- a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java +++ b/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java @@ -5,7 +5,8 @@ import com.vaadin.data.Container.PropertySetChangeListener; import com.vaadin.data.util.BeanItemContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTest; -public class TestAbstractBeanContainerListeners extends AbstractListenerMethodsTest { +public class TestAbstractBeanContainerListeners extends + AbstractListenerMethodsTest { public void testPropertySetChangeListenerAddGetRemove() throws Exception { testListenerAddGetRemove(BeanItemContainer.class, PropertySetChangeEvent.class, PropertySetChangeListener.class, diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java index 4be4e35554..a8e2a4aa2a 100644 --- a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java +++ b/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java @@ -5,7 +5,8 @@ import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTest; -public class TestAbstractInMemoryContainerListeners extends AbstractListenerMethodsTest { +public class TestAbstractInMemoryContainerListeners extends + AbstractListenerMethodsTest { public void testItemSetChangeListenerAddGetRemove() throws Exception { testListenerAddGetRemove(IndexedContainer.class, ItemSetChangeEvent.class, ItemSetChangeListener.class); diff --git a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java b/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java index 91e36b5caa..48c60c83c4 100644 --- a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java +++ b/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java @@ -27,6 +27,7 @@ public class TestPropertyFormatter extends TestCase { return getExpectedClass().newInstance(); } }; + @SuppressWarnings("rawtypes") private Class expectedClass; @@ -34,36 +35,41 @@ public class TestPropertyFormatter extends TestCase { private Class getExpectedClass() { return expectedClass; } - + /** * The object passed to format should be same as property's type. - * @throws IllegalAccessException - * @throws InstantiationException + * + * @throws IllegalAccessException + * @throws InstantiationException */ @Test @SuppressWarnings({ "rawtypes" }) - public void testCorrectTypeForFormat() throws InstantiationException, IllegalAccessException { - Class[] testedTypes = new Class[] {Integer.class, Boolean.class, Double.class, String.class, Date.class}; - Object[] testValues = new Object[] {new Integer(3), Boolean.FALSE, new Double(3.3), "bar", new Date()}; - + public void testCorrectTypeForFormat() throws InstantiationException, + IllegalAccessException { + Class[] testedTypes = new Class[] { Integer.class, Boolean.class, + Double.class, String.class, Date.class }; + Object[] testValues = new Object[] { new Integer(3), Boolean.FALSE, + new Double(3.3), "bar", new Date() }; + int i = 0; for (Class class1 : testedTypes) { expectedClass = class1; - + TestFormatter formatter = new TestFormatter(); - + // Should just return null, without formatting Object value = formatter.getValue(); - + // test with property which value is null - formatter.setPropertyDataSource(new ObjectProperty(null, expectedClass)); + formatter.setPropertyDataSource(new ObjectProperty(null, + expectedClass)); formatter.getValue(); // calls format - + // test with a value - formatter.setPropertyDataSource(new ObjectProperty(testValues[i++], expectedClass)); + formatter.setPropertyDataSource(new ObjectProperty(testValues[i++], + expectedClass)); formatter.getValue(); // calls format } - } } diff --git a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java index 355f5167d7..e189ffc77d 100644 --- a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java +++ b/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java @@ -48,11 +48,14 @@ public abstract class AbstractListenerMethodsTest extends TestCase { System.out.println("package " + packageName + ";"); System.out.println("import " - + AbstractListenerMethodsTest.class.getName() + ";"); + + AbstractListenerMethodsTest.class.getName() + + ";"); System.out.println("import " + c.getName() + ";"); - System.out.println("public class " + c.getSimpleName() + System.out.println("public class " + + c.getSimpleName() + "Listeners extends " - + AbstractListenerMethodsTest.class.getSimpleName() + " {"); + + AbstractListenerMethodsTest.class + .getSimpleName() + " {"); } String listenerClassName = m.getParameterTypes()[0] diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java index 6a8267f296..f9f170eb2a 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java @@ -8,7 +8,8 @@ import com.vaadin.ui.ComponentContainer.ComponentDetachListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; -public class TestAbstractComponentContainerListeners extends AbstractListenerMethodsTest { +public class TestAbstractComponentContainerListeners extends + AbstractListenerMethodsTest { public void testComponentDetachListenerAddGetRemove() throws Exception { testListenerAddGetRemove(HorizontalLayout.class, ComponentDetachEvent.class, ComponentDetachListener.class); diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java index 02143a2796..a0b34aca78 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java @@ -5,7 +5,8 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTest; import com.vaadin.ui.VerticalLayout; -public class TestAbstractOrderedLayoutListeners extends AbstractListenerMethodsTest { +public class TestAbstractOrderedLayoutListeners extends + AbstractListenerMethodsTest { public void testLayoutClickListenerAddGetRemove() throws Exception { testListenerAddGetRemove(VerticalLayout.class, LayoutClickEvent.class, LayoutClickListener.class); diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java index 5e9556c182..2b6cdaa6cc 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java @@ -5,7 +5,8 @@ import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener; import com.vaadin.ui.HorizontalSplitPanel; -public class TestAbstractSplitPanelListeners extends AbstractListenerMethodsTest { +public class TestAbstractSplitPanelListeners extends + AbstractListenerMethodsTest { public void testSplitterClickListenerAddGetRemove() throws Exception { testListenerAddGetRemove(HorizontalSplitPanel.class, SplitterClickEvent.class, SplitterClickListener.class); diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java b/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java index 6d9c7ed0eb..6cc522f8c7 100644 --- a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java @@ -20,7 +20,8 @@ public class TableListeners extends AbstractListenerMethodsTest { } public void testItemClickListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(Table.class, ItemClickEvent.class, ItemClickListener.class); + testListenerAddGetRemove(Table.class, ItemClickEvent.class, + ItemClickListener.class); } public void testFooterClickListenerAddGetRemove() throws Exception { diff --git a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java index 1832d1bd95..85c88e29bb 100644 --- a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java +++ b/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java @@ -120,5 +120,5 @@ public class TestTabSheet { assertEquals(tab2, tabSheet.getTab(1)); assertEquals(tab3, tabSheet.getTab(2)); } - + } diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java index a67c7bb387..7423ba8669 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -206,7 +206,7 @@ public class AttachDetachWindow { */ private void assertAttached(TestContainer win) { TestContent testContent = win.getTestContent(); - + assertTrue("window attach not called", win.attachCalled()); assertTrue("window content attach not called", testContent.contentAttachCalled); diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java index eb18f70e2f..e90231eefd 100644 --- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java @@ -66,7 +66,12 @@ public class TestForChildComponentRendering extends CustomComponent { }); main.addComponent(b); - b = new Button("remove randomly one component", new Button.ClickListener() { public void buttonClick(ClickEvent event) { removeRandomComponent();}}); + b = new Button("remove randomly one component", + new Button.ClickListener() { + public void buttonClick(ClickEvent event) { + removeRandomComponent(); + } + }); main.addComponent(b); } diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java index 671958383f..dc07c35f62 100644 --- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java +++ b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java @@ -84,9 +84,9 @@ public class LayoutAttachListenerInfo extends TestBase { })); } - private void testOrderedLayout(){ + private void testOrderedLayout() { content.removeAllComponents(); - + final VerticalLayout v = new VerticalLayout(); v.setWidth("300px"); v.setHeight("300px"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java index d92a1872b8..6f6e550ab4 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java @@ -1,4 +1,5 @@ package com.vaadin.tests.components.combobox; + import java.util.Arrays; import com.vaadin.data.Property.ValueChangeEvent; diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java index 39305d5638..5255b97ffa 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java @@ -37,7 +37,6 @@ public class FormClearDatasourceRepaint extends TestBase { @Override protected void setup() { - final Form form = new Form(); form.setItemDataSource(new BeanItem(new MySecondBean())); addComponent(form); @@ -50,10 +49,10 @@ public class FormClearDatasourceRepaint extends TestBase { addComponent(new Button("Change data source", new Button.ClickListener() { - public void buttonClick(ClickEvent event) { + public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem( new MyBean())); - } + } })); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java index d05d179ac8..63369413f6 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java @@ -10,11 +10,11 @@ public class FormDescription extends TestBase { @Override protected void setup() { - final Form form = new Form(); - form.setDescription("Some description"); + final Form form = new Form(); + form.setDescription("Some description"); form.addField("AAAA", new TextField()); - addComponent(form); - + addComponent(form); + addComponent(new Button("Toggle description", new Button.ClickListener() { public void buttonClick(ClickEvent event) { @@ -25,7 +25,6 @@ public class FormDescription extends TestBase { } } })); - } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java index eba570c490..b803f8667f 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java @@ -28,8 +28,8 @@ public class FormWithPropertyFormatterConnected extends TestBase { @Override public Object parse(String formattedValue) throws Exception { - String str = formattedValue - .replaceAll("[^0-9.]", ""); + String str = formattedValue.replaceAll("[^0-9.]", + ""); if (formattedValue.toLowerCase().contains("months")) { return Double.parseDouble(str) / 12; } @@ -40,7 +40,7 @@ public class FormWithPropertyFormatterConnected extends TestBase { public String format(Object value) { Double dValue = (Double) value; if (dValue < 1) { - return ((int)(dValue * 12)) + " months"; + return ((int) (dValue * 12)) + " months"; } return dValue + " years"; } @@ -51,7 +51,7 @@ public class FormWithPropertyFormatterConnected extends TestBase { } }); form2.setItemDataSource(createItem()); - + addComponent(form2); addComponent(new Button("B")); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java index e73d31bf04..2a6f952c0a 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java @@ -22,8 +22,8 @@ public class MenuBarInSplitPanel extends AbstractTestCase { @Override public void init() { - LegacyWindow mainWindow = new LegacyWindow( - "MenuBar in SplitPanel", new HorizontalSplitPanel()); + LegacyWindow mainWindow = new LegacyWindow("MenuBar in SplitPanel", + new HorizontalSplitPanel()); VerticalLayout left = new VerticalLayout(); mainWindow.addComponent(left); left.setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java index fef9c4172d..031a7e9d3d 100644 --- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java +++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java @@ -32,7 +32,6 @@ public class TwinColSelectTest extends AbstractSelectTestCase { } }; - @Override protected Class getTestClass() { return TwinColSelect.class; diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java index 4db9b69070..07925db05c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java @@ -12,23 +12,22 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; public class LongMultiselect extends TestBase { - + private enum ItemProperty { - COLUMN1, - COLUMN2 + COLUMN1, COLUMN2 } - + @Override protected void setup() { - VerticalLayout layout = generateLayout(); - addComponent(layout); - layout.setSizeFull(); + VerticalLayout layout = generateLayout(); + addComponent(layout); + layout.setSizeFull(); } - private VerticalLayout generateLayout() { - VerticalLayout layout = new VerticalLayout(); + private VerticalLayout generateLayout() { + VerticalLayout layout = new VerticalLayout(); - final Table table = new Table("Ticket #8264 table"); + final Table table = new Table("Ticket #8264 table"); layout.addComponent(table); table.setWidth("200px"); table.setHeight("170px"); @@ -39,17 +38,18 @@ public class LongMultiselect extends TestBase { // Create example data table.addContainerProperty(ItemProperty.COLUMN1, String.class, null); table.addContainerProperty(ItemProperty.COLUMN2, String.class, null); - for (int i=1;i<100;i++) { - table.addItem(new String[]{"Item " + i, null}, i); + for (int i = 1; i < 100; i++) { + table.addItem(new String[] { "Item " + i, null }, i); } - //Add action button + // Add action button layout.addComponent(new Button("Do It", new Button.ClickListener() { public void buttonClick(Button.ClickEvent event) { // Set ItemProperty.COLUMN2 for all selected values of table - Collection selectedIds = (Collection)table.getValue(); + Collection selectedIds = (Collection) table.getValue(); for (final Object itemId : selectedIds) { - final Property p = table.getItem(itemId).getItemProperty(ItemProperty.COLUMN2); + final Property p = table.getItem(itemId).getItemProperty( + ItemProperty.COLUMN2); if (p.getValue() instanceof String) { p.setValue(null); } else { @@ -58,17 +58,17 @@ public class LongMultiselect extends TestBase { } } })); - + return layout; - } + } - @Override - protected String getDescription() { - return "Multiselecting 94 rows (from \"item 5\" to \"item 98\") and modifying second column of each row selected (press Do It). This should work (update the 2nd column) and not cause JS exception."; - } + @Override + protected String getDescription() { + return "Multiselecting 94 rows (from \"item 5\" to \"item 98\") and modifying second column of each row selected (press Do It). This should work (update the 2nd column) and not cause JS exception."; + } - @Override - protected Integer getTicketNumber() { - return 8264; - } + @Override + protected Integer getTicketNumber() { + return 8264; + } } diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java index 2ba1475cc8..c7f138ea8f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java @@ -60,7 +60,8 @@ public class TablePageLengthUpdate extends TestBase { } public String getTableHeight() { - return "" + (int) table.getHeight() + table.getHeightUnits().getSymbol(); + return "" + (int) table.getHeight() + + table.getHeightUnits().getSymbol(); } public void setTableHeight(String height) { diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java index c106144144..5ae9e69975 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java @@ -14,16 +14,17 @@ public class TabSheetIndexOperations extends TestBase { @Override protected void setup() { final TabSheet tabs = new TabSheet(); - + // Add some tabs tabs.addTab(new Label("Content 1"), "Tab 1", null); tabs.addTab(new Label("Content 2"), "Tab 2", null); tabs.addTab(new Label("Content 3"), "Tab 3", null); - + addComponent(tabs); - - Button addTab = new Button("Add tab at index 2", new Button.ClickListener() { - public void buttonClick(ClickEvent event) { + + Button addTab = new Button("Add tab at index 2", + new Button.ClickListener() { + public void buttonClick(ClickEvent event) { tabs.addTab(new Label("Content " + tabCounter), "Added Tab " + tabCounter, null, 2); tabCounter++; @@ -37,8 +38,8 @@ public class TabSheetIndexOperations extends TestBase { Tab tab = tabs.getTab(2); tab.setCaption(new StringBuffer(tab.getCaption()) .reverse().toString()); - } - }); + } + }); addComponent(setCaption); Button move = new Button("Move selected tab to index 2", @@ -49,16 +50,17 @@ public class TabSheetIndexOperations extends TestBase { } }); addComponent(move); - - Button getIndex = new Button("Get selected tab index", new Button.ClickListener() { - public void buttonClick(ClickEvent event) { + + Button getIndex = new Button("Get selected tab index", + new Button.ClickListener() { + public void buttonClick(ClickEvent event) { getMainWindow().showNotification( "Index: " + tabs.getTabPosition(tabs.getTab(tabs .getSelectedTab()))); - - } - }); + + } + }); addComponent(getIndex); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java index 7d9a65b868..a2c75d6e79 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java @@ -1,4 +1,5 @@ package com.vaadin.tests.components.tabsheet; + import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java index af380275e3..8a3678ab62 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java @@ -10,12 +10,12 @@ import com.vaadin.ui.TextField; public class TextChangeListenerChangingNonTextProperties extends TestBase { int index = 0; - String[] styles = {"red","green","blue","cyan", "magenta"}; - + String[] styles = { "red", "green", "blue", "cyan", "magenta" }; + private String getNextStyle() { - return styles[++index%styles.length]; + return styles[++index % styles.length]; } - + @Override protected void setup() { final TextField tf2 = new TextField("Updates width") { @@ -35,7 +35,7 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase { tf2.setStyleName(getNextStyle()); } - }) ; + }); tf2.setImmediate(true); addComponent(tf2); @@ -50,6 +50,5 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase { protected Integer getTicketNumber() { return Integer.valueOf(6588); } - } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java index d1f856f40c..2f0c54ee39 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java @@ -23,15 +23,15 @@ public class TextChangeTimeoutAfterDetach extends TestBase { } }); addComponent(field); - + Button detachBtn = new Button("detach field", new Button.ClickListener() { - public void buttonClick(ClickEvent event) { + public void buttonClick(ClickEvent event) { removeComponent(field); getLayout().addComponentAsFirst( new Label("Field detached!")); - } - }); + } + }); addComponent(detachBtn); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java index 7d0bd12359..b753978666 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java @@ -12,23 +12,24 @@ public class TextFieldWithProperty extends TestBase { @Override protected void setup() { - + final TextField tf1 = new TextField(); - + final ObjectProperty op = new ObjectProperty("FOO"); - + tf1.setPropertyDataSource(op); addComponent(tf1); - Button b = new Button("Set BAR to underlaying property (should propagate to UI)"); + Button b = new Button( + "Set BAR to underlaying property (should propagate to UI)"); b.addListener(new ClickListener() { public void buttonClick(ClickEvent event) { op.setValue("BAR"); } }); - addComponent(b ); - + addComponent(b); + } @Override diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java index 1525d43ede..dca2d96628 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java @@ -115,5 +115,4 @@ public class TreeDragAndDropFromTable extends TestBase { return 7687; } - } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java index dbe5eda9af..60f0c598ae 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java @@ -33,13 +33,12 @@ public class SubWindowWithUndefinedHeight extends TestBase { table.setCaption("tab 2"); table.setWidth("100%"); table.setHeight("100%"); - + final TabSheet tabsheet = new TabSheet(); tabsheet.addComponent(tabButton); tabsheet.addComponent(table); tabsheet.addListener(new TabSheet.SelectedTabChangeListener() { - public void selectedTabChange( - TabSheet.SelectedTabChangeEvent event) { + public void selectedTabChange(TabSheet.SelectedTabChangeEvent event) { if (tabsheet.getSelectedTab() == tabButton) { tabsheet.setSizeUndefined(); subwindow.getContent().setSizeUndefined(); diff --git a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java index dc5abcb9f6..23c22a7026 100644 --- a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java +++ b/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java @@ -5,7 +5,8 @@ import java.util.Locale; import com.vaadin.data.util.converter.StringToDoubleConverter; -public class StringToDoubleConverterWithThreeFractionDigits extends StringToDoubleConverter { +public class StringToDoubleConverterWithThreeFractionDigits extends + StringToDoubleConverter { @Override protected NumberFormat getFormat(Locale locale) { diff --git a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java index 889c6bb47b..93e99274bb 100644 --- a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java +++ b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java @@ -25,25 +25,26 @@ public class ActiveDragSourceClassName extends TestBase { protected void setup() { TestUtils.injectCSS(getMainWindow(), GREENBOXES + HIDEDRAGSOURCE); - + VerticalLayout l = new VerticalLayout(); l.setWidth("400px"); l.setHeight("100px"); DragAndDropWrapper pane = new DragAndDropWrapper(cssLayout); pane.setSizeFull(); l.addComponent(pane); - + addComponent(l); - + for (int i = 0; i < 4; i++) { cssLayout.addComponent(new WrappedLabel("Block")); } - + } - + static int count; - private CssLayout cssLayout = new CssLayout() {}; + private CssLayout cssLayout = new CssLayout() { + }; class WrappedLabel extends DragAndDropWrapper { diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java index ad23338bbf..4b4ec75f0e 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java +++ b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java @@ -67,8 +67,7 @@ public class DragAndDropFiles extends TestBase { return true; } - public void onProgress( - StreamingProgressEvent event) { + public void onProgress(StreamingProgressEvent event) { System.err.println("Progress" + event.getBytesReceived()); } -- 2.39.5