diff options
author | Artur Signell <artur@vaadin.com> | 2016-08-31 15:56:58 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-31 16:40:54 +0300 |
commit | 82806ef9b7f12c66e620a813c7987c0fbea723dc (patch) | |
tree | d9ed9165d7065e63613c306895bd8b3739c3f004 /uitest | |
parent | 277b1a5c2884291ea9312d555dc45545430c1d9c (diff) | |
download | vaadin-framework-82806ef9b7f12c66e620a813c7987c0fbea723dc.tar.gz vaadin-framework-82806ef9b7f12c66e620a813c7987c0fbea723dc.zip |
Format the project using Neon, remove trailing whitespace
Change-Id: I145e20226958910c243b9897bb1e9516919f55cd
Diffstat (limited to 'uitest')
41 files changed, 97 insertions, 140 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java index 0521399eb0..2f6443fa14 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java @@ -228,13 +228,11 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog { hl.setSpacing(true); hl.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT); Label l1 = new Label("Respond to " + type + " requests with code"); - final TextField responseCode = new TextField(null, - "" + response.code); + final TextField responseCode = new TextField(null, "" + response.code); responseCode.setConverter(Integer.class); responseCode.setWidth("5em"); Label l2 = new Label("for the following"); - final TextField timeField = new TextField(null, - "" + response.time); + final TextField timeField = new TextField(null, "" + response.time); timeField.setConverter(Integer.class); timeField.setWidth("5em"); Label l3 = new Label("seconds"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java index 18936f0a93..1822cceb80 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java @@ -36,8 +36,7 @@ public class DisableEnableCascadeStyles extends TestBase { button = new Button("Button, enabled"); nativeButton = new NativeButton("NativeButton, enabled"); - textField = new TextField( - "TextField with caption and value, enabled"); + textField = new TextField("TextField with caption and value, enabled"); textField.setValue("Text"); textArea = new TextArea("TextArea with caption and value, enabled"); textArea.setValue("Text"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java index 6e49ee50d6..59b1e86483 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java @@ -20,8 +20,7 @@ public class ErrorMessages extends TestBase { bb.setComponentError(new CompositeErrorMessage(errors)); addComponent(bb); - TextField tf = new TextField("", - "Textfield with UserError"); + TextField tf = new TextField("", "Textfield with UserError"); tf.setComponentError(new UserError("This is a failure")); addComponent(tf); diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java index 11a8dccfb0..7eb79e123a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java @@ -15,14 +15,12 @@ public class DoubleInTextField extends AbstractComponentDataBindingTest { new Address("Dovestreet 12", 12233, "Johnston", Country.SOUTH_AFRICA)); - TextField salary = new TextField( - "Vaadin 7 - TextField with Double"); + TextField salary = new TextField("Vaadin 7 - TextField with Double"); addComponent(salary); salary.setPropertyDataSource( new MethodProperty<Double>(person, "salaryDouble")); - TextField salary6 = new TextField( - "Vaadin 6 - TextField with Double"); + TextField salary6 = new TextField("Vaadin 6 - TextField with Double"); addComponent(salary6); salary6.setPropertyDataSource( new MethodProperty<Double>(person, "salaryDouble")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java index 2262258460..7829adf626 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java @@ -141,7 +141,8 @@ public abstract class LegacyAbstractFieldTest<T extends AbstractField> }; @Override - public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) { + public void valueChange( + com.vaadin.v7.data.Property.ValueChangeEvent event) { log(event.getClass().getSimpleName() + ", new value: " + getValue(event.getProperty())); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java index 0b0382dcae..6ad4e6f5a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java @@ -26,8 +26,7 @@ public class ButtonTabIndex extends TestBase { protected void setup() { TextField tf1 = new TextField("Tab index 0"); tf1.setTabIndex(0); - TextField tf2 = new TextField( - "Tab index -1, focused initially"); + TextField tf2 = new TextField("Tab index -1, focused initially"); tf2.setTabIndex(-1); tf2.focus(); addComponent(tf1); diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java index 77b9b1a2c4..cabd19d1ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java @@ -61,8 +61,7 @@ public class CustomLayoutUsingTemplate extends TestBase if (event.getButton() == button1) { layout.addComponent(button2, "location1"); } else { - layout.addComponent(new TextField("A text field!"), - "location2"); + layout.addComponent(new TextField("A text field!"), "location2"); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java index 8cc2bab5ba..cae4a1ecd4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java @@ -35,8 +35,7 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog { cl = new CustomLayout(new ByteArrayInputStream( "<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>" .getBytes("UTF-8"))); - cl.addComponent(new TextField("This should be visible"), - "first"); + cl.addComponent(new TextField("This should be visible"), "first"); Button button = new Button( "This button is visible, together with one label"); button.addClickListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java index 2d0eeeee97..36e58e0b13 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java @@ -201,11 +201,11 @@ public class LegacyDateFieldRanges extends AbstractTestUI { endCal.add(Calendar.DATE, 30); GridLayout gl = new GridLayout(2, 2); gl.setSpacing(true); - DateField df = createDateField(startCal.getTime(), - endCal.getTime(), null, Resolution.DAY, false); + DateField df = createDateField(startCal.getTime(), endCal.getTime(), + null, Resolution.DAY, false); gl.addComponent(df); - DateField inline = createDateField(startCal.getTime(), - endCal.getTime(), null, Resolution.DAY, true); + DateField inline = createDateField(startCal.getTime(), endCal.getTime(), + null, Resolution.DAY, true); gl.addComponent(inline); inline.setId("staticInline"); VerticalLayout vl = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java index 327fe33b97..d4c48ac47e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java @@ -55,8 +55,7 @@ public class RequiredInvalidDateField extends TestBase { // not required Property<Date> dateProperty1 = new ObjectProperty<Date>(date); - DateField dateField1 = new DateField("Not required", - dateProperty1); + DateField dateField1 = new DateField("Not required", dateProperty1); dateField1.setLocale(new Locale("fi", "FI")); dateField1.setResolution(DateField.RESOLUTION_DAY); dateField1.setId("_DF1"); @@ -66,8 +65,7 @@ public class RequiredInvalidDateField extends TestBase { // required Property<Date> dateProperty2 = new ObjectProperty<Date>(date); - DateField dateField2 = new DateField("Required", - dateProperty2); + DateField dateField2 = new DateField("Required", dateProperty2); dateField2.setLocale(new Locale("fi", "FI")); dateField2.setResolution(DateField.RESOLUTION_DAY); dateField2.setId("_DF2"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java index 9f3cadc995..eb1e82e440 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java @@ -25,12 +25,10 @@ import com.vaadin.v7.ui.TextField; public class HtmlCaptionInFormLayout extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final TextField asHtml = new TextField( - "Contains <b>HTML</b>"); + final TextField asHtml = new TextField("Contains <b>HTML</b>"); asHtml.setCaptionAsHtml(true); - final TextField asText = new TextField( - "Contains <b>HTML</b>"); + final TextField asText = new TextField("Contains <b>HTML</b>"); addComponent(new FormLayout(asHtml, asText)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java index 1beb2e242d..6abcf8cfc4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java @@ -41,8 +41,8 @@ public class GridEditorUI extends AbstractTestUI { grid.getColumn("firstName").setEditorField(new PasswordField()); - TextField lastNameField = (TextField) grid - .getColumn("lastName").getEditorField(); + TextField lastNameField = (TextField) grid.getColumn("lastName") + .getEditorField(); lastNameField.setMaxLength(50); grid.getColumn("phoneNumber").getEditorField().setReadOnly(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java index 65c46c1320..825f42d214 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java @@ -96,8 +96,8 @@ public class GridThemeUI extends AbstractTestUIWithLog { getColumn("lastName").setEditable(false); setSizeFull(); getColumn("age").getEditorField().addValidator( - new IntegerRangeValidator("Must be between 0 and 100", - 0, 100)); + new IntegerRangeValidator("Must be between 0 and 100", 0, + 100)); getColumn("birthDate").setRenderer(new DateRenderer( DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US))); } @@ -136,8 +136,8 @@ public class GridThemeUI extends AbstractTestUIWithLog { setEditorEnabled(true); setSizeFull(); getColumn("age").getEditorField().addValidator( - new IntegerRangeValidator("Must be between 0 and 100", - 0, 100)); + new IntegerRangeValidator("Must be between 0 and 100", 0, + 100)); getColumn("birthDate").setRenderer(new DateRenderer( DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US))); diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java index 23779a9914..e866db5426 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java @@ -110,8 +110,7 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { layout.addComponent(label); // TODO also test with captions - TextField field = new TextField( - useCaption ? "caption" : null); + TextField field = new TextField(useCaption ? "caption" : null); field.setRequired(true); field.setWidth(width); layout.addComponent(field); @@ -120,8 +119,7 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { private void addLabel(VerticalLayout layout, String width, Alignment alignment, boolean useCaption) { - TextField field = new TextField( - useCaption ? "caption" : null); + TextField field = new TextField(useCaption ? "caption" : null); field.setRequired(true); field.setWidth(width); layout.addComponent(field); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index fe8cafa1a1..6339615104 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -403,8 +403,8 @@ public class BoxLayoutTest extends AbstractTestUI { componentIcon.setEnabled(target != null); componentDescription.setEnabled(target != null); componentError.setEnabled(target != null); - componentRequired.setEnabled(target != null - && target instanceof AbstractField); + componentRequired.setEnabled( + target != null && target instanceof AbstractField); align.setEnabled(target != null); expand.setEnabled(target != null); if (target != null) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java index bb52813fe4..6be6d6e497 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java @@ -121,8 +121,7 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI { private final Label myLabel = new Label(""); private final TextField filterPhoneField = new TextField( "Foobar Number"); - private final TextField filterFoobarField = new TextField( - "Foobar ID"); + private final TextField filterFoobarField = new TextField("Foobar ID"); private final CheckBox incomingOnlyField = new CheckBox( "Incoming foobar only"); @@ -147,8 +146,7 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI { this.addComponent(topLayout); // Foobar phone # - final TextField smsNumber = new TextField( - "Foobar Phone #"); + final TextField smsNumber = new TextField("Foobar Phone #"); smsNumber.setSizeUndefined(); smsNumber.setColumns(12); smsNumber.setMaxLength(16); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java index b3766d4ac4..59f5d3e49a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java @@ -50,8 +50,8 @@ public class TableUnregisterComponent extends TestBase { table.setColumnCollapsingAllowed(true); table.setTableFieldFactory(new DefaultFieldFactory() { @Override - public Field<?> createField(Container container, - Object itemId, Object propertyId, Component uiContext) { + public Field<?> createField(Container container, Object itemId, + Object propertyId, Component uiContext) { if (COL_B.equals(propertyId)) { Field<String> field = new TextField() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java index da8284a0e6..94bbe1821b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java @@ -55,8 +55,7 @@ public class TableWithCustomConverterFactory extends AbstractTestUI { } - public static class MyConverterFactory - extends DefaultConverterFactory { + public static class MyConverterFactory extends DefaultConverterFactory { @Override protected Converter<String, ?> createStringConverter( Class<?> sourceType) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java index dfd871dfc5..325ccf33f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java @@ -39,8 +39,7 @@ public class TabSheetIcons extends TestBase { tab[0] = new Label("This is tab 1"); tab[0].setIcon(new ThemeResource("../runo/icons/32/folder-add.png")); tab[0].setCaption("tab number 1"); - tab[1] = new TextField("This is tab 2", - "Contents of tab 2 textfield"); + tab[1] = new TextField("This is tab 2", "Contents of tab 2 textfield"); tab[2] = new Label("This is tab 3"); tab[2].setIcon(new ThemeResource("../runo/icons/16/folder-add.png")); tab[2].setCaption("tab number 3"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java index 5bccccb933..352bf86423 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java @@ -58,8 +58,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog { Button setValue = new Button("Set value to 15,2", new ClickListener() { @Override public void buttonClick(ClickEvent event) { - ((TextField) fieldGroup.getField("decimal")) - .setValue("15,2"); + ((TextField) fieldGroup.getField("decimal")).setValue("15,2"); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java index 5f3fc312d4..a9920c2ead 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java @@ -35,8 +35,7 @@ public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - TextField textField = new TextField( - "TextField with null value"); + TextField textField = new TextField("TextField with null value"); textField.setInputPrompt("Me is input prompt"); textField.setNullRepresentation(null); textField.setValue(null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java index 84227ed599..dbe64a5355 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java @@ -388,8 +388,8 @@ public class Trees extends AbstractSelectTestCase<Tree> private Command<Tree, com.vaadin.v7.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.v7.ui.Tree.ItemStyleGenerator>() { @Override - public void execute(Tree c, com.vaadin.v7.ui.Tree.ItemStyleGenerator value, - Object data) { + public void execute(Tree c, + com.vaadin.v7.ui.Tree.ItemStyleGenerator value, Object data) { c.setItemStyleGenerator(value); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java index 9a540ae006..093cf2d7d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java @@ -74,8 +74,7 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog { } - private TextField createIntegerTextField(String caption, - int initialValue) { + private TextField createIntegerTextField(String caption, int initialValue) { TextField tf = new TextField(caption); tf.setId(caption); tf.setConverter(Integer.class); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java index 72c0efb8b5..6b621653d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java @@ -73,8 +73,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase { main.addWindow(window); - ((ComponentContainer) main.getContent()) - .addComponent(new TextField()); + ((ComponentContainer) main.getContent()).addComponent(new TextField()); Button button = new Button("Bring to front (should focus too)", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java index 7ba28c46f7..ca200cc5e8 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java @@ -115,13 +115,11 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog { private TextField address_streetAddress = new TextField( "Street address"); @PropertyId("address.postalCode") - private TextField address_postalCode = new TextField( - "Postal code"); + private TextField address_postalCode = new TextField("Postal code"); @PropertyId("address.city") private TextField address_city = new TextField("City"); @PropertyId("address.country") - private TextField address_country = new TextField( - "Country"); + private TextField address_country = new TextField("Country"); public CustomForm() { fieldGroup.bindMemberFields(this); @@ -201,8 +199,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog { protected BeanFieldGroup<ComplexPerson> fieldGroup = new BeanFieldGroup<ComplexPerson>( ComplexPerson.class) { @Override - protected void configureField( - com.vaadin.v7.ui.Field<?> field) { + protected void configureField(com.vaadin.v7.ui.Field<?> field) { super.configureField(field); if (field.getCaption().equals("Postal code")) { // Last name editing is disabled through property. diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java index 4644c372cc..477e18c313 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java @@ -52,8 +52,7 @@ public class BasicCrudGridEditorRow extends AbstractBasicCrud { grid.setEditorEnabled(true); grid.setSizeFull(); grid.getColumn("age").getEditorField().addValidator( - new IntegerRangeValidator("Must be between 0 and 100", 0, - 100)); + new IntegerRangeValidator("Must be between 0 and 100", 0, 100)); grid.getColumn("birthDate").setRenderer(new DateRenderer( DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US))); addComponent(grid); diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java index 9225b552f1..d8637fe27f 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java @@ -21,8 +21,7 @@ public class FormWithNestedProperties extends AbstractBeanFieldGroupTest { private TextField age = new TextField("Age"); @PropertyId("address.streetAddress") - private TextField streetAddress = new TextField( - "Street address"); + private TextField streetAddress = new TextField("Street address"); private NativeSelect country; private CheckBox deceased = new CheckBox("Deceased"); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java index d40bd2da8c..5e187d1f79 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -15,10 +15,10 @@ public class MovingInvisibleField extends TestBase { final VerticalLayout layout1 = new VerticalLayout(); final VerticalLayout layout2 = new VerticalLayout(); - final TextField tfHidden = new TextField( - "Hidden text field caption", "A hidden text field"); - final TextField tfVisible = new TextField( - "Visible text field caption", "A visible text field"); + final TextField tfHidden = new TextField("Hidden text field caption", + "A hidden text field"); + final TextField tfVisible = new TextField("Visible text field caption", + "A visible text field"); tfHidden.setVisible(false); Button b = new Button("Move hidden textfield to other layout"); b.addListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java index 9708de292f..37dfbff847 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java @@ -31,8 +31,7 @@ import com.vaadin.v7.ui.TextField; public class GridIcon extends GridBaseLayoutTestUI { @Override protected void setup(VaadinRequest request) { - layout.addComponent( - createLabelsFields(TextField.class, true, "")); + layout.addComponent(createLabelsFields(TextField.class, true, "")); layout.addComponent(createLabelsFields(Label.class, true, "")); layout.addComponent(createLabelsFields(Button.class, true, "")); layout.addComponent(createLabelsFields(ComboBox.class, true, "")); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java index 115c5458e2..a62ebe7a34 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java @@ -43,8 +43,7 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI { layout.addComponent(createLabelsFields(Label.class, true, "")); layout.addComponent(createLabelsFields(Button.class, true, "")); layout.addComponent(createLabelsFields(TabSheet.class, true, "")); - layout.addComponent( - createLabelsFields(TextField.class, true, "")); + layout.addComponent(createLabelsFields(TextField.class, true, "")); layout.addComponent(createLabelsFields(ComboBox.class, true, "")); layout.addComponent(createLabelsFields(DateField.class, true, "")); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java index d3321b3b88..ed1cccb4d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java @@ -58,22 +58,20 @@ public class FormattingDataInGrid extends UI { NumberRenderer poundRenderer = new NumberRenderer(poundformat); grid.getColumn("amount").setRenderer(poundRenderer); - grid.getColumn("count") - .setConverter(new StringToIntegerConverter() { - @Override - public String convertToPresentation(Integer value, - Class<? extends String> targetType, Locale locale) - throws Converter.ConversionException { - String stringRepresentation = super.convertToPresentation( - value, targetType, locale); - if (value.intValue() % 2 == 0) { - return "<strong>" + stringRepresentation - + "</strong>"; - } else { - return "<em>" + stringRepresentation + "</em>"; - } - } - }); + grid.getColumn("count").setConverter(new StringToIntegerConverter() { + @Override + public String convertToPresentation(Integer value, + Class<? extends String> targetType, Locale locale) + throws Converter.ConversionException { + String stringRepresentation = super.convertToPresentation(value, + targetType, locale); + if (value.intValue() % 2 == 0) { + return "<strong>" + stringRepresentation + "</strong>"; + } else { + return "<em>" + stringRepresentation + "</em>"; + } + } + }); grid.getColumn("count").setRenderer(new HtmlRenderer()); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index 818df35a1f..2e19fae73f 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -39,8 +39,7 @@ public class CreatingPreserveState extends UI { @Override public void init(VaadinRequest request) { - TextField tf = new TextField( - "Instance #" + (++instanceCounter)); + TextField tf = new TextField("Instance #" + (++instanceCounter)); tf.setImmediate(true); content.addComponent(tf); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java index 4dd2f960cc..a66075e645 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java @@ -30,21 +30,19 @@ public class FormatTableValue extends AbstractTestUI { table.getItem(itemId).getItemProperty(DEFAULT_PROPERTY) .setValue(3.1415); - table.setConverter(PERCENT_PROPERTY, - new StringToDoubleConverter() { - @Override - protected NumberFormat getFormat(Locale locale) { - return NumberFormat.getPercentInstance(locale); - } - }); - - table.setConverter(CURRENCY_PROPERTY, - new StringToDoubleConverter() { - @Override - protected NumberFormat getFormat(Locale locale) { - return NumberFormat.getCurrencyInstance(locale); - } - }); + table.setConverter(PERCENT_PROPERTY, new StringToDoubleConverter() { + @Override + protected NumberFormat getFormat(Locale locale) { + return NumberFormat.getPercentInstance(locale); + } + }); + + table.setConverter(CURRENCY_PROPERTY, new StringToDoubleConverter() { + @Override + protected NumberFormat getFormat(Locale locale) { + return NumberFormat.getCurrencyInstance(locale); + } + }); addComponent(table); } diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java index 497977bf67..3332cdf4be 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java @@ -24,8 +24,7 @@ public class LoginView extends Panel implements View { final TextField email = new TextField("Email"); layout.addComponent(email); - final PasswordField password = new PasswordField( - "Password"); + final PasswordField password = new PasswordField("Password"); layout.addComponent(password); final Button login = new Button("Login", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java index 8cbb4c0007..e63cfd6d87 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java +++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java @@ -31,16 +31,14 @@ public class RoundTripTest extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { final RoundTripTester roundTripTester = new RoundTripTester(); - final TextField payloadSize = new TextField( - "Payload size (bytes)"); + final TextField payloadSize = new TextField("Payload size (bytes)"); payloadSize.setConverter(Integer.class); payloadSize.setConvertedValue(10000); if (request.getParameter("payload") != null) { payloadSize.setValue(request.getParameter("payload")); } addComponent(payloadSize); - final TextField testDuration = new TextField( - "Test duration (ms)"); + final TextField testDuration = new TextField("Test duration (ms)"); testDuration.setConverter(Integer.class); testDuration.setConvertedValue(10000); addComponent(testDuration); diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java index 99ddd75f3c..3fab24da91 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java @@ -98,8 +98,7 @@ public class TooltipConfiguration extends AbstractTestUIWithLog { } - private TextField createIntegerTextField(String caption, - int initialValue) { + private TextField createIntegerTextField(String caption, int initialValue) { TextField tf = new TextField(caption); tf.setId(caption); tf.setConverter(Integer.class); diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java index 9cea8a7d2d..10479a1779 100644 --- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java +++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java @@ -49,22 +49,20 @@ public class FieldErrorIndication extends AbstractTestUI { ComboBox comboBox = new ComboBox("ComboBox"); comboBox.addItem("ok"); comboBox.addItem("error"); - comboBox.addValidator( - new StringLengthValidator("fail", 0, 2, false)); + comboBox.addValidator(new StringLengthValidator("fail", 0, 2, false)); comboBox.setValue("error"); ListSelect listSelect = new ListSelect("ListSelect"); listSelect.addItem("ok"); listSelect.addItem("error"); - listSelect.addValidator( - new StringLengthValidator("fail", 0, 2, false)); + listSelect.addValidator(new StringLengthValidator("fail", 0, 2, false)); listSelect.setValue("error"); NativeSelect nativeSelect = new NativeSelect("NativeSelect"); nativeSelect.addItem("ok"); nativeSelect.addItem("error"); - nativeSelect.addValidator( - new StringLengthValidator("fail", 0, 2, false)); + nativeSelect + .addValidator(new StringLengthValidator("fail", 0, 2, false)); nativeSelect.setValue("error"); TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect"); twinColSelect.addItem("ok"); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java index 04df6c189c..9ebb0ba738 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java @@ -33,7 +33,8 @@ import com.vaadin.v7.client.widget.grid.RendererCellReference; import elemental.json.JsonObject; @Connect(com.vaadin.tests.components.grid.RowAwareRenderer.class) -public class RowAwareRendererConnector extends AbstractGridRendererConnector<Void> { +public class RowAwareRendererConnector + extends AbstractGridRendererConnector<Void> { public interface RowAwareRendererRpc extends ServerRpc { void clicky(String key); } diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java index e5985641cd..7561b8b371 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java @@ -4,8 +4,7 @@ import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest; import com.vaadin.v7.ui.PasswordField; -public class PasswordFieldTest - extends AbstractTextFieldTest<PasswordField> +public class PasswordFieldTest extends AbstractTextFieldTest<PasswordField> implements TextChangeListener { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java index 6c4e1bbaf6..4cface820c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java @@ -122,9 +122,8 @@ public class TextChangeEvents2 extends TestBase { } { - final TextField[] tfs = new TextField[] { - new TextField(), new TextField(), - new TextField(), new TextField() }; + final TextField[] tfs = new TextField[] { new TextField(), + new TextField(), new TextField(), new TextField() }; HorizontalLayout hl = new HorizontalLayout(); hl.setCaption("Blää"); getLayout().addComponent(hl); @@ -163,8 +162,7 @@ public class TextChangeEvents2 extends TestBase { @Override public void valueChange(ValueChangeEvent event) { - TextField tf = (TextField) event - .getProperty(); + TextField tf = (TextField) event.getProperty(); String val = tf.getValue(); if (val != null && val.length() > 4) { tf.setValue(val.substring(0, 4)); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java index 974e5ecdaa..0156f99e51 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java @@ -122,10 +122,9 @@ public class ValoThemeUITest extends MultiBrowserTest { } private void selectTreeNodeByCaption(String string) { - WebElement e = $(TreeElement.class).first() - .findElement(By - .xpath("//div[@class='v-tree-node-caption']//span[text()='" - + string + "']")); + WebElement e = $(TreeElement.class).first().findElement( + By.xpath("//div[@class='v-tree-node-caption']//span[text()='" + + string + "']")); e.click(); } |