diff options
author | Leif Åstrand <legioth@gmail.com> | 2016-12-20 17:50:32 +0200 |
---|---|---|
committer | Ilia Motornyi <elmot@vaadin.com> | 2016-12-20 17:50:32 +0200 |
commit | 95d016c08569f74a2c76eac40c4f5656bb773951 (patch) | |
tree | 340977988748756ee4ace27860dc00b3358519ae /uitest | |
parent | 1407b8ddaea9a8aace0973864ad9ce093e20a566 (diff) | |
download | vaadin-framework-95d016c08569f74a2c76eac40c4f5656bb773951.tar.gz vaadin-framework-95d016c08569f74a2c76eac40c4f5656bb773951.zip |
Global java code cleanup using Eclipse Neon.1
Diffstat (limited to 'uitest')
242 files changed, 342 insertions, 339 deletions
diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java index 63ecc3c8db..006bcd8fba 100644 --- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java index 3b05c4a3dc..cf26d4a891 100644 --- a/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java +++ b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/testcategory/MeasurementTest.java b/uitest/src/main/java/com/vaadin/testcategory/MeasurementTest.java index 798686776f..9c1f06d701 100644 --- a/uitest/src/main/java/com/vaadin/testcategory/MeasurementTest.java +++ b/uitest/src/main/java/com/vaadin/testcategory/MeasurementTest.java @@ -20,8 +20,8 @@ package com.vaadin.testcategory; * verification tests. * <p> * The purpose of the test to make some measurement (memory, time, etc.). - * - * + * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java index 0be5305708..87c1a312fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java index 4d60ea4279..d1dfdd8e7d 100644 --- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java index 256f1ca713..d59c717b75 100644 --- a/uitest/src/main/java/com/vaadin/tests/Parameters.java +++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index 4cbfbb806a..ea05333c33 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 44ec2927ab..2077b3e4b5 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java index 5d22ddf2a4..3f2870e9c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java index 474ebc9988..61f9127df5 100644 --- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java +++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java index 3e17dc99f1..cbf8d676dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java index e41b701563..1bcab93d50 100644 --- a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java +++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java index 4b52f845a4..e8217f2d38 100644 --- a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java +++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java index 108ed6b074..96566efa98 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java index b937c14120..149017911f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index a030768521..e75a3c4020 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java index ce044db4a5..0ad4c5545b 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index eec5bcd27d..1088ba00a2 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java index 47bc0413b7..b7c4885c17 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java index 18db338f81..181ed80df9 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java index 7cc3c9e513..d96ef91672 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index 2d2131a235..017e1b54c6 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java index 44f42efaf7..418fd08592 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java index adfb3f1313..72a04523e6 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java index d04bbc7f4a..88567a4d2b 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java +++ b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java index daf772f45b..e792d52e0d 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java index 38bb88fe5d..9ca5ecd156 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java index 7f5c6da809..cbc157e08f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java index 7952bfe688..1ce2f389e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java index 6be06393cc..50d491ae96 100644 --- a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java index 28cfabbc43..c59c99d241 100644 --- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java index aad54bfcef..cceaca536d 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/ServiceInitListeners.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/ServiceInitListeners.java index 4ecb7cf0f0..16e4609267 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/ServiceInitListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/ServiceInitListeners.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/main/java/com/vaadin/tests/components/HasValueRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/HasValueRequiredIndicator.java index 1f9e586670..8144171f92 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/HasValueRequiredIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/HasValueRequiredIndicator.java @@ -101,7 +101,7 @@ public abstract class HasValueRequiredIndicator<C extends HasValue & Component> /** * Initialize value for the {@code component}. - * + * * @param component * a UI component */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java index 1f69c96be3..07f2903e0e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java @@ -10,8 +10,7 @@ import com.vaadin.v7.ui.TextField; public class AbstractFieldDataSourceReadOnly extends TestBase { private static class StateHolder { - private ObjectProperty<String> textField = new ObjectProperty<>( - ""); + private ObjectProperty<String> textField = new ObjectProperty<>(""); public ObjectProperty<String> getTextField() { return textField; diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java index 384b8be17a..516f0a1891 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java @@ -11,8 +11,7 @@ public class DateFieldBackedByString extends AbstractComponentDataBindingTest { DateField df = new DateField("Date field"); addComponent(df); df.setPropertyDataSource( - new com.vaadin.v7.data.util.ObjectProperty<>(s, - String.class)); + new com.vaadin.v7.data.util.ObjectProperty<>(s, String.class)); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java index f2dc3c20ad..3b51b0985c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractSingleSelectTestUI.java @@ -32,9 +32,8 @@ public abstract class AbstractSingleSelectTestUI<T extends AbstractSingleSelect< } protected void createListenerMenu() { - createListenerAction("Selection listener", "Listeners", - c -> c.addSelectionListener( - e -> log("Selected: " + e.getValue()))); + createListenerAction("Selection listener", "Listeners", c -> c + .addSelectionListener(e -> log("Selected: " + e.getValue()))); } protected void createSelectionMenu() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCase.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCase.java index cb2769990b..92c2f1f59c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCase.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java index d6d288b77d..2139b3fb33 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java @@ -21,9 +21,9 @@ import com.vaadin.ui.CheckBoxGroup; /** * This class only provides a component type. The initialization code is inside * the AbstractListingFocusBlurTest class. - * + * * @see AbstractListingFocusBlurTest - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicator.java index 8d8ef522b1..86f74838cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicator.java @@ -21,7 +21,7 @@ import com.vaadin.ui.CheckBoxGroup; /** * The whole logic is inside HasValueRequiredIndicator. The code here just set * value for the component. - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java index 5b2c1ddcdd..860cb3c5f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java @@ -28,7 +28,8 @@ import com.vaadin.v7.ui.ComboBox; * * @author Vaadin Ltd */ -public class ComboBoxItemAddingWithFocusListener extends AbstractReindeerTestUI { +public class ComboBoxItemAddingWithFocusListener + extends AbstractReindeerTestUI { private ComboBox cBox; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java index f15fa2da2d..69d4bf8aa1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java @@ -7,7 +7,8 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupWidthPercentage extends AbstractReindeerTestUI { +public class ComboBoxSuggestionPopupWidthPercentage + extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk", "more items 1", "more items 2", "more items 3", diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java index bf10cce66d..4368d9b83b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java @@ -2,7 +2,8 @@ package com.vaadin.tests.components.datefield; import com.vaadin.ui.InlineDateField; -public class InlineDateFieldTest extends AbstractDateFieldTest<InlineDateField> { +public class InlineDateFieldTest + extends AbstractDateFieldTest<InlineDateField> { @Override protected Class<InlineDateField> getTestClass() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java index 6451715017..c9b7cfdf96 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java @@ -31,6 +31,7 @@ public class DragAndDropWrapperInPanel extends TestBase { protected void setup() { addComponent(new Button("Click to resize", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (int i = 1; i < getLayout().getComponentCount(); ++i) { Component c = getLayout().getComponent(i); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java index 5fa2a43386..75ce1738dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java @@ -45,8 +45,8 @@ public class GridClickableRenderers extends AbstractReindeerTestUI { checkBoxValueLabel.setValue(item.testText + " " + item.truthValue); grid.getDataProvider().refreshAll(); }); - grid.addColumn(pojo -> pojo.truthValue ? "Yes" : "No", - yesNoRenderer).setCaption("Truth").setId("truth"); + grid.addColumn(pojo -> pojo.truthValue ? "Yes" : "No", yesNoRenderer) + .setCaption("Truth").setId("truth"); grid.setItems(new TestPOJO("first row", "", "button 1 text", true), new TestPOJO("second row", "", "button 2 text", false)); 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 d4e95b0b54..10cf75be89 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 @@ -26,7 +26,8 @@ import com.vaadin.v7.ui.TextField; /** * Test for grid required indicator location within slots. */ -public class GridLayoutRequiredIndicatorLocation extends AbstractReindeerTestUI { +public class GridLayoutRequiredIndicatorLocation + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java index ffdb2a2fba..a41cbf94cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java @@ -9,7 +9,8 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class MoveComponentsFromGridLayoutToInnerLayout extends AbstractReindeerTestUI { +public class MoveComponentsFromGridLayoutToInnerLayout + extends AbstractReindeerTestUI { protected Button testButton; private GridLayout gl; diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 4078571347..bd57bf43bf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java index 15964748a5..1e69c410e3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java index 0bfe63761c..d37e1f1f19 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -25,7 +25,8 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.TextField; -public class EmptySpaceOnPageAfterExpandedComponent extends AbstractReindeerTestUI { +public class EmptySpaceOnPageAfterExpandedComponent + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrolling.java index d3cdacab17..1e74d61a3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrolling.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java index bc5816d1f4..dd1c405c84 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java @@ -27,7 +27,8 @@ import com.vaadin.ui.MenuBar.MenuItem; * @since 7.2 * @author Vaadin Ltd */ -public class SpaceMenuBarNavigation extends AbstractReindeerTestUI implements Command { +public class SpaceMenuBarNavigation extends AbstractReindeerTestUI + implements Command { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlur.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlur.java index d0996612ec..f1b42bd253 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlur.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlur.java @@ -21,9 +21,9 @@ import com.vaadin.ui.NativeSelect; /** * This class only provides a component type. The initialization code is inside * the AbstractListingFocusBlurTest class. - * + * * @see AbstractListingFocusBlurTest - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java index 41432213f1..d8871dc43e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java @@ -26,7 +26,8 @@ import com.vaadin.v7.ui.OptionGroup; * * @author Vaadin Ltd */ -public class OptionGroupRetainFocusKeyboardValueChange extends AbstractReindeerTestUI { +public class OptionGroupRetainFocusKeyboardValueChange + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java index 3812b62ee1..e26aff7991 100755 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java @@ -25,8 +25,7 @@ public class HorizontalRelativeSizeWithoutExpand extends UI { verticalLayout1.setSizeFull(); Tree tree = new Tree(); tree.setSizeFull(); - tree.setContainerDataSource( - new BeanItemContainer<>(String.class)); + tree.setContainerDataSource(new BeanItemContainer<>(String.class)); String a = "aaaaaaaaaaaaaaaaaaaaaaaa"; String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java index 25a5e9fdb2..a7897c4f5e 100755 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java @@ -28,8 +28,7 @@ public class VerticalRelativeSizeWithoutExpand extends UI { verticalLayout1.setSizeFull(); Tree tree = new Tree(); tree.setSizeFull(); - tree.setContainerDataSource( - new BeanItemContainer<>(String.class)); + tree.setContainerDataSource(new BeanItemContainer<>(String.class)); String a = "aaaaaaaaaaaaaaaaaaaaaaaa"; String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java index ac05416468..b6ceeb32dc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java index 8ee6f3844e..069ccef2bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java @@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.PopupView; import com.vaadin.ui.PopupView.Content; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; public class PopupViewWithRTE extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java index 2f91d64e2c..391ee216bd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlur.java b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlur.java index 1977ed5665..0efcf34974 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlur.java +++ b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlur.java @@ -21,9 +21,9 @@ import com.vaadin.ui.RadioButtonGroup; /** * This class only provides a component type. The initialization code is inside * the AbstractListingFocusBlurTest class. - * + * * @see AbstractListingFocusBlurTest - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicator.java index ebece0f8ed..b3a7f1662d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicator.java @@ -21,7 +21,7 @@ import com.vaadin.ui.RadioButtonGroup; /** * The whole logic is inside HasValueRequiredIndicator. The code here just set * value for the component. - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java index 7604ddd507..44ffa529b4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java @@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; public class RichTextAreaRelativeHeightResize extends AbstractReindeerTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java index 2c76c0fbdb..66b5a9e08a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; public class RichTextAreaScrolling extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java index 139b36ece8..934f2ed2dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; public class RichTextAreaSize extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java index 2ed52a2d95..863fb5aea7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java @@ -8,10 +8,10 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; +import com.vaadin.ui.RichTextArea; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.v7.ui.AbstractField; -import com.vaadin.ui.RichTextArea; @SuppressWarnings("serial") public class RichTextAreaWithKeyboardShortcuts extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java index e0d4a2bbf8..f4b6af5b2c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java @@ -24,7 +24,8 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalSplitPanel; -public class RetainSplitterPositionWhenOutOfBounds extends AbstractReindeerTestUI { +public class RetainSplitterPositionWhenOutOfBounds + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index 4593f43b7a..b1453ca1ea 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -61,8 +61,7 @@ public class SplitPanelWithMinimumAndMaximum extends AbstractReindeerTestUI { .setSecondComponent(new Label("Max 550 px")); pixelPositionWithPixelLimitsHorizontal.setSplitPosition(400, Sizeable.UNITS_PIXELS); - verticalLayout - .addComponent(pixelPositionWithPixelLimitsHorizontal); + verticalLayout.addComponent(pixelPositionWithPixelLimitsHorizontal); HorizontalSplitPanel percentagePositionWithPixelLimitsHorizontal = new HorizontalSplitPanel(); percentagePositionWithPixelLimitsHorizontal.setMinSplitPosition(100, diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java index 41a14bb178..6b17319509 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; -import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalSplitPanel; public class SplitPanelWithRichTextArea extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java index 97c39a6f0b..84ff54ba19 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java @@ -29,7 +29,8 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class ContainerSizeChangeDuringTablePaint extends AbstractReindeerTestUI { +public class ContainerSizeChangeDuringTablePaint + extends AbstractReindeerTestUI { /** * A test {@link Table} that simply acts a hook for when Vaadin starts diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java index 8cd7a3bd5e..229bc2e25f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java @@ -47,8 +47,7 @@ public class ContextMenuSize extends AbstractReindeerTestUI { new Action("action4") }; } }); - BeanItemContainer<Bean> container = new BeanItemContainer<>( - Bean.class); + BeanItemContainer<Bean> container = new BeanItemContainer<>(Bean.class); container.addBean(new Bean()); table.setContainerDataSource(container); addComponent(table); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java index 8595a8fc8d..5ef77aa358 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java @@ -14,8 +14,7 @@ public class HeaderRightClickAfterDrag extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { Table table = new Table(); - table.setContainerDataSource( - new BeanItemContainer<>(TestBean.class)); + table.setContainerDataSource(new BeanItemContainer<>(TestBean.class)); for (int i = 0; i < 10; i++) { table.addItem(new TestBean(i)); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java index a1d073d4f4..c980f928fb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java @@ -37,8 +37,7 @@ public class LeftColumnAlignment extends AbstractReindeerTestUI { protected void setup(VaadinRequest request) { final Table table = new Table(); - BeanItemContainer<Bean> container = new BeanItemContainer<>( - Bean.class); + BeanItemContainer<Bean> container = new BeanItemContainer<>(Bean.class); Bean bean = new Bean(); bean.setName("property"); container.addBean(bean); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java index ca72c4e7c7..3da6d3b58a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java index c3dd7f2975..9375eea97d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java @@ -31,7 +31,8 @@ import com.vaadin.v7.ui.Table; */ @SuppressWarnings("serial") -public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractReindeerTestUI { +public class SetPageFirstItemLoadsNeededRowsOnly + extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index 130f031066..8d8ca638d0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -21,7 +21,8 @@ import com.vaadin.v7.ui.Table.RowHeaderMode; import com.vaadin.v7.ui.Table.TableDragMode; import com.vaadin.v7.ui.TextField; -public class TableClickAndDragOnIconAndComponents extends AbstractReindeerTestUI { +public class TableClickAndDragOnIconAndComponents + extends AbstractReindeerTestUI { private static final long serialVersionUID = -2534880024131980135L; private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java index 3b5395a796..2df2eb0e5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java @@ -18,6 +18,7 @@ public class TableFocusOnRefreshRowCache extends TestBase { table.setSelectable(true); table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { table.refreshRowCache(); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java index 5e792e8cf5..68641544e0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java @@ -12,7 +12,8 @@ import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; -public class TableMatchesMouseDownMouseUpElement extends AbstractReindeerTestUI { +public class TableMatchesMouseDownMouseUpElement + extends AbstractReindeerTestUI { static final String CLEAR_BUTTON_ID = "clear-button-id"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java index 7b5e727631..a92cf326c2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java @@ -32,7 +32,8 @@ import com.vaadin.v7.ui.Table; import elemental.json.JsonObject; @Push -public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractReindeerTestUI { +public class TableRemovedQuicklySendsInvalidRpcCalls + extends AbstractReindeerTestUI { public static final String SUCCESS_CAPTION = "Success!"; public static final String BUTTON_ID = "blinkbutton"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java index bde56d2c21..4d4e383ffa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java @@ -19,7 +19,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; 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 46853b9cb4..9e8e0cc483 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 @@ -30,8 +30,7 @@ public class TableUnregisterComponent extends TestBase { container.addContainerProperty(COL_B, String.class, ""); Item it = container.addItem("a"); - final ObjectProperty<String> valA = new ObjectProperty<>( - "orgVal"); + final ObjectProperty<String> valA = new ObjectProperty<>("orgVal"); final TextField fieldA = new TextField(valA) { @Override public void setPropertyDataSource(Property newDataSource) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java index c75ebba95a..fb10ad0c15 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java @@ -12,7 +12,8 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -public class FirstTabNotVisibleWhenTabsheetNotClipped extends AbstractReindeerTestUI { +public class FirstTabNotVisibleWhenTabsheetNotClipped + extends AbstractReindeerTestUI { private TabSheet.Tab firstNotClippedTab; private TabSheet.Tab firstClippedTab; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index 0bb6ffcfd0..5147f996d8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -14,7 +14,6 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.VerticalLayout; 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 5de8cd1a19..b657e2cef9 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 @@ -43,8 +43,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog { setLocale(new Locale("fi", "FI")); BeanBigDecimal beanBigDecimal = new BeanBigDecimal(); - BeanItem<BeanBigDecimal> beanItem = new BeanItem<>( - beanBigDecimal); + BeanItem<BeanBigDecimal> beanItem = new BeanItem<>(beanBigDecimal); FormLayout formLayout = new FormLayout(); TextField textField = new TextField("BigDecimal field"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java index 0654c77851..b688f841d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.textfield; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; -import com.vaadin.shared.ui.ValueChangeMode; import com.vaadin.event.ShortcutAction; +import com.vaadin.shared.ui.ValueChangeMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.TextField; 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 755fb97f50..7576bd6ae0 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 @@ -20,7 +20,8 @@ import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.TextField; -public class TextFieldWithDataSourceAndInputPrompt extends AbstractReindeerTestUI { +public class TextFieldWithDataSourceAndInputPrompt + extends AbstractReindeerTestUI { public static class Pojo { private String string; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java index 67099c39b9..c7b32e9d11 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java index 7d9f48c75b..c92b9ba252 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.tree; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.LegacyWindow; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; import com.vaadin.v7.ui.Tree; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java index e3000e8fb7..b341bdc37f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java @@ -24,6 +24,7 @@ public class RowHeightWithoutRows extends TestBase { Button refresh = new Button("Add two elements"); addComponent(refresh); refresh.addClickListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addTwoElements(); } @@ -32,6 +33,7 @@ public class RowHeightWithoutRows extends TestBase { Button reset = new Button("Reset"); addComponent(reset); reset.addClickListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.removeAllItems(); } @@ -40,6 +42,7 @@ public class RowHeightWithoutRows extends TestBase { Button refresh5 = new Button("Add five elements"); addComponent(refresh5); refresh5.addClickListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.addBean(new User("John", "Doe")); container.addBean(new User("Mark", "Twain")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java index 7ae628a710..e3edabe758 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java @@ -9,11 +9,11 @@ import com.vaadin.v7.ui.Tree.ExpandListener; import com.vaadin.v7.ui.TreeTable; @SuppressWarnings("serial") -public class TreeTableContainerHierarchicalWrapper extends AbstractReindeerTestUI { +public class TreeTableContainerHierarchicalWrapper + extends AbstractReindeerTestUI { TreeTable treetable = new TreeTable(); - BeanItemContainer<Bean> beanContainer = new BeanItemContainer<>( - Bean.class); + BeanItemContainer<Bean> beanContainer = new BeanItemContainer<>(Bean.class); ContainerHierarchicalWrapper hierarchicalWrapper = new ContainerHierarchicalWrapper( beanContainer); diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java index 74dca9a803..b457b56a0b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java index bcbecdd589..f6e58ae163 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java @@ -6,7 +6,8 @@ import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @Widgetset("com.vaadin.DefaultWidgetSet") -public class ComponentMissingFromDefaultWidgetset extends AbstractReindeerTestUI { +public class ComponentMissingFromDefaultWidgetset + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java index 7cf6325e73..93ac99c186 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java @@ -257,8 +257,7 @@ public class UIAccess extends AbstractTestUIWithLog { public void buttonClick(ClickEvent event) { log.clear(); // accessSynchronously should maintain values - CurrentInstance.set( - CurrentInstanceTestType.class, + CurrentInstance.set(CurrentInstanceTestType.class, new CurrentInstanceTestType( "Set before access")); access(new Runnable() { @@ -275,8 +274,7 @@ public class UIAccess extends AbstractTestUIWithLog { "Set in access")); } }); - CurrentInstance.set( - CurrentInstanceTestType.class, + CurrentInstance.set(CurrentInstanceTestType.class, new CurrentInstanceTestType( "Set before run pending")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java index 3229068756..a7595bcd5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java @@ -25,7 +25,8 @@ import com.vaadin.ui.Window; * @since 7.1.9 * @author Vaadin Ltd */ -public class ScrollingBodyElementWithModalOpened extends AbstractReindeerTestUI { +public class ScrollingBodyElementWithModalOpened + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowOrder.java index d3a17006ba..bb82d6e212 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowOrder.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -28,7 +28,7 @@ import com.vaadin.ui.Window.WindowOrderChangeListener; /** * Test UI for accessing to window order position. - * + * * @author Vaadin Ltd */ public class WindowOrder extends AbstractTestUI { @@ -159,8 +159,8 @@ public class WindowOrder extends AbstractTestUI { public void windowOrderUpdated(WindowOrderUpdateEvent event) { uiLabel.removeStyleName(infoLabel.getStyleName()); for (Window window : event.getWindows()) { - uiLabel.addStyleName( - window.getStyleName() + "-" + window.getOrderPosition()); + uiLabel.addStyleName(window.getStyleName() + "-" + + window.getOrderPosition()); } } } diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java index b11f67e1d4..fab357d17b 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java @@ -17,7 +17,8 @@ import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; -public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractReindeerTestUI { +public class TableQueryWithNonUniqueFirstPrimaryKey + extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java index d640e35219..c348e3fa38 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java index 9234e2866a..a84bee1234 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java index df4ee2679b..7d28374d4f 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index 5b91056db6..a9c7c6269e 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java index 4ab1f1f749..c33af46464 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index 3ad86b7466..6bf1f58fec 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/UnknownExtensionHandling.java b/uitest/src/main/java/com/vaadin/tests/extensions/UnknownExtensionHandling.java index 9356ad2225..0876930d14 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/UnknownExtensionHandling.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/UnknownExtensionHandling.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java index a4f236bd25..46d606027d 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java @@ -84,8 +84,7 @@ public class FieldBinderWithBeanValidation extends TestBase { PersonWithBeanValidationAnnotations p = new PersonWithBeanValidationAnnotations( "John", "Doe", "john@doe.com", 64, Sex.MALE, new Address("John street", 11223, "John's town", Country.USA)); - fieldGroup.setItemDataSource( - new BeanItem<>(p)); + fieldGroup.setItemDataSource(new BeanItem<>(p)); } public static PersonWithBeanValidationAnnotations getPerson( diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java index 488c180d8b..8f39869e81 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java @@ -27,8 +27,8 @@ public class FormBuilderWithNestedProperties extends TestBase { addComponent(lastName); addComponent(streetAddress); - fieldGroup.setItemDataSource(new BeanItem<>(new Person("Who", - "me?", "email", 1, Sex.MALE, + fieldGroup.setItemDataSource(new BeanItem<>(new Person("Who", "me?", + "email", 1, Sex.MALE, new Address("street name", 202020, "City", Country.FINLAND)))); } diff --git a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java index 08ee0f605d..83183c7b27 100644 --- a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java +++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java @@ -10,10 +10,10 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; +import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.InlineDateField; -import com.vaadin.ui.DateField; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.Slider; import com.vaadin.v7.ui.ComboBox; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java index 4d801fbf76..e449afb064 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java @@ -190,9 +190,9 @@ public abstract class BaseLayoutTestUI extends AbstractReindeerTestUI { AbstractLayout curLayout = null; try { curLayout = layoutClass.newInstance(); - if(curLayout instanceof AbstractOrderedLayout) { - ((AbstractOrderedLayout)curLayout).setMargin(false); - ((AbstractOrderedLayout)curLayout).setSpacing(false); + if (curLayout instanceof AbstractOrderedLayout) { + ((AbstractOrderedLayout) curLayout).setMargin(false); + ((AbstractOrderedLayout) curLayout).setSpacing(false); } } catch (InstantiationException e1) { // TODO Auto-generated catch block diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 00da200d39..b8f6748ec1 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java index bad65156ef..484e1450f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not 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 2e19fae73f..aa69615f9a 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 @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java index 2d67dafc19..85a4a04796 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 766ddb361f..534c0be13b 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java index b962d6932d..406d64c73d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index c6f93de796..ca5e1c7ecd 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java index 7affc2d2f2..ccef80e4cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index 619e86bd78..832ec0e7dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java index 608c4677a7..fbab48c37d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java index 02790698eb..02f52d6605 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java index c3a796297c..6b8b0998f3 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index 7f8c6c0cd6..2005a4a686 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java index bc9dd40862..988dbeb4c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java index f3d5822563..ec2343cd45 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java index da1dcf24d1..7c19144ba1 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java index 30de67d782..193da42753 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java index 884c131402..1c243d9c56 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java index 64008cf093..c2064de657 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java index d56b7a99c6..2aea2bdcf5 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java index 61b5ae64f3..0a06db1428 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java index bb7e14c3dc..26ecddc86d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java index 0e49d9b5d1..db65f81c04 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java index 2e89b76ce4..bd0ebd8a63 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java index 26f81a70e0..41700dc577 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java index ae9d61ccc4..02c8f36ca9 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java index ba02b73efd..5317bbb491 100644 --- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java +++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java @@ -13,7 +13,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class NavigatorViewBlocksBackButtonAction extends AbstractReindeerTestUI { +public class NavigatorViewBlocksBackButtonAction + extends AbstractReindeerTestUI { private Navigator navigator; diff --git a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java index b6d1e2ab09..692fd39a5f 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java +++ b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java @@ -33,7 +33,7 @@ import com.vaadin.ui.JavaScriptFunction; import elemental.json.JsonArray; -// Load vaadinPush.js so that jQueryVaadin is defined +// Load vaadinPush.js so that jQueryVaadin is defined @JavaScript("vaadin://vaadinPush.debug.js") public class TrackMessageSizeUI extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java index 896557bda4..d37e988e4d 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java index 5408f0a7b6..b7184921d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java @@ -177,9 +177,8 @@ public class SerializerTest extends AbstractReindeerTestUI { // new List[] { Arrays.asList(1, 2), Arrays.asList(3, 4) }, // new List[] { Collections.singletonList(new SimpleTestBean(-1)) }); rpc.sendSet(new HashSet<>(Arrays.asList(4, 7, 12)), - Collections.singleton((Connector) this), - new HashSet<>(Arrays.asList(new SimpleTestBean(1), - new SimpleTestBean(2)))); + Collections.singleton((Connector) this), new HashSet<>(Arrays + .asList(new SimpleTestBean(1), new SimpleTestBean(2)))); state.intSet = new HashSet<>(Arrays.asList(4, 7, 12)); state.connectorSet = Collections.singleton((Connector) this); @@ -403,11 +402,9 @@ public class SerializerTest extends AbstractReindeerTestUI { Set<Connector> connectorSet, Set<SimpleTestBean> beanSet) { List<Integer> intList = new ArrayList<>(intSet); Collections.sort(intList); - List<Connector> connectorList = new ArrayList<>( - connectorSet); + List<Connector> connectorList = new ArrayList<>(connectorSet); Collections.sort(connectorList, new ConnectorComparator()); - List<SimpleTestBean> beanList = new ArrayList<>( - beanSet); + List<SimpleTestBean> beanList = new ArrayList<>(beanSet); Collections.sort(beanList, new SimpleBeanComparator()); log.log("sendSet: " + intList + ", " + connectorCollectionToString(connectorList) + ", " diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java index 454fb9f7b9..7e41e535fd 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java @@ -89,7 +89,8 @@ public class ThemeChangeOnTheFly extends AbstractTestUIWithLog { getLayout().setSpacing(true); Window w = new Window(); - VerticalLayout content = new VerticalLayout(new Button("Button in window")); + VerticalLayout content = new VerticalLayout( + new Button("Button in window")); content.setSpacing(false); content.setMargin(false); w.setContent(content); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java index 1d3a363e6b..92c5323b86 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java @@ -16,7 +16,6 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CssLayout; import com.vaadin.ui.FormLayout; @@ -26,6 +25,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java index 39db451bfe..46beea2d15 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java @@ -19,11 +19,11 @@ import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.AbstractColorPicker.PopupStyle; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.ColorPicker; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; public class ColorPickers extends VerticalLayout implements View { public ColorPickers() { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java index adce66063f..3012261fea 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java @@ -28,13 +28,13 @@ import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.CssLayout; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.data.fieldgroup.FieldGroup; import com.vaadin.v7.data.util.ObjectProperty; import com.vaadin.v7.data.util.PropertysetItem; diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java index 547a78794b..daa04f903c 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java @@ -44,9 +44,9 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.Notification; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java index 27001ed453..9d4f0a1f61 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java @@ -23,9 +23,9 @@ import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.Notification; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; public class MenuBars extends VerticalLayout implements View { public MenuBars() { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java index 06ec25e653..ecd968b607 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java @@ -25,9 +25,9 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; public class Panels extends VerticalLayout implements View { public Panels() { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java index fdd9619849..83b3f571bf 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java @@ -23,8 +23,8 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.PopupView; import com.vaadin.ui.PopupView.Content; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; public class PopupViews extends VerticalLayout implements View { public PopupViews() { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java index 2848b51d87..13ec24f895 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java @@ -26,8 +26,8 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.TabSheet.Tab; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.ValoTheme; public class Tabsheets extends VerticalLayout implements View { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java index e9df9774aa..2e79b28e90 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java @@ -24,11 +24,11 @@ import com.vaadin.ui.CssLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.PasswordField; +import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.ValoTheme; -import com.vaadin.ui.RichTextArea; public class TextFields extends VerticalLayout implements View { private TestIcon testIcon = new TestIcon(140); diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java index d2048b528f..e240d9971f 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java +++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java index 461d70a7e0..1e00412466 100644 --- a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java +++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java index 001d0d6616..d48cf92818 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java index abfb133070..a0d9b82866 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 838ec9b238..d2f025e407 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -62,8 +62,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Map<Integer, List<SimpleTestBean>> value = new HashMap<>(); Set<SimpleTestBean> firstKeyValue = generics.keySet().iterator() .next(); - value.put(Integer.valueOf(1), - new ArrayList<>(firstKeyValue)); + value.put(Integer.valueOf(1), new ArrayList<>(firstKeyValue)); updated.put(key, value); diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java index 33ff0ca0bd..0b745e0c88 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java index db21386361..2d60b381d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java index b81aa7055b..69a2c20025 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java index 73c4e30cc7..a0f8fcba42 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java index 18ce6c26d4..fe615b6c91 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java index 283e881e74..344ec2268c 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java index 8e9a216044..8f0f968d73 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java index 64700613ad..5ac9e69cd7 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java index b0e2698964..eff30649cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java index f890f228c8..06a989ef3c 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridHeightByRowOnInitWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridHeightByRowOnInitWidget.java index d8a49d8c35..ce4670c39f 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridHeightByRowOnInitWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridHeightByRowOnInitWidget.java @@ -17,8 +17,8 @@ public class GridHeightByRowOnInitWidget extends Composite { initWidget(panel); panel.setWidget(grid); - grid.setDataSource(new ListDataSource<>( - Arrays.asList("A", "B", "C", "D", "E"))); + grid.setDataSource( + new ListDataSource<>(Arrays.asList("A", "B", "C", "D", "E"))); grid.addColumn(new Column<String, String>("letter") { @Override public String getValue(String row) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java index 60144a6edb..0ceb4a02b5 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java index a74ddfefeb..15e6e53357 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/v7/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/v7/grid/GridClientColumnRenderers.java index 584d3f31c3..0f039fae55 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/v7/grid/GridClientColumnRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/v7/grid/GridClientColumnRenderers.java @@ -21,8 +21,8 @@ import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.widgetset.TestingWidgetSet; -import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererRpc; import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererConnector.Renderers; +import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererRpc; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSort.java b/uitest/src/main/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSort.java index 4236aad2c9..e0d97e7558 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSort.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSort.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -31,9 +31,9 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; /** - * + * * Test UI for event sorting in calendar month and week views. - * + * * @author Vaadin Ltd */ public class CalendarEventsSort extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java index 1c3d530b67..f27f985015 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java @@ -37,8 +37,7 @@ public class GridDataSourceReset extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { persons = createPersons(10, new Random(1)); - container = new BeanItemContainer<>(ComplexPerson.class, - persons); + container = new BeanItemContainer<>(ComplexPerson.class, persons); grid = new Grid(container); grid.select(container.firstItemId()); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java index 42f22ffd59..bf340fad4b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java @@ -24,9 +24,9 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.Container.Filter; import com.vaadin.v7.data.Container.Filterable; import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.Item; import com.vaadin.v7.data.sort.Sort; import com.vaadin.v7.data.sort.SortOrder; -import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.GeneratedPropertyContainer; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.data.util.PropertyValueGenerator; diff --git a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java index d2cc9450f2..0d17d3e029 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java @@ -31,8 +31,8 @@ public class DeploymentConfigurationTest extends SingleBrowserTest { @Test public void testParameters() { openTestURL(); - List<String> texts = new ArrayList<>(Arrays.asList( - "Init parameters:", "widgetset: com.vaadin.v7.Vaadin7WidgetSet", + List<String> texts = new ArrayList<>(Arrays.asList("Init parameters:", + "widgetset: com.vaadin.v7.Vaadin7WidgetSet", "closeIdleSessions: true", "productionMode: false", "testParam: 42", "heartbeatInterval: 301", "resourceCacheTime: 3601")); diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java index ac113a8048..5e835d219b 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java @@ -15,14 +15,12 @@ public class MultipleServletConfigurationTest extends MultiBrowserTest { @Test public void testMultipleServletConfiguration() throws Exception { getDriver().get(getBaseURL() + "/embed1"); - assertLabelText( - "Verify that Button HTML rendering works"); + assertLabelText("Verify that Button HTML rendering works"); getDriver().get(getBaseURL() + "/embed2"); assertLabelText( "Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label."); getDriver().get(getBaseURL() + "/embed1"); - assertLabelText( - "Verify that Button HTML rendering works"); + assertLabelText("Verify that Button HTML rendering works"); } private void assertLabelText(String expected) { diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/ServiceInitListenersTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/ServiceInitListenersTest.java index 2c9403acdb..d97f668967 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/ServiceInitListenersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/ServiceInitListenersTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCaseTest.java index de35ec8d54..84e5f452e4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCaseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDaySpecialCaseTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicatorTest.java index 8ec52b630a..775d5a086b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupRequiredIndicatorTest.java @@ -19,7 +19,7 @@ import com.vaadin.tests.components.HasValueRequiredIndicatorTest; /** * The test logic is in the superclass. - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java index 865323abac..ed9d110ac0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java @@ -32,8 +32,8 @@ public class DateFieldWhenChangingValueAndEnablingParentTest openTestURL(); $(CheckBoxElement.class).first().click(); - assertState($(AbstractDateFieldElement.class).id("DATEFIELD_ENABLED"), true, - true); + assertState($(AbstractDateFieldElement.class).id("DATEFIELD_ENABLED"), + true, true); assertState($(AbstractDateFieldElement.class).id("DATEFIELD_DISABLED"), false, false); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClickableRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClickableRenderersTest.java index c4ec0d99ea..12fcaabfae 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClickableRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClickableRenderersTest.java @@ -37,8 +37,8 @@ public class GridClickableRenderersTest extends MultiBrowserTest { openTestURL(); WebElement firstRowButton = findElements(By.className("v-nativebutton")) .get(0); - WebElement secondRowButton = findElements(By.className("v-nativebutton")) - .get(2); + WebElement secondRowButton = findElements( + By.className("v-nativebutton")).get(2); LabelElement label = $(LabelElement.class).get(1); firstRowButton.click(); @@ -53,8 +53,8 @@ public class GridClickableRenderersTest extends MultiBrowserTest { openTestURL(); WebElement firstRowButton = findElements(By.className("v-nativebutton")) .get(1); - WebElement secondRowButton = findElements(By.className("v-nativebutton")) - .get(3); + WebElement secondRowButton = findElements( + By.className("v-nativebutton")).get(3); LabelElement label = $(LabelElement.class).get(2); firstRowButton.click(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java index 3dbe8b5426..1d313899a2 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java @@ -20,10 +20,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridDefaultSelectionModeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java index 4363737746..0dc00e3c5b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.junit.Test; -import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class GridMultiSelectionScrollBarTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridHeaderFooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridHeaderFooterTest.java index 5e2b0eb9f7..45dba45954 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridHeaderFooterTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridHeaderFooterTest.java @@ -283,7 +283,8 @@ public class GridHeaderFooterTest extends GridBasicsTest { GridCellElement c00; c00 = getGridElement().getHeaderCell(0, 0); assertEquals("Column 0", c00.getText()); - assertEquals("Colspan of header cell [0,0]", "1", c00.getAttribute("colspan")); + assertEquals("Colspan of header cell [0,0]", "1", + c00.getAttribute("colspan")); GridCellElement c01 = getGridElement().getHeaderCell(0, 1); assertEquals("Column 2", c01.getText()); @@ -303,10 +304,11 @@ public class GridHeaderFooterTest extends GridBasicsTest { private void checkFooterAfterDelete() { GridCellElement c10; - //footer has an invisible first row + // footer has an invisible first row c10 = getGridElement().getFooterCell(1, 0); assertEquals("Footer cell 0", c10.getText()); - assertEquals("Colspan of footer cell [0,0]", "1", c10.getAttribute("colspan")); + assertEquals("Colspan of footer cell [0,0]", "1", + c10.getAttribute("colspan")); GridCellElement c11 = getGridElement().getFooterCell(1, 1); assertEquals("Footer cell 2", c11.getText()); @@ -321,11 +323,13 @@ public class GridHeaderFooterTest extends GridBasicsTest { private void checkMergedHeaderFooter() { GridCellElement c00 = getGridElement().getHeaderCell(0, 0); assertEquals("0+1", c00.getText()); - assertEquals("Colspan of header cell [0,0]", "2", c00.getAttribute("colspan")); + assertEquals("Colspan of header cell [0,0]", "2", + c00.getAttribute("colspan")); c00 = getGridElement().getFooterCell(0, 0); assertEquals("0+1", c00.getText()); - assertEquals("Colspan of footer cell [0,0]", "2", c00.getAttribute("colspan")); + assertEquals("Colspan of footer cell [0,0]", "2", + c00.getAttribute("colspan")); } @Test @@ -337,15 +341,18 @@ public class GridHeaderFooterTest extends GridBasicsTest { GridCellElement mergedCell1 = getGridElement().getHeaderCell(0, 0); assertEquals("0+1", mergedCell1.getText()); - assertEquals("Colspan, cell [0,0]", "2", mergedCell1.getAttribute("colspan")); + assertEquals("Colspan, cell [0,0]", "2", + mergedCell1.getAttribute("colspan")); GridCellElement mergedCell2 = getGridElement().getHeaderCell(1, 1); assertEquals("1+2+3", mergedCell2.getText()); - assertEquals("Colspan of cell [1,1]", "3", mergedCell2.getAttribute("colspan")); + assertEquals("Colspan of cell [1,1]", "3", + mergedCell2.getAttribute("colspan")); GridCellElement mergedCell3 = getGridElement().getHeaderCell(0, 6); assertEquals("6+7", mergedCell3.getText()); - assertEquals("Colspan of cell [0,6]", "2", mergedCell3.getAttribute("colspan")); + assertEquals("Colspan of cell [0,6]", "2", + mergedCell3.getAttribute("colspan")); } @@ -358,15 +365,18 @@ public class GridHeaderFooterTest extends GridBasicsTest { GridCellElement mergedCell1 = getGridElement().getFooterCell(0, 0); assertEquals("0+1", mergedCell1.getText()); - assertEquals("Colspan, cell [0,0]", "2", mergedCell1.getAttribute("colspan")); + assertEquals("Colspan, cell [0,0]", "2", + mergedCell1.getAttribute("colspan")); GridCellElement mergedCell2 = getGridElement().getFooterCell(1, 1); assertEquals("1+2+3", mergedCell2.getText()); - assertEquals("Colspan of cell [1,1]", "3", mergedCell2.getAttribute("colspan")); + assertEquals("Colspan of cell [1,1]", "3", + mergedCell2.getAttribute("colspan")); GridCellElement mergedCell3 = getGridElement().getFooterCell(0, 6); assertEquals("6+7", mergedCell3.getText()); - assertEquals("Colspan of cell [0,6]", "2", mergedCell3.getAttribute("colspan")); + assertEquals("Colspan of cell [0,6]", "2", + mergedCell3.getAttribute("colspan")); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrollingTest.java index 0d439e6bb1..ea26a278b6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIsAutoOpenScrollingTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicatorTest.java index bb1a1ba1d9..b04cc7834b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupRequiredIndicatorTest.java @@ -19,7 +19,7 @@ import com.vaadin.tests.components.HasValueRequiredIndicatorTest; /** * The tests are in the superclass. - * + * * @author Vaadin Ltd * */ diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java index 7a0241de54..7d10cfae2a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java @@ -4,7 +4,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java index c4d3ce73db..57ea640cf0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowOrderTest.java index c3faea3d39..1ab131a920 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowOrderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowOrderTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -24,7 +24,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest; /** * Test for window order position access. - * + * * @author Vaadin Ltd */ public class WindowOrderTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/data/DummyDataTest.java b/uitest/src/test/java/com/vaadin/tests/data/DummyDataTest.java index e6eabd8967..5ea794c816 100644 --- a/uitest/src/test/java/com/vaadin/tests/data/DummyDataTest.java +++ b/uitest/src/test/java/com/vaadin/tests/data/DummyDataTest.java @@ -62,15 +62,15 @@ public class DummyDataTest extends SingleBrowserTest { $(ButtonElement.class).get(1).click(); /* * There are two requests between the server and the client. - * + * * But current implementation sends some data in both requests: - * + * * - the first roundtrip contains data for initial range (normally * 0..40) - * + * * - the second roundtrip initiated by the client sends remaining data ( * from 41 to the whole size()) - * + * * This differs from the previous behavior: when data provider is * updated (it doesn't apply for the initially set data provider) no * data is sent to the client. So this first roundtrip is useless. And diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/UnknownExtensionHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/UnknownExtensionHandlingTest.java index e16abf1f61..855b7ed789 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/UnknownExtensionHandlingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/UnknownExtensionHandlingTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/test/java/com/vaadin/tests/focusable/RadioButtonGroupFocusableTest.java b/uitest/src/test/java/com/vaadin/tests/focusable/RadioButtonGroupFocusableTest.java index c84d606ac3..090c559e25 100644 --- a/uitest/src/test/java/com/vaadin/tests/focusable/RadioButtonGroupFocusableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/focusable/RadioButtonGroupFocusableTest.java @@ -5,7 +5,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.tests.components.radiobutton.RadioButtonGroupTestUI; -public class RadioButtonGroupFocusableTest extends AbstractFocusableComponentTest { +public class RadioButtonGroupFocusableTest + extends AbstractFocusableComponentTest { @Override protected Class<?> getUIClass() { diff --git a/uitest/src/test/java/com/vaadin/tests/focusable/TwinColSelectFocusableTest.java b/uitest/src/test/java/com/vaadin/tests/focusable/TwinColSelectFocusableTest.java index 826647129a..dc9f6620e5 100644 --- a/uitest/src/test/java/com/vaadin/tests/focusable/TwinColSelectFocusableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/focusable/TwinColSelectFocusableTest.java @@ -5,8 +5,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.tests.components.twincolselect.TwinColSelectTestUI; -public class TwinColSelectFocusableTest - extends AbstractFocusableComponentTest { +public class TwinColSelectFocusableTest extends AbstractFocusableComponentTest { @Override protected Class<?> getUIClass() { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java index cbed52e864..4c5969e21c 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java @@ -70,7 +70,7 @@ public class ResponsiveStylesTest extends MultiBrowserTest { /** * Tests that the valo-menu-hover style makes the menu appear on mouseover. - * + * * @throws Exception */ @Test diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSortTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSortTest.java index 27cf549a4f..9519a68317 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSortTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/calendar/CalendarEventsSortTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2014 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -26,7 +26,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest; /** * Check how event sorting works in calendar month and week views. - * + * * @author Vaadin Ltd */ public class CalendarEventsSortTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/form/FormTooltipsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/form/FormTooltipsTest.java index 710fd5a8c1..cc4f0bd532 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/form/FormTooltipsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/form/FormTooltipsTest.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2013 Vaadin Ltd. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java index 393be40f78..c812e4a942 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java @@ -21,11 +21,10 @@ import java.util.List; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.CustomRenderer; @TestCategory("grid") public class CustomRendererTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java index 0e315fc280..0ea6f78c95 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java @@ -19,9 +19,9 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridAddAndRemoveDataOnInitTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java index aa5e13a236..928aa9334a 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java @@ -18,10 +18,10 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridAddRowTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java index d57fd5a62f..b50c5a2e5e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java @@ -22,11 +22,11 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridColspansTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java index 99dc40ef12..cd77084aef 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridColumnAutoExpandTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java index 9a1ca896d4..a0567bbf37 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java @@ -16,7 +16,6 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.testbench.parallel.TestCategory; -import com.vaadin.v7.tests.components.grid.GridColumnAutoWidthClient; @TestCategory("grid") public class GridColumnAutoWidthClientTest diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java index 44647c50fa..0a0f823c42 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java @@ -16,7 +16,6 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.testbench.parallel.TestCategory; -import com.vaadin.v7.tests.components.grid.GridColumnAutoWidth; @TestCategory("grid") public class GridColumnAutoWidthServerTest diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java index de15148c14..6bad840705 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java @@ -20,11 +20,11 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.Dimension; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridColumnWidthRecalculationTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java index cc3d2ce564..3405d81827 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridDataSourceResetTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java index bd29b3fabd..fe700a13a6 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java @@ -22,10 +22,10 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridDetailsDetachTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java index f014b129f6..67daf06c3c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java @@ -24,11 +24,11 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.remote.DesiredCapabilities; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; /** * Tests the layouting of Grid's details row when it contains a HorizontalLayout diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java index eabd38a461..3a2f97560c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java @@ -30,13 +30,13 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.TestBenchElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.GridElement.GridRowElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridDetailsLocationTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java index d467437151..055f4470fd 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java @@ -22,10 +22,10 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridDetailsWidthTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java index 453a9e8b1f..d7d59552eb 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java index e83329bce6..c0d2a83558 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.GridEditorConverterNotFound; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class GridEditorConverterNotFoundTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java index 37834756ad..9a451362fd 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java @@ -24,10 +24,10 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridEditorFrozenColumnsUITest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java index dc3d393545..ec15e0368c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java @@ -7,9 +7,9 @@ import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridEditorMultiselectTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java index c35263a634..eaeeca686c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java @@ -19,10 +19,10 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridExtensionCommunicationTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java index fa755484eb..f758aa912d 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridGeneratedPropertiesTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java index ae4d8e568f..3e6cfe51e8 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java @@ -22,11 +22,11 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.testbench.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridHeaderFooterComponentsTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java index 0d64db4275..949430d744 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java @@ -19,10 +19,10 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridHeaderFormatChangeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java index 11aea58da2..512a82f5cd 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java @@ -21,11 +21,11 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridHeaderStyleNamesTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java index 1ebe898b24..158ba6ca86 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertFalse; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.elements.TabSheetElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridInTabSheetTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java index 0a94c108b5..a42d49ca79 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java @@ -22,10 +22,10 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridInWindowResizeTest extends MultiBrowserTest { @Override diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java index e86d21b5d9..d4412b6473 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java index 63b5eec440..561deec7ae 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridItemSetChangeTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java index cd744ea51e..6839cfda64 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java @@ -21,11 +21,11 @@ import static org.hamcrest.number.IsCloseTo.closeTo; import org.junit.Test; import org.openqa.selenium.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridLayoutElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; /** * Tests that details row displays GridLayout contents properly. diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMissingPropertyTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMissingPropertyTest.java index 88262dcfcc..9de41cc1a7 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMissingPropertyTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMissingPropertyTest.java @@ -1,5 +1,9 @@ package com.vaadin.v7.tests.components.grid; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import com.vaadin.testbench.elements.GridElement; @@ -7,10 +11,6 @@ import com.vaadin.testbench.elements.GridElement.GridEditorElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class GridMissingPropertyTest extends SingleBrowserTest { @Test diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java index a96cad5e20..c969653a38 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java @@ -24,10 +24,10 @@ import java.util.List; import org.junit.Test; import org.openqa.selenium.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridRendererChangeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java index 660722173e..510867146a 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java @@ -18,9 +18,9 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridReplaceContainerTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java index f2f76eeb31..2785103e1a 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java @@ -18,9 +18,9 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridResizeAndScrollTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java index e3e06c1da2..28321238b7 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java @@ -25,10 +25,10 @@ import org.openqa.selenium.Dimension; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; public class GridResizeHiddenColumnTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java index 66532e1f24..b14b584bf1 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridScrollToLineWhileResizingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java index 1bfe232379..5db1a93c5e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java @@ -24,9 +24,8 @@ import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; -import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.GridSidebarPosition; +import com.vaadin.tests.tb3.MultiBrowserTest; public class GridSidebarPositionTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java index a0d79ccc73..f5a7a7a9f5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java @@ -18,11 +18,11 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridSingleColumnTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java index 61762301c2..afcb33dca6 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridSortIndicatorTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java index 03b9b780c5..cb4151b597 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java @@ -21,10 +21,10 @@ import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import com.vaadin.testbench.TestBenchElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; /** * Test for "Grid detail row outline overflows" (#17826) diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java index 989d9f6052..cec7e13ec7 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java @@ -18,11 +18,11 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridRowElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridSubPixelProblemWrappingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java index 9ad5a73c94..214f69f0d9 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java @@ -18,10 +18,10 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridSwitchRenderersTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java index 98ffec4570..d9f5a8d188 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java @@ -21,9 +21,9 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class GridThemeChangeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java index f3ce36ee5a..288dbedffe 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java @@ -22,12 +22,11 @@ import java.io.IOException; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.GridWidthIncrease; @TestCategory("grid") public class GridWidthIncreaseTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java index c9bbe591d3..8313182de2 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java @@ -18,8 +18,8 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; -import com.vaadin.tests.tb3.SingleBrowserTest; import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.tests.tb3.SingleBrowserTest; public class GridWithBrokenRendererTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java index e81fca5614..b5a914e63d 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.tests.tb3.SingleBrowserTest; import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.tests.tb3.SingleBrowserTest; public class GridWithLabelEditorTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java index 522e6802c1..3e7fdd1acd 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java @@ -21,10 +21,10 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class InitialFrozenColumnsTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java index 4d248a7129..086440d47d 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java @@ -18,10 +18,10 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class JavaScriptRenderersTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java index 013f29c678..c99739da85 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java @@ -18,8 +18,8 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; -import com.vaadin.tests.tb3.SingleBrowserTest; import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.tests.tb3.SingleBrowserTest; public class NullHeadersTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java index 7ab958ecfd..c0f74de039 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java @@ -19,11 +19,10 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.CustomRenderer; @TestCategory("grid") public class NullRenderersTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java index 911c9a986b..cdd2e4159d 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java @@ -18,11 +18,11 @@ package com.vaadin.v7.tests.components.grid; import org.junit.Assert; import org.junit.Test; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; -import com.vaadin.testbench.customelements.GridElement; @TestCategory("grid") public class ProgrammaticEditorControlTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java index 3786c818d3..0ac1cb772f 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java @@ -26,13 +26,12 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; +import com.vaadin.testbench.customelements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.testbench.customelements.GridElement; -import com.vaadin.v7.tests.components.grid.WidgetRenderers; /** * TB tests for the various builtin widget-based renderers. diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java index 356834942d..e37e96ebda 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java @@ -28,7 +28,6 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.TestBenchElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeatures; @TestCategory("grid") public abstract class EscalatorBasicClientFeaturesTest diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java index f5dc489165..99d8548b30 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java @@ -48,7 +48,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { // translate3d(0px, 40px, 123px); // translate3d(24px, 15.251px, 0); // translate(0, 40px); - private final static String TRANSLATE_VALUE_REGEX = + private final static String TRANSLATE_VALUE_REGEX = "translate(?:3d|)" // "translate" or "translate3d" + "\\(" // literal "(" + "(" // start capturing the x argument diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java index ce85f7aa46..e6588b9aa5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java @@ -27,7 +27,6 @@ import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.v7.tests.components.nativeselect.NativeSelects; public class NativeSelectsAndChromeKeyboardNavigationTest extends MultiBrowserTest { |