From d3a3059501fb0fcaeedd5d1c53ffc86cdca0896b Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 28 Jun 2010 09:36:07 +0000 Subject: [PATCH] Formatted /tests/src and /demo/src using Vaadin Java Conventions 20071114 svn changeset:13934/svn branch:6.4 --- .../components/combobox/ComboBoxReapperingOldValue.java | 3 ++- .../components/datefield/DateFieldUnparsableDate.java | 1 + .../tests/components/select/SelectIconPlacement.java | 4 ++-- .../vaadin/tests/components/table/ColumnResizeEvent.java | 3 +-- .../com/vaadin/tests/components/table/HeaderClick.java | 1 - .../components/table/TablePageLengthCalculation.java | 1 + .../tests/components/tree/CtrlShiftMultiselect.java | 2 +- .../tests/dd/HorizontalLayoutSortableWithWrappers.java | 8 +++----- .../tests/dd/HorizontalSortableCssLayoutWithWrappers.java | 3 +-- .../vaadin/tests/resources/NonExistingFileResource.java | 1 + .../vaadin/tests/server/component/table/TestFooter.java | 4 ++-- .../tests/validation/EmptyFieldErrorIndicators.java | 2 +- 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index ae924f9a2c..0e295231c5 100644 --- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -12,7 +12,8 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @SuppressWarnings("serial") -public class ComboBoxReapperingOldValue extends Application implements ValueChangeListener { +public class ComboBoxReapperingOldValue extends Application implements + ValueChangeListener { ComboBox cbox1 = new ComboBox(); ComboBox cbox2 = new ComboBox(); diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java index ef0cbf03e7..32456e34c5 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java @@ -10,6 +10,7 @@ public class DateFieldUnparsableDate extends TestBase { public class MyDateField extends DateField { Date oldDate = null; + public MyDateField(String caption) { super(caption); addListener(new Property.ValueChangeListener() { diff --git a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java b/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java index 2fcf730669..f63183a24c 100644 --- a/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java +++ b/tests/src/com/vaadin/tests/components/select/SelectIconPlacement.java @@ -21,8 +21,8 @@ public class SelectIconPlacement extends TestBase { @Override protected String getDescription() { - return "A select with item icons pushes the caption of that item to the right to make room for the icon. It works fine in all browsers except IE8.
"+ - "Upon component render the icon and caption is on top of each others, and it corrects itself when you open the dropdown. "; + return "A select with item icons pushes the caption of that item to the right to make room for the icon. It works fine in all browsers except IE8.
" + + "Upon component render the icon and caption is on top of each others, and it corrects itself when you open the dropdown. "; } @Override diff --git a/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java b/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java index 5108d98e34..29131b8d7a 100644 --- a/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java +++ b/tests/src/com/vaadin/tests/components/table/ColumnResizeEvent.java @@ -84,8 +84,7 @@ public class ColumnResizeEvent extends TestBase { column3Width.setValue(table.getColumnWidth("150pxfixedCol") + "px"); table.addListener(new ColumnResizeListener() { - public void columnResize( - com.vaadin.ui.Table.ColumnResizeEvent event) { + public void columnResize(com.vaadin.ui.Table.ColumnResizeEvent event) { if (event.getPropertyId().equals("firstname")) { column1Width.setValue(event.getCurrentWidth() diff --git a/tests/src/com/vaadin/tests/components/table/HeaderClick.java b/tests/src/com/vaadin/tests/components/table/HeaderClick.java index d295e17a2b..19a9eb1b8f 100644 --- a/tests/src/com/vaadin/tests/components/table/HeaderClick.java +++ b/tests/src/com/vaadin/tests/components/table/HeaderClick.java @@ -29,7 +29,6 @@ public class HeaderClick extends TestBase { } }); - addComponent(table); addComponent(columnField); diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java index d7bbf9f026..5847450f89 100644 --- a/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java +++ b/tests/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java @@ -1,4 +1,5 @@ package com.vaadin.tests.components.table; + import com.vaadin.tests.components.TestBase; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; diff --git a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java index 1a329b17f5..7febfa14d5 100644 --- a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java +++ b/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java @@ -65,7 +65,7 @@ public class CtrlShiftMultiselect extends TestBase { private HierarchicalContainer createContainer() { HierarchicalContainer cont = new HierarchicalContainer(); cont.addContainerProperty("name", String.class, ""); - + for (int i = 0; i < 20; i++) { Item item = cont.addItem("Item " + i); item.getItemProperty("name").setValue("Item " + i); diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index 75691bd2fe..579f912e87 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -51,9 +51,8 @@ public class HorizontalLayoutSortableWithWrappers extends Window { } private DropHandler dh = new DropHandler() { - AcceptCriterion crit = new And(new TargetDetailIs( - "horizontalLocation", "LEFT"), new Not(SourceIsTarget - .get())); + AcceptCriterion crit = new And(new TargetDetailIs("horizontalLocation", + "LEFT"), new Not(SourceIsTarget.get())); public AcceptCriterion getAcceptCriterion() { return crit; @@ -69,8 +68,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window { Iterator componentIterator = layout .getComponentIterator(); Component next = componentIterator.next(); - TargetDetails dropTargetData = dropEvent - .getTargetDetails(); + TargetDetails dropTargetData = dropEvent.getTargetDetails(); DropTarget target = dropTargetData.getTarget(); while (next != target) { if (next != sourceComponent) { diff --git a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java index 75ac4b683e..a77faffd2e 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java @@ -62,8 +62,7 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window { Iterator componentIterator = cssLayout .getComponentIterator(); Component next = componentIterator.next(); - TargetDetails dropTargetData = dropEvent - .getTargetDetails(); + TargetDetails dropTargetData = dropEvent.getTargetDetails(); DropTarget target = dropTargetData.getTarget(); while (next != target) { if (next != sourceComponent) { diff --git a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java index 81db64dea0..9d4abd24df 100644 --- a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java @@ -1,4 +1,5 @@ package com.vaadin.tests.resources; + import java.io.File; import com.vaadin.terminal.FileResource; diff --git a/tests/src/com/vaadin/tests/server/component/table/TestFooter.java b/tests/src/com/vaadin/tests/server/component/table/TestFooter.java index ae880f8f09..647d13855b 100644 --- a/tests/src/com/vaadin/tests/server/component/table/TestFooter.java +++ b/tests/src/com/vaadin/tests/server/component/table/TestFooter.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Table; /** * Test case for testing the footer API - * + * */ public class TestFooter extends TestCase { @@ -73,7 +73,7 @@ public class TestFooter extends TestCase { /** * Creates a container with three properties "col1,col2,col3" with 100 items - * + * * @return Returns the created table */ private static Container createContainer() { diff --git a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java index 7d5432e1d1..067b407143 100644 --- a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java +++ b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java @@ -91,7 +91,7 @@ public class EmptyFieldErrorIndicators extends TestBase { } } }; - + form.addField("Field", new TextField("Text")); form.addField("Date", new DateField("Date")); // not good for automated testing with screenshots when null -- 2.39.5