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 | |
| parent | 1407b8ddaea9a8aace0973864ad9ce093e20a566 (diff) | |
| download | vaadin-framework-95d016c08569f74a2c76eac40c4f5656bb773951.tar.gz vaadin-framework-95d016c08569f74a2c76eac40c4f5656bb773951.zip | |
Global java code cleanup using Eclipse Neon.1
408 files changed, 918 insertions, 922 deletions
diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java index 98fecce8c5..d17dccbb3d 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java @@ -598,16 +598,14 @@ public class ConnectorBundle { Map<JMethod, Set<MethodAttribute>> typeData = methodAttributes .get(type); if (typeData == null) { - typeData = new TreeMap<>( - jMethodComparator); + typeData = new TreeMap<>(jMethodComparator); methodAttributes.put(type, typeData); } Map<JMethod, Set<MethodAttribute>> methods = methodAttributes .get(type); if (methods == null) { - methods = new TreeMap<>( - jMethodComparator); + methods = new TreeMap<>(jMethodComparator); methodAttributes.put(type, methods); } diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java index 358e10c7a4..76c7f67ac8 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java @@ -24,6 +24,7 @@ import com.google.gwt.core.ext.typeinfo.JParameterizedType; import com.google.gwt.core.ext.typeinfo.JType; import com.google.gwt.core.ext.typeinfo.NotFoundException; import com.vaadin.client.connectors.AbstractRendererConnector; +import com.vaadin.client.connectors.grid.AbstractGridRendererConnector; import elemental.json.JsonValue; diff --git a/client/src/main/java/com/vaadin/client/AnimationUtil.java b/client/src/main/java/com/vaadin/client/AnimationUtil.java index e2cf9e690a..d868122857 100644 --- a/client/src/main/java/com/vaadin/client/AnimationUtil.java +++ b/client/src/main/java/com/vaadin/client/AnimationUtil.java @@ -66,15 +66,15 @@ public class AnimationUtil { listener.@com.vaadin.client.AnimationUtil.AnimationEndListener::onAnimationEnd(Lcom/google/gwt/dom/client/NativeEvent;)(e); }); callbackFunc.listener = listener; - + elem.addEventListener(@com.vaadin.client.AnimationUtil::ANIMATION_END_EVENT_NAME, callbackFunc, false); - + // Store function reference for later removal if(!elem._vaadin_animationend_callbacks) { elem._vaadin_animationend_callbacks = []; } elem._vaadin_animationend_callbacks.push(callbackFunc); - + return callbackFunc; }-*/; @@ -137,7 +137,7 @@ public class AnimationUtil { return event.mozAnimationName; else if(event.oAnimationName) return event.oAnimationName; - + return ""; }-*/; @@ -145,22 +145,22 @@ public class AnimationUtil { public static native String getAnimationName(ComputedStyle cstyle) /*-{ var cs = cstyle.@com.vaadin.client.ComputedStyle::computedStyle; - + if(!cs.getPropertyValue) return ""; - + if(cs.getPropertyValue("-webkit-animation-name")) return cs.getPropertyValue("-webkit-animation-name"); - + else if(cs.getPropertyValue("animation-name")) return cs.getPropertyValue("animation-name"); - + else if(cs.getPropertyValue("-moz-animation-name")) return cs.getPropertyValue("-moz-animation-name"); - + else if(cs.getPropertyValue("-o-animation-name")) return cs.getPropertyValue("-o-animation-name"); - + return ""; }-*/; @@ -175,7 +175,7 @@ public class AnimationUtil { 'MozAnimation': 'animationend', 'WebkitAnimation': 'webkitAnimationEnd' } - + for(var a in anims){ if( el.style[a] !== undefined ){ return anims[a]; @@ -194,7 +194,7 @@ public class AnimationUtil { 'mozAnimation', 'webkitAnimation' ] - + for(var i=0; i < anims.length; i++) { if( el.style[anims[i]] !== undefined ){ return anims[i]; diff --git a/client/src/main/java/com/vaadin/client/ComputedStyle.java b/client/src/main/java/com/vaadin/client/ComputedStyle.java index a170aef9ef..fbd6ef6ce9 100644 --- a/client/src/main/java/com/vaadin/client/ComputedStyle.java +++ b/client/src/main/java/com/vaadin/client/ComputedStyle.java @@ -66,8 +66,8 @@ public class ComputedStyle { var cs = this.@com.vaadin.client.ComputedStyle::computedStyle; var elem = this.@com.vaadin.client.ComputedStyle::elem; - // Border values need to be checked separately. The width might have a - // meaningful value even if the border style is "none". In that case the + // Border values need to be checked separately. The width might have a + // meaningful value even if the border style is "none". In that case the // value should be 0. if(name.indexOf("border") > -1 && name.indexOf("Width") > -1) { var borderStyleProp = name.substring(0,name.length-5) + "Style"; @@ -111,7 +111,7 @@ public class ComputedStyle { } - // Normalize margin values. This is not totally valid, but in most cases + // Normalize margin values. This is not totally valid, but in most cases // it is what the user wants to know. if(name.indexOf("margin") > -1 && ret == "auto") { return "0px"; diff --git a/client/src/main/java/com/vaadin/client/ConnectorMap.java b/client/src/main/java/com/vaadin/client/ConnectorMap.java index ab31f0c1cb..d0dc4d9ab5 100644 --- a/client/src/main/java/com/vaadin/client/ConnectorMap.java +++ b/client/src/main/java/com/vaadin/client/ConnectorMap.java @@ -267,8 +267,7 @@ public class ConnectorMap { @Deprecated public Collection<? extends ServerConnector> getConnectors() { Collection<ComponentDetail> values = idToComponentDetail.values(); - ArrayList<ServerConnector> arrayList = new ArrayList<>( - values.size()); + ArrayList<ServerConnector> arrayList = new ArrayList<>(values.size()); for (ComponentDetail componentDetail : values) { arrayList.add(componentDetail.getConnector()); } diff --git a/client/src/main/java/com/vaadin/client/EventHelper.java b/client/src/main/java/com/vaadin/client/EventHelper.java index 0212fae26c..c1f15c26c5 100644 --- a/client/src/main/java/com/vaadin/client/EventHelper.java +++ b/client/src/main/java/com/vaadin/client/EventHelper.java @@ -46,7 +46,7 @@ import com.google.gwt.user.client.ui.Widget; * if registration is null * register paintable as as handler for event * return the registration - * else + * else * if registration is not null * remove the handler from paintable * return null @@ -149,7 +149,7 @@ public class EventHelper { * {@code handlerRegistration} and adds it via provided * {@code handlerProvider} if connector has event listener with * {@code eventIdentifier}. - * + * * @param connector * connector to check event listener presence * @param eventIdentifier diff --git a/client/src/main/java/com/vaadin/client/FastStringMap.java b/client/src/main/java/com/vaadin/client/FastStringMap.java index 382e2ea1dd..c7e0f82357 100644 --- a/client/src/main/java/com/vaadin/client/FastStringMap.java +++ b/client/src/main/java/com/vaadin/client/FastStringMap.java @@ -52,7 +52,7 @@ public final class FastStringMap<T> extends JavaScriptObject { for(var key in this) { if (Object.hasOwnProperty.call(this, key)) { keys.push(key); - } + } } return keys; }-*/; @@ -63,7 +63,7 @@ public final class FastStringMap<T> extends JavaScriptObject { for(var key in this) { if (Object.hasOwnProperty.call(this, key)) { size++; - } + } } return size; }-*/; diff --git a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java index 4a6e474a59..b9f4ae8962 100644 --- a/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java +++ b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java @@ -402,7 +402,7 @@ public class JavaScriptConnectorHelper { private static native void updateNativeState(JavaScriptObject state, JavaScriptObject input) /*-{ - // Copy all fields to existing state object + // Copy all fields to existing state object for(var key in state) { if (state.hasOwnProperty(key)) { delete state[key]; diff --git a/client/src/main/java/com/vaadin/client/WidgetSet.java b/client/src/main/java/com/vaadin/client/WidgetSet.java index 8c232de019..cf3db7aaa9 100644 --- a/client/src/main/java/com/vaadin/client/WidgetSet.java +++ b/client/src/main/java/com/vaadin/client/WidgetSet.java @@ -27,7 +27,6 @@ import com.vaadin.client.metadata.NoDataException; import com.vaadin.client.metadata.TypeData; import com.vaadin.client.ui.UnknownComponentConnector; import com.vaadin.client.ui.UnknownExtensionConnector; -import com.vaadin.client.ui.UnknownExtensionConnector; public class WidgetSet { /** diff --git a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java index 0795d69b32..0012138ad9 100644 --- a/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java +++ b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java @@ -251,7 +251,7 @@ public class StateChangeEvent target = target[nextSegment]; } } - // Not defined if we reach something that isn't an object + // Not defined if we reach something that isn't an object return false; }-*/; diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractFocusableListingConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractFocusableListingConnector.java index 9ce7dc194c..67ff070eb0 100644 --- a/client/src/main/java/com/vaadin/client/connectors/AbstractFocusableListingConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/AbstractFocusableListingConnector.java @@ -22,7 +22,7 @@ import com.vaadin.client.ui.ConnectorFocusAndBlurHandler; /** * Abstract class for listing widget connectors that contains focusable children * to track their focus/blur events. - * + * * @author Vaadin Ltd * * @param <WIDGET> diff --git a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java index 90ced5e095..9596d7cbe4 100644 --- a/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java @@ -64,7 +64,7 @@ public class JavaScriptRendererConnector private static native JavaScriptObject createCellReferenceWrapper() /*-{ var reference = {}; - + var setProperty = function(name, getter, setter) { var descriptor = { get: getter @@ -74,25 +74,25 @@ public class JavaScriptRendererConnector } Object.defineProperty(reference, name, descriptor); }; - + setProperty("element", function() { return reference.target.@CellReference::getElement()(); }, null); - + setProperty("rowIndex", function() { return reference.target.@CellReference::getRowIndex()(); }, null); - + setProperty("columnIndex", function() { return reference.target.@CellReference::getColumnIndex()(); }, null); - + setProperty("colSpan", function() { return reference.target.@RendererCellReference::getColSpan()(); }, function(colSpan) { reference.target.@RendererCellReference::setColSpan(*)(colSpan); }); - + return reference; }-*/; diff --git a/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java b/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java index f32dae4ac0..e64d3e0025 100644 --- a/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java +++ b/client/src/main/java/com/vaadin/client/connectors/data/HasDataSource.java @@ -21,7 +21,7 @@ import elemental.json.JsonObject; /** * A marker interface for connectors that have a data source. - * + * * @author Vaadin Ltd. * @see DataSource * @since 8.0 diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java index 38504ff867..65300d1faf 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/AbstractGridRendererConnector.java @@ -73,7 +73,7 @@ public abstract class AbstractGridRendererConnector<T> /** * Gets the grid connector for this renderer connector. - * + * * @return the parent grid connector. */ protected GridConnector getGridConnector() { diff --git a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java index 4ca363ea3c..cf7a121190 100644 --- a/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -803,7 +803,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { /** * Checks if it is possible to currently fetch data from the remote data * source. - * + * * @return <code>true</code> if it is ok to try to fetch data, * <code>false</code> if it is known that fetching data will fail * and should not be tried right now. diff --git a/client/src/main/java/com/vaadin/client/event/InputEvent.java b/client/src/main/java/com/vaadin/client/event/InputEvent.java index b8e14dc756..3a387d6792 100644 --- a/client/src/main/java/com/vaadin/client/event/InputEvent.java +++ b/client/src/main/java/com/vaadin/client/event/InputEvent.java @@ -28,8 +28,8 @@ public class InputEvent extends DomEvent<InputHandler> { * Event type for InputEvent. Represents the meta-data associated with this * event. */ - private static final Type<InputHandler> TYPE = new Type<>( - "input", new InputEvent()); + private static final Type<InputHandler> TYPE = new Type<>("input", + new InputEvent()); protected InputEvent() { } diff --git a/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java b/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java index d98b7d65b6..626cb42847 100644 --- a/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java @@ -21,7 +21,7 @@ import com.vaadin.client.ui.AbstractConnector; /** * An abstract implementation for extension connectors. - * + * * @author Vaadin Ltd. * @since 7.0 */ diff --git a/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java index 314d167bfe..5a3d57c55e 100644 --- a/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java @@ -165,26 +165,26 @@ public class ResponsiveConnector extends AbstractExtensionConnector */ private static native void searchForBreakPointsNative() /*-{ - + // Initialize variables @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache = []; @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache = []; - + var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + // Can't do squat if we can't parse stylesheets if(!$doc.styleSheets) return; - + var sheets = $doc.styleSheets; - + // Loop all stylesheets on the page and process them individually for(var i = 0, len = sheets.length; i < len; i++) { var sheet = sheets[i]; @com.vaadin.client.extensions.ResponsiveConnector::searchStylesheetForBreakPoints(Lcom/google/gwt/core/client/JavaScriptObject;)(sheet); } - + }-*/; /** @@ -197,15 +197,15 @@ public class ResponsiveConnector extends AbstractExtensionConnector private static native void searchStylesheetForBreakPoints( final JavaScriptObject sheet) /*-{ - + // Inline variables for easier reading var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + // Get all the rulesets from the stylesheet var theRules = new Array(); var IEOrEdge = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE()() || @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isEdge()(); - + try { if (sheet.cssRules) { theRules = sheet.cssRules @@ -218,18 +218,18 @@ public class ResponsiveConnector extends AbstractExtensionConnector ", probably because of cross domain issues: " + e); return; } - + // Loop through the rulesets for(var i = 0, len = theRules.length; i < len; i++) { var rule = theRules[i]; - + if(rule.type == 3) { // @import rule, traverse recursively @com.vaadin.client.extensions.ResponsiveConnector::searchStylesheetForBreakPoints(Lcom/google/gwt/core/client/JavaScriptObject;)(rule.styleSheet); - + } else if(rule.type == 1 || !rule.type) { // Regular selector rule - + // Helper function var pushToCache = function(ranges, selector, min, max) { // Avoid adding duplicates @@ -245,46 +245,46 @@ public class ResponsiveConnector extends AbstractExtensionConnector ranges.push([selector, min, max]); } }; - + // Array of all of the separate selectors in this ruleset var haystack = rule.selectorText.split(","); - + // IE/Edge parses CSS like .class[attr="val"] into [attr="val"].class so we need to check for both var selectorRegEx = IEOrEdge ? /\[.*\]([\.|#]\S+)/ : /([\.|#]\S+?)\[.*\]/; - + // Loop all the selectors in this ruleset for(var k = 0, len2 = haystack.length; k < len2; k++) { - + // Split the haystack into parts. var widthRange = haystack[k].match(/\[width-range.*?\]/); var heightRange = haystack[k].match(/\[height-range.*?\]/); var selector = haystack[k].match(selectorRegEx); - + if (selector != null) { selector = selector[1]; - + // Check for width-ranges. if (widthRange != null) { var minMax = widthRange[0].match(/\[width-range~?=["|'](.*?)-(.*?)["|']\]/i); var min = minMax[1]; var max = minMax[2]; - + pushToCache(widthRanges, selector, min, max); } - + // Check for height-ranges. if (heightRange != null) { var minMax = heightRange[0].match(/\[height-range~?=["|'](.*?)-(.*?)["|']\]/i); var min = minMax[1]; var max = minMax[2]; - + pushToCache(heightRanges, selector, min, max); } } } } } - + }-*/; /** @@ -294,15 +294,15 @@ public class ResponsiveConnector extends AbstractExtensionConnector */ private native void getBreakPointsFor(final String selectors) /*-{ - + var selectors = selectors.split(","); - + var widthBreakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::widthBreakpoints = []; var heightBreakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::heightBreakpoints = []; - + var widthRanges = @com.vaadin.client.extensions.ResponsiveConnector::widthRangeCache; var heightRanges = @com.vaadin.client.extensions.ResponsiveConnector::heightRangeCache; - + for(var i = 0, len = widthRanges.length; i < len; i++) { var bp = widthRanges[i]; for(var j = 0, len2 = selectors.length; j < len2; j++) { @@ -310,7 +310,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector widthBreakpoints.push(bp); } } - + for(var i = 0, len = heightRanges.length; i < len; i++) { var bp = heightRanges[i]; for(var j = 0, len2 = selectors.length; j < len2; j++) { @@ -318,10 +318,10 @@ public class ResponsiveConnector extends AbstractExtensionConnector heightBreakpoints.push(bp); } } - + // Only for debugging // console.log("Breakpoints for", selectors.join(","), widthBreakpoints, heightBreakpoints); - + }-*/; private String currentWidthRanges = ""; @@ -376,24 +376,24 @@ public class ResponsiveConnector extends AbstractExtensionConnector private native String resolveBreakpoint(String which, int size) /*-{ - + // Default to "width" breakpoints var breakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::widthBreakpoints; - + // Use height breakpoints if we're measuring the height if(which == "height") breakpoints = this.@com.vaadin.client.extensions.ResponsiveConnector::heightBreakpoints; - + // Output string that goes into either the "width-range" or "height-range" attribute in the element var ranges = ""; - + // Loop the breakpoints for(var i = 0, len = breakpoints.length; i < len; i++) { var bp = breakpoints[i]; - + var min = parseInt(bp[1]); var max = parseInt(bp[2]); - + if(!isNaN(min) && !isNaN(max)) { if(min <= size && size <= max) { ranges += " " + bp[1] + "-" + bp[2]; @@ -408,10 +408,10 @@ public class ResponsiveConnector extends AbstractExtensionConnector } } } - + // Trim the output and return it return ranges.replace(/^\s+/, ""); - + }-*/; } diff --git a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java index 91e85305ca..6a0bd3c030 100644 --- a/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java +++ b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java @@ -165,11 +165,13 @@ public abstract class ConnectorBundleLoader { if (notice == null) { notice = new HTML(); notice.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { notice.removeFromParent(); } }); notice.addTouchStartHandler(new TouchStartHandler() { + @Override public void onTouchStart(TouchStartEvent event) { notice.removeFromParent(); } diff --git a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java index f8d6475ed7..1c85c752cf 100644 --- a/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java +++ b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java @@ -354,7 +354,7 @@ public class TypeDataStore { } else { typeData[baseClassName] = {}; - } + } }-*/; private static native boolean hasGetter(JavaScriptObject typeData, diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java index c356affcb1..91c81dece0 100644 --- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java @@ -161,7 +161,7 @@ public abstract class ClickableRenderer<T, W extends Widget> } private native static Escalator getEscalator(Grid<?> grid) - /*-{ + /*-{ return grid.@com.vaadin.client.widgets.Grid::escalator; }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java index a023f152cf..05ac2dd451 100644 --- a/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java @@ -47,7 +47,7 @@ public class ConnectorFocusAndBlurHandler /** * Add focus/blur handlers to the widget of the {@code connector}. - * + * * @param connector * connector whose widget is a target to add focus/blur handlers * @return ConnectorFocusAndBlurHandler instance to remove all registered @@ -61,7 +61,7 @@ public class ConnectorFocusAndBlurHandler /** * Add focus/blur handlers to the widget and a state change handler for the * {@code connector}. - * + * * @param connector * connector to register state change handler * @param widget diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java index 6ecea2d116..df4d67e258 100644 --- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java +++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java @@ -241,12 +241,12 @@ public class VComboBox extends Composite implements Field, KeyDownHandler, return $entry(function(e) { var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX; var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY; - + // IE8 has only delta y if (isNaN(deltaY)) { deltaY = -0.5*e.wheelDelta; } - + @com.vaadin.client.ui.VComboBox.JsniUtil::moveScrollFromEvent(*)(widget, deltaX, deltaY, e, e.deltaMode); }); }-*/; diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java index f56228f26e..eece76b39a 100644 --- a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java +++ b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java @@ -129,8 +129,8 @@ public class VPopupCalendar extends VTextualDate // Description of the usage of the widget for assisitve device users descriptionForAssisitveDevicesElement = DOM.createDiv(); - descriptionForAssisitveDevicesElement.setInnerText( - DateFieldState.DESCRIPTION_FOR_ASSISTIVE_DEVICES); + descriptionForAssisitveDevicesElement + .setInnerText(DateFieldState.DESCRIPTION_FOR_ASSISTIVE_DEVICES); AriaHelper.ensureHasId(descriptionForAssisitveDevicesElement); Roles.getTextboxRole().setAriaDescribedbyProperty(text.getElement(), Id.of(descriptionForAssisitveDevicesElement)); diff --git a/client/src/main/java/com/vaadin/client/ui/VWindow.java b/client/src/main/java/com/vaadin/client/ui/VWindow.java index 8d64bb6b4f..9656378f58 100644 --- a/client/src/main/java/com/vaadin/client/ui/VWindow.java +++ b/client/src/main/java/com/vaadin/client/ui/VWindow.java @@ -355,7 +355,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, /** * Returns window position in list of opened and shown windows. - * + * * @since 8.0.0 */ public final int getWindowOrder() { @@ -1509,7 +1509,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, /** * Adds a Handler for window order change event. - * + * * @since 8.0.0 * * @return registration object to deregister the handler @@ -1522,7 +1522,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, /** * Checks if a modal window is currently open. - * + * * @return <code>true</code> if a modal window is open, <code>false</code> * otherwise. */ diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java index 2b57968e3b..cd0a3d1466 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java @@ -31,8 +31,8 @@ import com.vaadin.ui.components.colorpicker.ColorPickerGrid; /** * A class that defines the default implementation for a color picker grid * connector. Connects the server side - * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the - * client side counterpart {@link VColorPickerGrid} + * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the client + * side counterpart {@link VColorPickerGrid} * * @since 7.0.0 */ diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java index 6d8eb2c9c1..e91949191d 100644 --- a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java +++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java @@ -70,7 +70,7 @@ public class VColorPickerGrid extends AbsolutePanel * The new grid replaces the old grid if one existed. * <p> * For internal use only. May be renamed or removed in a future release. - * + * * @param rowCount * @param columnCount */ diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java index 4a08399bdf..7161283176 100644 --- a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java @@ -23,7 +23,6 @@ import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.user.client.ui.PopupPanel; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; -import com.vaadin.client.annotations.OnStateChange; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener; import com.vaadin.client.ui.VPopupCalendar; diff --git a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java index 03c7693979..26aaf837f5 100644 --- a/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java +++ b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java @@ -725,8 +725,7 @@ public class LayoutDependencyTree { public Collection<ComponentConnector> getMeasureTargets() { JsArrayString targetIds = getMeasureTargetsJsArray(); int length = targetIds.length(); - ArrayList<ComponentConnector> targets = new ArrayList<>( - length); + ArrayList<ComponentConnector> targets = new ArrayList<>(length); ConnectorMap connectorMap = ConnectorMap.get(connection); for (int i = 0; i < length; i++) { diff --git a/client/src/main/java/com/vaadin/client/ui/window/WindowOrderEvent.java b/client/src/main/java/com/vaadin/client/ui/window/WindowOrderEvent.java index 33517462ea..d17e28dc39 100644 --- a/client/src/main/java/com/vaadin/client/ui/window/WindowOrderEvent.java +++ b/client/src/main/java/com/vaadin/client/ui/window/WindowOrderEvent.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 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 @@ -22,9 +22,9 @@ import com.vaadin.client.ui.VWindow; /** * Event for window order position updates. - * + * * @since 8.0.0 - * + * * @author Vaadin Ltd */ public class WindowOrderEvent extends GwtEvent<WindowOrderHandler> { @@ -35,7 +35,7 @@ public class WindowOrderEvent extends GwtEvent<WindowOrderHandler> { /** * Creates a new event with the given order. - * + * * @param windows * The new order position for the VWindow */ @@ -50,7 +50,7 @@ public class WindowOrderEvent extends GwtEvent<WindowOrderHandler> { /** * Returns windows in order. - * + * * @return windows in the specific order */ public VWindow[] getWindows() { @@ -64,7 +64,7 @@ public class WindowOrderEvent extends GwtEvent<WindowOrderHandler> { /** * Gets the type of the event. - * + * * @return the type of the event */ public static Type<WindowOrderHandler> getType() { diff --git a/client/src/main/java/com/vaadin/client/ui/window/WindowOrderHandler.java b/client/src/main/java/com/vaadin/client/ui/window/WindowOrderHandler.java index 3a492ef27e..f3cffce63c 100644 --- a/client/src/main/java/com/vaadin/client/ui/window/WindowOrderHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/window/WindowOrderHandler.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 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 @@ -19,16 +19,16 @@ import com.google.gwt.event.shared.EventHandler; /** * Handler for {@link WindowOrderEvent}s. - * + * * @since 8.0.0 - * + * * @author Vaadin Ltd */ public interface WindowOrderHandler extends EventHandler { /** * Called when the VWindow instances changed their order position. - * + * * @param event * Contains windows whose position has changed */ diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java index ed8d3cd57b..b5aaa5d894 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java @@ -645,7 +645,7 @@ public abstract class ScrollbarBundle implements DeferredWorker { * This needs to be made step-by-step because IE8 flat-out refuses to * fire a scroll event when the scroll size becomes smaller than the * offset size. All other browser need to suffer alongside. - * + * * This really should be changed to not use any temporary scroll * handlers at all once IE8 support is dropped, like now done only for * Firefox. diff --git a/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java index a77f4ec86a..9f98e3e500 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java @@ -87,7 +87,7 @@ public class EventCellReference<T> extends CellReference<T> { * Is the cell reference for a cell in the header of the Grid. * * @since 7.5 - * @return <code>true</true> if referenced cell is in the header, + * @return <code>true</true> if referenced cell is in the header, * <code>false</code> if not */ public boolean isHeader() { @@ -98,7 +98,7 @@ public class EventCellReference<T> extends CellReference<T> { * Is the cell reference for a cell in the body of the Grid. * * @since 7.5 - * @return <code>true</true> if referenced cell is in the body, + * @return <code>true</true> if referenced cell is in the body, * <code>false</code> if not */ public boolean isBody() { @@ -109,7 +109,7 @@ public class EventCellReference<T> extends CellReference<T> { * Is the cell reference for a cell in the footer of the Grid. * * @since 7.5 - * @return <code>true</true> if referenced cell is in the footer, + * @return <code>true</true> if referenced cell is in the footer, * <code>false</code> if not */ public boolean isFooter() { diff --git a/client/src/main/java/com/vaadin/client/widget/grid/events/GridSelectionAllowedHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridSelectionAllowedHandler.java index 23788b329b..fcbc9c8bb0 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/events/GridSelectionAllowedHandler.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridSelectionAllowedHandler.java @@ -20,7 +20,7 @@ import com.google.gwt.event.shared.EventHandler; /** * Handler for a Grid {@link GridSelectionAllowedEvent}, called when the Grid is * becomes allowed for selection or disallowed. - * + * * @see GridSelectionAllowedEvent * @author Vaadin Ltd * @since 8.0 diff --git a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java index 28499621df..17763b0a94 100644 --- a/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java +++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java @@ -97,7 +97,7 @@ public interface SelectionModel<T> { * <p> * The check is done only for the client side actions. It doesn't affect * selection requests sent from the server side. - * + * * @param selectionAllowed * <code>true</code> if the user is allowed to change the * selection, <code>false</code> otherwise @@ -109,7 +109,7 @@ public interface SelectionModel<T> { * <p> * The check is done only for the client side actions. It doesn't affect * selection requests sent from the server side. - * + * * @return <code>true</code> if the user is allowed to change the selection, * <code>false</code> otherwise */ diff --git a/client/src/main/java/com/vaadin/client/widgets/ChildFocusAwareFlowPanel.java b/client/src/main/java/com/vaadin/client/widgets/ChildFocusAwareFlowPanel.java index 1f801f5838..56a6164901 100644 --- a/client/src/main/java/com/vaadin/client/widgets/ChildFocusAwareFlowPanel.java +++ b/client/src/main/java/com/vaadin/client/widgets/ChildFocusAwareFlowPanel.java @@ -37,7 +37,7 @@ import com.vaadin.client.ui.FocusableFlowPanel; * Focusable flow panel which fires focus/blur events if it or any of its child * is focused/blured, but doesn't fire events if it happens between its content * (child) elements. - * + * * @author Vaadin Ltd * */ diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java index e3953b436a..d0de3957d9 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java +++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java @@ -468,9 +468,9 @@ public class Escalator extends Widget if (isCurrentBrowserIE11OrEdge()) { return vertical ? event.getNativeEvent().getClientY() - + Window.getScrollTop() + + Window.getScrollTop() : event.getNativeEvent().getClientX() - + Window.getScrollLeft(); + + Window.getScrollLeft(); } JsArray<Touch> a = event.getNativeEvent().getTouches(); return vertical ? a.get(0).getPageY() : a.get(0).getPageX(); @@ -563,9 +563,11 @@ public class Escalator extends Widget // (#18737), // otherwise allow touch only if there is a single touch in the // event - private boolean allowTouch(final TouchHandlerBundle.CustomTouchEvent event) { + private boolean allowTouch( + final TouchHandlerBundle.CustomTouchEvent event) { if (isCurrentBrowserIE11OrEdge()) { - return (POINTER_EVENT_TYPE_TOUCH.equals(event.getPointerType())); + return (POINTER_EVENT_TYPE_TOUCH + .equals(event.getPointerType())); } else { return (event.getNativeEvent().getTouches().length() == 1); } @@ -987,8 +989,8 @@ public class Escalator extends Widget }-*/; /** - * Using pointerdown, pointermove, pointerup, and pointercancel for IE11 and Edge instead of - * touch* listeners (#18737) + * Using pointerdown, pointermove, pointerup, and pointercancel for IE11 + * and Edge instead of touch* listeners (#18737) * * @param element */ @@ -1009,8 +1011,8 @@ public class Escalator extends Widget }-*/; /** - * Using pointerdown, pointermove, pointerup, and pointercancel for IE11 and Edge instead of - * touch* listeners (#18737) + * Using pointerdown, pointermove, pointerup, and pointercancel for IE11 + * and Edge instead of touch* listeners (#18737) * * @param element */ @@ -6859,6 +6861,7 @@ public class Escalator extends Widget /** * Internal method for checking whether the browser is IE11 or Edge + * * @return true only if the current browser is IE11, or Edge */ private static boolean isCurrentBrowserIE11OrEdge() { diff --git a/client/src/main/java/com/vaadin/client/widgets/FocusableFlowPanelComposite.java b/client/src/main/java/com/vaadin/client/widgets/FocusableFlowPanelComposite.java index 7a24549664..eb7640de61 100644 --- a/client/src/main/java/com/vaadin/client/widgets/FocusableFlowPanelComposite.java +++ b/client/src/main/java/com/vaadin/client/widgets/FocusableFlowPanelComposite.java @@ -25,7 +25,7 @@ import com.vaadin.client.Focusable; /** * Focusable composite whose widget is {@link ChildFocusAwareFlowPanel} (flow * panel that tracks focus/blur events from its children). - * + * * @author Vaadin Ltd * */ diff --git a/server/src/main/java/com/vaadin/data/BeanBinder.java b/server/src/main/java/com/vaadin/data/BeanBinder.java index 07bc40b1dd..8f79ff4f88 100644 --- a/server/src/main/java/com/vaadin/data/BeanBinder.java +++ b/server/src/main/java/com/vaadin/data/BeanBinder.java @@ -36,9 +36,9 @@ import com.googlecode.gentyref.GenericTypeReflector; import com.vaadin.annotations.PropertyId; import com.vaadin.data.util.BeanUtil; import com.vaadin.data.validator.BeanValidator; -import com.vaadin.server.Setter; import com.vaadin.server.SerializableFunction; import com.vaadin.server.SerializablePredicate; +import com.vaadin.server.Setter; import com.vaadin.ui.Label; import com.vaadin.util.ReflectTools; @@ -160,8 +160,7 @@ public class BeanBinder<BEAN> extends Binder<BEAN> { * @throws IllegalArgumentException * if the property has no accessible getter * - * @see BindingBuilder#bind(ValueProvider, - * Setter) + * @see BindingBuilder#bind(ValueProvider, Setter) */ public Binding<BEAN, TARGET> bind(String propertyName); } diff --git a/server/src/main/java/com/vaadin/data/Binder.java b/server/src/main/java/com/vaadin/data/Binder.java index 94a16d9da9..5cde210189 100644 --- a/server/src/main/java/com/vaadin/data/Binder.java +++ b/server/src/main/java/com/vaadin/data/Binder.java @@ -34,9 +34,9 @@ import com.vaadin.data.HasValue.ValueChangeEvent; import com.vaadin.data.converter.StringToIntegerConverter; import com.vaadin.event.EventRouter; import com.vaadin.server.ErrorMessage; -import com.vaadin.server.Setter; import com.vaadin.server.SerializableFunction; import com.vaadin.server.SerializablePredicate; +import com.vaadin.server.Setter; import com.vaadin.server.UserError; import com.vaadin.shared.Registration; import com.vaadin.ui.AbstractComponent; @@ -171,8 +171,7 @@ public class Binder<BEAN> implements Serializable { * @throws IllegalStateException * if {@code bind} has already been called on this binding */ - public Binding<BEAN, TARGET> bind( - ValueProvider<BEAN, TARGET> getter, + public Binding<BEAN, TARGET> bind(ValueProvider<BEAN, TARGET> getter, Setter<BEAN, TARGET> setter); /** @@ -255,8 +254,8 @@ public class Binder<BEAN> implements Serializable { * which must match the current target data type of the binding, and a * model type, which can be any data type and becomes the new target * type of the binding. When invoking - * {@link #bind(ValueProvider, Setter)}, the - * target type of the binding must match the getter/setter types. + * {@link #bind(ValueProvider, Setter)}, the target type of the binding + * must match the getter/setter types. * <p> * For instance, a {@code TextField} can be bound to an integer-typed * property using an appropriate converter such as a @@ -281,8 +280,8 @@ public class Binder<BEAN> implements Serializable { * type, which must match the current target data type of the binding, * and a model type, which can be any data type and becomes the new * target type of the binding. When invoking - * {@link #bind(ValueProvider, Setter)}, the - * target type of the binding must match the getter/setter types. + * {@link #bind(ValueProvider, Setter)}, the target type of the binding + * must match the getter/setter types. * <p> * For instance, a {@code TextField} can be bound to an integer-typed * property using appropriate functions such as: @@ -316,8 +315,8 @@ public class Binder<BEAN> implements Serializable { * type, which must match the current target data type of the binding, * and a model type, which can be any data type and becomes the new * target type of the binding. When invoking - * {@link #bind(ValueProvider, Setter)}, the - * target type of the binding must match the getter/setter types. + * {@link #bind(ValueProvider, Setter)}, the target type of the binding + * must match the getter/setter types. * <p> * For instance, a {@code TextField} can be bound to an integer-typed * property using appropriate functions such as: @@ -381,12 +380,13 @@ public class Binder<BEAN> implements Serializable { * default behavior). * <p> * This is just a shorthand for - * {@link #withValidationStatusHandler(BindingValidationStatusHandler)} method - * where the handler instance hides the {@code label} if there is no - * error and shows it with validation error message if validation fails. - * It means that it cannot be called after - * {@link #withValidationStatusHandler(BindingValidationStatusHandler)} method - * call or {@link #withValidationStatusHandler(BindingValidationStatusHandler)} + * {@link #withValidationStatusHandler(BindingValidationStatusHandler)} + * method where the handler instance hides the {@code label} if there is + * no error and shows it with validation error message if validation + * fails. It means that it cannot be called after + * {@link #withValidationStatusHandler(BindingValidationStatusHandler)} + * method call or + * {@link #withValidationStatusHandler(BindingValidationStatusHandler)} * after this method call. * * @see #withValidationStatusHandler(BindingValidationStatusHandler) @@ -405,8 +405,8 @@ public class Binder<BEAN> implements Serializable { } /** - * Sets a {@link BindingValidationStatusHandler} to track validation status - * changes. + * Sets a {@link BindingValidationStatusHandler} to track validation + * status changes. * <p> * The validation state of each field is updated whenever the user * modifies the value of that field. The validation state is by default @@ -532,8 +532,7 @@ public class Binder<BEAN> implements Serializable { } @Override - public Binding<BEAN, TARGET> bind( - ValueProvider<BEAN, TARGET> getter, + public Binding<BEAN, TARGET> bind(ValueProvider<BEAN, TARGET> getter, Setter<BEAN, TARGET> setter) { checkUnbound(); Objects.requireNonNull(getter, "getter cannot be null"); @@ -575,9 +574,9 @@ public class Binder<BEAN> implements Serializable { checkUnbound(); Objects.requireNonNull(handler, "handler cannot be null"); if (isStatusHandlerChanged) { - throw new IllegalStateException( - "A " + BindingValidationStatusHandler.class.getSimpleName() - + " has already been set"); + throw new IllegalStateException("A " + + BindingValidationStatusHandler.class.getSimpleName() + + " has already been set"); } isStatusHandlerChanged = true; statusHandler = handler; @@ -735,7 +734,8 @@ public class Binder<BEAN> implements Serializable { /** * Returns the field value run through all converters and validators, - * but doesn't pass the {@link BindingValidationStatus} to any status handler. + * but doesn't pass the {@link BindingValidationStatus} to any status + * handler. * * @return the result of the conversion */ @@ -755,7 +755,8 @@ public class Binder<BEAN> implements Serializable { /** * Returns the field value run through all converters and validators, - * but doesn't pass the {@link BindingValidationStatus} to any status handler. + * but doesn't pass the {@link BindingValidationStatus} to any status + * handler. * * @return the validation status */ @@ -976,9 +977,8 @@ public class Binder<BEAN> implements Serializable { /** * Creates a new binding for the given field. The returned builder may be * further configured before invoking - * {@link BindingBuilder#bind(ValueProvider, Setter)} - * which completes the binding. Until {@code Binding.bind} is called, the - * binding has no effect. + * {@link BindingBuilder#bind(ValueProvider, Setter)} which completes the + * binding. Until {@code Binding.bind} is called, the binding has no effect. * <p> * <strong>Note:</strong> Not all {@link HasValue} implementations support * passing {@code null} as the value. For these the Binder will @@ -1059,8 +1059,7 @@ public class Binder<BEAN> implements Serializable { * @return the newly created binding */ public <FIELDVALUE> Binding<BEAN, FIELDVALUE> bind( - HasValue<FIELDVALUE> field, - ValueProvider<BEAN, FIELDVALUE> getter, + HasValue<FIELDVALUE> field, ValueProvider<BEAN, FIELDVALUE> getter, Setter<BEAN, FIELDVALUE> setter) { return forField(field).bind(getter, setter); } @@ -1133,8 +1132,8 @@ public class Binder<BEAN> implements Serializable { setHasChanges(false); bindings.forEach(binding -> binding.initFieldValue(bean)); - getValidationStatusHandler() - .statusChange(BinderValidationStatus.createUnresolvedStatus(this)); + getValidationStatusHandler().statusChange( + BinderValidationStatus.createUnresolvedStatus(this)); fireStatusChangeEvent(false); } @@ -1208,8 +1207,8 @@ public class Binder<BEAN> implements Serializable { // First run fields level validation List<BindingValidationStatus<?>> bindingStatuses = validateBindings(); // If no validation errors then update bean - if (bindingStatuses.stream().filter(BindingValidationStatus::isError).findAny() - .isPresent()) { + if (bindingStatuses.stream().filter(BindingValidationStatus::isError) + .findAny().isPresent()) { fireStatusChangeEvent(true); return new BinderValidationStatus<>(this, bindingStatuses, Collections.emptyList()); @@ -1325,8 +1324,8 @@ public class Binder<BEAN> implements Serializable { List<BindingValidationStatus<?>> bindingStatuses = validateBindings(); BinderValidationStatus<BEAN> validationStatus; - if (bindingStatuses.stream().filter(BindingValidationStatus::isError).findAny() - .isPresent() || bean == null) { + if (bindingStatuses.stream().filter(BindingValidationStatus::isError) + .findAny().isPresent() || bean == null) { validationStatus = new BinderValidationStatus<>(this, bindingStatuses, Collections.emptyList()); } else { @@ -1371,11 +1370,10 @@ public class Binder<BEAN> implements Serializable { */ private List<ValidationResult> validateBean(BEAN bean) { Objects.requireNonNull(bean, "bean cannot be null"); - List<ValidationResult> results = Collections - .unmodifiableList(validators.stream() - .map(validator -> validator.apply(bean, - new ValueContext())) - .collect(Collectors.toList())); + List<ValidationResult> results = Collections.unmodifiableList(validators + .stream() + .map(validator -> validator.apply(bean, new ValueContext())) + .collect(Collectors.toList())); return results; } @@ -1472,9 +1470,7 @@ public class Binder<BEAN> implements Serializable { * <li>{@link #readBean(Object)} is called * <li>{@link #setBean(Object)} is called * <li>{@link #removeBean()} is called - * <li> - * {@link BindingBuilder#bind(ValueProvider, Setter)} - * is called + * <li>{@link BindingBuilder#bind(ValueProvider, Setter)} is called * <li>{@link Binder#validate()} or {@link Binding#validate()} is called * </ul> * @@ -1552,7 +1548,8 @@ public class Binder<BEAN> implements Serializable { } /** - * Default {@link BindingValidationStatusHandler} functional method implementation. + * Default {@link BindingValidationStatusHandler} functional method + * implementation. * * @param status * the validation status @@ -1673,8 +1670,8 @@ public class Binder<BEAN> implements Serializable { if (bean != null) { bean = null; } - getValidationStatusHandler() - .statusChange(BinderValidationStatus.createUnresolvedStatus(this)); + getValidationStatusHandler().statusChange( + BinderValidationStatus.createUnresolvedStatus(this)); if (fireStatusEvent) { fireStatusChangeEvent(false); } diff --git a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java index c95a93f074..f89b743258 100644 --- a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java +++ b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java @@ -71,8 +71,8 @@ public class BinderValidationStatus<BEAN> implements Serializable { public static <BEAN> BinderValidationStatus<BEAN> createUnresolvedStatus( Binder<BEAN> source) { return new BinderValidationStatus<>(source, - source.getBindings().stream() - .map(b -> BindingValidationStatus.createUnresolvedStatus(b)) + source.getBindings().stream().map( + b -> BindingValidationStatus.createUnresolvedStatus(b)) .collect(Collectors.toList()), Collections.emptyList()); } @@ -118,8 +118,9 @@ public class BinderValidationStatus<BEAN> implements Serializable { public boolean hasErrors() { return binderStatuses.stream().filter(ValidationResult::isError) .findAny().isPresent() - || bindingStatuses.stream().filter(BindingValidationStatus::isError) - .findAny().isPresent(); + || bindingStatuses.stream() + .filter(BindingValidationStatus::isError).findAny() + .isPresent(); } /** diff --git a/server/src/main/java/com/vaadin/data/Converter.java b/server/src/main/java/com/vaadin/data/Converter.java index cf59a0fc0c..5f1094141c 100644 --- a/server/src/main/java/com/vaadin/data/Converter.java +++ b/server/src/main/java/com/vaadin/data/Converter.java @@ -19,6 +19,7 @@ package com.vaadin.data; import java.io.Serializable; import java.util.function.Function; +import com.vaadin.data.Binder.BindingBuilder; import com.vaadin.server.SerializableFunction; /** diff --git a/server/src/main/java/com/vaadin/data/Result.java b/server/src/main/java/com/vaadin/data/Result.java index 312701584f..cf4b88adf0 100644 --- a/server/src/main/java/com/vaadin/data/Result.java +++ b/server/src/main/java/com/vaadin/data/Result.java @@ -16,14 +16,14 @@ package com.vaadin.data; -import com.vaadin.server.SerializableConsumer; -import com.vaadin.server.SerializableFunction; -import com.vaadin.server.SerializableSupplier; - import java.io.Serializable; import java.util.Objects; import java.util.Optional; +import com.vaadin.server.SerializableConsumer; +import com.vaadin.server.SerializableFunction; +import com.vaadin.server.SerializableSupplier; + /** * Represents the result of an operation that might fail, such as type * conversion. A result may contain either a value, signifying a successful @@ -131,7 +131,8 @@ public interface Result<R> extends Serializable { * @param ifError * the function to call if failure */ - public void handle(SerializableConsumer<R> ifOk, SerializableConsumer<String> ifError); + public void handle(SerializableConsumer<R> ifOk, + SerializableConsumer<String> ifError); /** * Applies the {@code consumer} if result is not an error. @@ -184,5 +185,6 @@ public interface Result<R> extends Serializable { * if this result denotes an error */ public <X extends Throwable> R getOrThrow( - SerializableFunction<String, ? extends X> exceptionProvider) throws X; + SerializableFunction<String, ? extends X> exceptionProvider) + throws X; } diff --git a/server/src/main/java/com/vaadin/data/SimpleResult.java b/server/src/main/java/com/vaadin/data/SimpleResult.java index 61df0ca6f9..85dee60c8f 100644 --- a/server/src/main/java/com/vaadin/data/SimpleResult.java +++ b/server/src/main/java/com/vaadin/data/SimpleResult.java @@ -15,12 +15,12 @@ */ package com.vaadin.data; -import com.vaadin.server.SerializableConsumer; -import com.vaadin.server.SerializableFunction; - import java.util.Objects; import java.util.Optional; +import com.vaadin.server.SerializableConsumer; +import com.vaadin.server.SerializableFunction; + /** * An internal implementation of {@code Result}. * @@ -66,7 +66,8 @@ class SimpleResult<R> implements Result<R> { } @Override - public void handle(SerializableConsumer<R> ifOk, SerializableConsumer<String> ifError) { + public void handle(SerializableConsumer<R> ifOk, + SerializableConsumer<String> ifError) { Objects.requireNonNull(ifOk, "ifOk cannot be null"); Objects.requireNonNull(ifError, "ifError cannot be null"); if (isError()) { @@ -97,7 +98,8 @@ class SimpleResult<R> implements Result<R> { @Override public <X extends Throwable> R getOrThrow( - SerializableFunction<String, ? extends X> exceptionSupplier) throws X { + SerializableFunction<String, ? extends X> exceptionSupplier) + throws X { Objects.requireNonNull(exceptionSupplier, "Exception supplier cannot be null"); if (isError()) { diff --git a/server/src/main/java/com/vaadin/data/StatusChangeEvent.java b/server/src/main/java/com/vaadin/data/StatusChangeEvent.java index 42f92e654c..e4db2b8868 100644 --- a/server/src/main/java/com/vaadin/data/StatusChangeEvent.java +++ b/server/src/main/java/com/vaadin/data/StatusChangeEvent.java @@ -32,8 +32,7 @@ import com.vaadin.server.Setter; * <li>{@link Binder#readBean(Object)} is called * <li>{@link Binder#setBean(Object)} is called * <li>{@link Binder#removeBean()} is called - * <li>{@link BindingBuilder#bind(ValueProvider, Setter)} - * is called + * <li>{@link BindingBuilder#bind(ValueProvider, Setter)} is called * <li>{@link Binder#validate()} or {@link Binding#validate()} is called * </ul> * diff --git a/server/src/main/java/com/vaadin/data/ValidationException.java b/server/src/main/java/com/vaadin/data/ValidationException.java index fe515ad56d..3122614b36 100644 --- a/server/src/main/java/com/vaadin/data/ValidationException.java +++ b/server/src/main/java/com/vaadin/data/ValidationException.java @@ -44,7 +44,8 @@ public class ValidationException extends Exception { * @param beanValidationErrors * binder validation errors list */ - public ValidationException(List<BindingValidationStatus<?>> fieldValidationErrors, + public ValidationException( + List<BindingValidationStatus<?>> fieldValidationErrors, List<ValidationResult> beanValidationErrors) { super("Validation has failed for some fields"); this.fieldValidationErrors = Collections diff --git a/server/src/main/java/com/vaadin/data/ValidationResult.java b/server/src/main/java/com/vaadin/data/ValidationResult.java index 489631005f..d458911ba1 100644 --- a/server/src/main/java/com/vaadin/data/ValidationResult.java +++ b/server/src/main/java/com/vaadin/data/ValidationResult.java @@ -78,7 +78,7 @@ public interface ValidationResult extends Serializable { /** * Returns a successful result. - * + * * @return the successful result */ public static ValidationResult ok() { @@ -88,7 +88,7 @@ public interface ValidationResult extends Serializable { /** * Creates the validation result which represent an error with the given * {@code errorMessage}. - * + * * @param errorMessage * error message, not {@code null} * @return validation result which represent an error with the given diff --git a/server/src/main/java/com/vaadin/data/ValueContext.java b/server/src/main/java/com/vaadin/data/ValueContext.java index 98aef181dc..07857d34af 100644 --- a/server/src/main/java/com/vaadin/data/ValueContext.java +++ b/server/src/main/java/com/vaadin/data/ValueContext.java @@ -39,8 +39,8 @@ public class ValueContext implements Serializable { * Constructor for {@code ValueContext} without a {@code Locale}. */ public ValueContext() { - this.component = null; - this.locale = findLocale(); + component = null; + locale = findLocale(); } /** @@ -50,7 +50,7 @@ public class ValueContext implements Serializable { * The locale used with conversion. Can be null. */ public ValueContext(Locale locale) { - this.component = null; + component = null; this.locale = locale; } @@ -64,7 +64,7 @@ public class ValueContext implements Serializable { Objects.requireNonNull(component, "Component can't be null in ValueContext construction"); this.component = component; - this.locale = findLocale(); + locale = findLocale(); } private Locale findLocale() { diff --git a/server/src/main/java/com/vaadin/data/ValueProvider.java b/server/src/main/java/com/vaadin/data/ValueProvider.java index 9e4acc466f..9617cc559f 100644 --- a/server/src/main/java/com/vaadin/data/ValueProvider.java +++ b/server/src/main/java/com/vaadin/data/ValueProvider.java @@ -23,7 +23,7 @@ import com.vaadin.server.SerializableFunction; * For example this interface can be implemented to simply extract a value with * a getter, or to create a composite value based on the fields of the source * object. - * + * * @author Vaadin Ltd. * @since 8.0 * @@ -49,7 +49,7 @@ public interface ValueProvider<SOURCE, TARGET> /** * Provides a value from the given source object. - * + * * @param source * the source to retrieve the value from * @return the value provided by the source diff --git a/server/src/main/java/com/vaadin/data/provider/DataGenerator.java b/server/src/main/java/com/vaadin/data/provider/DataGenerator.java index 32c41473ed..f7ffa78ab6 100644 --- a/server/src/main/java/com/vaadin/data/provider/DataGenerator.java +++ b/server/src/main/java/com/vaadin/data/provider/DataGenerator.java @@ -35,7 +35,8 @@ public interface DataGenerator<T> extends Serializable { /** * Adds custom data for the given item to its serialized {@code JsonObject} - * representation. This JSON object will be sent to client-side DataProvider. + * representation. This JSON object will be sent to client-side + * DataProvider. * * @param item * the data item being serialized diff --git a/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java b/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java index 99693a2c1b..582bdc1d86 100644 --- a/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java +++ b/server/src/main/java/com/vaadin/data/provider/DataProviderListener.java @@ -20,7 +20,7 @@ import java.io.Serializable; /** * Interface for listening for a data change events fired by a * {@link DataProvider}. - * + * * @author Vaadin Ltd * @since 8.0 */ diff --git a/server/src/main/java/com/vaadin/event/ActionManager.java b/server/src/main/java/com/vaadin/event/ActionManager.java index 5d9a92e000..1056106b16 100644 --- a/server/src/main/java/com/vaadin/event/ActionManager.java +++ b/server/src/main/java/com/vaadin/event/ActionManager.java @@ -15,6 +15,7 @@ */ package com.vaadin.event; +import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Map; @@ -26,7 +27,6 @@ import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.VariableOwner; import com.vaadin.ui.Component; -import java.util.Arrays; /** * Javadoc TODO diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index b5c45732f9..fec20f8d6f 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -190,7 +190,7 @@ public interface FieldEvents { /** * Focus and blur server RPC implementation which fires focus or blur event * using a provided event handler. - * + * * @author Vaadin Ltd * */ @@ -201,7 +201,7 @@ public interface FieldEvents { /** * Create a new decorator instance. - * + * * @param component * the source events component * @param eventHandler diff --git a/server/src/main/java/com/vaadin/event/SortEvent.java b/server/src/main/java/com/vaadin/event/SortEvent.java index 496e5863f9..23182fcfb0 100644 --- a/server/src/main/java/com/vaadin/event/SortEvent.java +++ b/server/src/main/java/com/vaadin/event/SortEvent.java @@ -78,7 +78,7 @@ public class SortEvent<T> extends Component.Event { /** * Listener for sort order change events. - * + * * @param <T> * the type of the sorting information, usually a String (field * id) or a {@link java.util.Comparator}. @@ -97,7 +97,7 @@ public class SortEvent<T> extends Component.Event { /** * The interface for adding and removing listeners for {@link SortEvent * SortEvents}. - * + * * @param <T> * the type of the sorting information, usually a String (field * id) or a {@link java.util.Comparator}. diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java index 49ea24e5cb..23b82c4def 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -63,8 +63,8 @@ public class SourceIs extends ClientSideCriterion { @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { - Component sourceComponent = dragEvent - .getTransferable().getSourceComponent(); + Component sourceComponent = dragEvent.getTransferable() + .getSourceComponent(); for (Component c : components) { if (c == sourceComponent) { return true; diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java index 8cb16e4313..2a0fd25662 100644 --- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java +++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java @@ -46,8 +46,8 @@ public class SourceIsTarget extends ClientSideCriterion { @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { - Component sourceComponent = dragEvent - .getTransferable().getSourceComponent(); + Component sourceComponent = dragEvent.getTransferable() + .getSourceComponent(); DropTarget target = dragEvent.getTargetDetails().getTarget(); return sourceComponent == target; } diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java index a9709f3826..baab7a04da 100644 --- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java +++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java @@ -878,8 +878,7 @@ public abstract class AbstractClientConnector * <p> * Note: Using this method is discouraged because it cannot be checked * during compilation. Use {@link #addListener(Class, Object, Method)} or - * {@link #addListener(String, Class, Object, Method) instead. - * </p> + * {@link #addListener(String, Class, Object, Method) instead. </p> * * @param eventType * the type of the listened event. Events of this type or its @@ -920,9 +919,8 @@ public abstract class AbstractClientConnector * @param target * the target object that has registered to listen to events of * type <code>eventType</code> with one or more methods. - * @deprecated use a {@link Registration} from - * {@link #addListener} to remove a - * listener + * @deprecated use a {@link Registration} from {@link #addListener} to + * remove a listener */ @Deprecated @Override diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java index 3cb1dc9097..895598ae6f 100644 --- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java @@ -354,7 +354,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { throws IOException { response.setContentType("text/html"); try (BufferedWriter writer = new BufferedWriter( - new OutputStreamWriter(response.getOutputStream(), "UTF-8"))) { + new OutputStreamWriter(response.getOutputStream(), "UTF-8"))) { writer.append(html); } } diff --git a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java index 8d597f45e0..70af410e5c 100644 --- a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java +++ b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java @@ -209,7 +209,7 @@ public class BrowserWindowOpener extends AbstractExtension { } // Avoid breaking url to multiple lines - // @formatter:off + // @formatter:off /** * Sets the features for opening the window. See e.g. * {@link https://developer.mozilla.org/en-US/docs/DOM/window.open#Position_and_size_features} diff --git a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java index a9068495dc..20100e0e5a 100644 --- a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java +++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java @@ -17,7 +17,9 @@ package com.vaadin.server; import java.io.PrintStream; import java.io.Serializable; +import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.Deque; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -40,8 +42,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import java.util.ArrayDeque; -import java.util.Deque; @SuppressWarnings({ "serial", "deprecation" }) public class ComponentSizeValidator implements Serializable { @@ -104,7 +104,7 @@ public class ComponentSizeValidator implements Serializable { /** * Comparability form component which is defined in the different jar. - * + * * TODO : Normally this logic shouldn't be here. But it means that the whole * this class has wrong design and implementation and should be refactored. */ @@ -402,7 +402,8 @@ public class ComponentSizeValidator implements Serializable { } if (createLoc != null) { - err.append(", created at (").append(createLoc.file).append(":").append(createLoc.lineNumber).append(")"); + err.append(", created at (").append(createLoc.file).append(":") + .append(createLoc.lineNumber).append(")"); } @@ -410,7 +411,8 @@ public class ComponentSizeValidator implements Serializable { err.append(" ("); err.append(attribute); if (sizeLoc != null) { - err.append(", set at (").append(sizeLoc.file).append(":").append(sizeLoc.lineNumber).append(")"); + err.append(", set at (").append(sizeLoc.file).append(":") + .append(sizeLoc.lineNumber).append(")"); } err.append(")"); @@ -512,7 +514,7 @@ public class ComponentSizeValidator implements Serializable { /** * Comparability form component which is defined in the different jar. - * + * * TODO : Normally this logic shouldn't be here. But it means that the whole * this class has wrong design and impementation and should be refactored. */ @@ -713,8 +715,7 @@ public class ComponentSizeValidator implements Serializable { public static List<InvalidLayout> validateLayouts(UI ui) { List<InvalidLayout> invalidRelativeSizes = ComponentSizeValidator .validateComponentRelativeSizes(ui.getContent(), - new ArrayList<>(), - null); + new ArrayList<>(), null); // Also check any existing subwindows if (ui.getWindows() != null) { diff --git a/server/src/main/java/com/vaadin/server/JsonCodec.java b/server/src/main/java/com/vaadin/server/JsonCodec.java index a5725e3d45..001961ca37 100644 --- a/server/src/main/java/com/vaadin/server/JsonCodec.java +++ b/server/src/main/java/com/vaadin/server/JsonCodec.java @@ -499,8 +499,7 @@ public class JsonCodec implements Serializable { assert (keys.length() == values.length()); - Map<Object, Object> map = new HashMap<>( - keys.length() * 2); + Map<Object, Object> map = new HashMap<>(keys.length() * 2); for (int i = 0; i < keys.length(); i++) { Object key = decodeInternalOrCustomType(keyType, keys.get(i), connectorTracker); diff --git a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java index 69a9889c30..905dc03246 100644 --- a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java +++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java @@ -19,9 +19,13 @@ package com.vaadin.server; import java.io.PrintWriter; import java.io.Serializable; import java.io.Writer; +import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collection; +import java.util.Deque; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; @@ -30,10 +34,6 @@ import java.util.logging.Logger; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.CustomLayout; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Deque; -import java.util.List; /** * User Interface Description Language Target. diff --git a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java index 98193d2613..8d79da672b 100644 --- a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java +++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java @@ -299,7 +299,6 @@ public class LegacyCommunicationManager implements Serializable { } } - /** * @deprecated As of 7.1. In 7.2 and later, use * {@link ConnectorTracker#getConnector(String) diff --git a/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java index 4553f577a2..9f22905664 100644 --- a/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java @@ -49,8 +49,8 @@ public class LegacyVaadinPortlet extends VaadinPortlet { getService().addSessionInitListener((SessionInitEvent event) -> { try { onVaadinSessionStarted( - (VaadinPortletRequest) event.getRequest(), - (VaadinPortletSession) event.getSession()); + (VaadinPortletRequest) event.getRequest(), + (VaadinPortletSession) event.getSession()); } catch (PortletException e) { throw new ServiceException(e); } diff --git a/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java index 06628d644a..40f76ebd1a 100644 --- a/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java +++ b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java @@ -49,8 +49,7 @@ public class LegacyVaadinServlet extends VaadinServlet { getService().addSessionInitListener((SessionInitEvent event) -> { try { - onVaadinSessionStarted(event.getRequest(), - event.getSession()); + onVaadinSessionStarted(event.getRequest(), event.getSession()); } catch (ServletException e) { throw new ServiceException(e); } diff --git a/server/src/main/java/com/vaadin/server/LocaleService.java b/server/src/main/java/com/vaadin/server/LocaleService.java index c2b28d1cab..4398864c90 100644 --- a/server/src/main/java/com/vaadin/server/LocaleService.java +++ b/server/src/main/java/com/vaadin/server/LocaleService.java @@ -206,8 +206,7 @@ public class LocaleService implements Serializable { final boolean twelve_hour_clock = timeformat.contains("a"); // TODO there are other possibilities as well, like 'h' in french // (ignore them, too complicated) - final String hour_min_delimiter = timeformat.contains(".") ? "." - : ":"; + final String hour_min_delimiter = timeformat.contains(".") ? "." : ":"; // outWriter.print("\"tf\":\"" + timeformat + "\","); localeData.twelveHourClock = twelve_hour_clock; localeData.hourMinuteDelimiter = hour_min_delimiter; diff --git a/server/src/main/java/com/vaadin/server/SerializableComparator.java b/server/src/main/java/com/vaadin/server/SerializableComparator.java index 213cc5cc49..448d2e09ba 100644 --- a/server/src/main/java/com/vaadin/server/SerializableComparator.java +++ b/server/src/main/java/com/vaadin/server/SerializableComparator.java @@ -20,7 +20,7 @@ import java.util.Comparator; /** * A {@link Comparator} that is also {@link Serializable}. - * + * * @author Vaadin Ltd * @param <T> * the type of objects that may be compared by this comparator @@ -33,7 +33,7 @@ public interface SerializableComparator<T> extends Comparator<T>, Serializable { /** * Returns a {@link SerializableComparator} instance which delegates its * logic to the provided {@code comparator}. - * + * * @param comparator * comparator to convert * @param <T> diff --git a/server/src/main/java/com/vaadin/server/SerializableConsumer.java b/server/src/main/java/com/vaadin/server/SerializableConsumer.java index e8b0a7adca..1680bc7c4c 100644 --- a/server/src/main/java/com/vaadin/server/SerializableConsumer.java +++ b/server/src/main/java/com/vaadin/server/SerializableConsumer.java @@ -20,11 +20,11 @@ import java.util.function.Consumer; /** * A {@link Consumer} that is also {@link Serializable}. - * + * * @see Consumer * @param <T> * the type of the first argument to the operation - * + * * @since 8.0 * @author Vaadin Ltd * diff --git a/server/src/main/java/com/vaadin/server/SerializablePredicate.java b/server/src/main/java/com/vaadin/server/SerializablePredicate.java index 5172aebe70..ae7dcdef5e 100644 --- a/server/src/main/java/com/vaadin/server/SerializablePredicate.java +++ b/server/src/main/java/com/vaadin/server/SerializablePredicate.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; /** * A {@link Predicate} that is also {@link Serializable}. - * + * * @author Vaadin Ltd * @since 8.0 * @param <T> diff --git a/server/src/main/java/com/vaadin/server/SerializableSupplier.java b/server/src/main/java/com/vaadin/server/SerializableSupplier.java index 4b7cfa1305..195f0a60d8 100644 --- a/server/src/main/java/com/vaadin/server/SerializableSupplier.java +++ b/server/src/main/java/com/vaadin/server/SerializableSupplier.java @@ -16,7 +16,6 @@ package com.vaadin.server; import java.io.Serializable; -import java.util.function.Function; import java.util.function.Supplier; /** @@ -29,7 +28,6 @@ import java.util.function.Supplier; * the type of the input to the function */ @FunctionalInterface -public interface SerializableSupplier<T> - extends Supplier<T>, Serializable { +public interface SerializableSupplier<T> extends Supplier<T>, Serializable { // Only method inherited from Supplier } diff --git a/server/src/main/java/com/vaadin/server/Setter.java b/server/src/main/java/com/vaadin/server/Setter.java index 87eb9ecd44..056979b8f5 100644 --- a/server/src/main/java/com/vaadin/server/Setter.java +++ b/server/src/main/java/com/vaadin/server/Setter.java @@ -15,22 +15,22 @@ */ package com.vaadin.server; -import com.vaadin.data.Binder; -import com.vaadin.data.HasValue; - import java.io.Serializable; import java.util.function.BiConsumer; +import com.vaadin.data.Binder; +import com.vaadin.data.HasValue; + /** * The function to write the field value to the bean property - * + * * @see BiConsumer * @see Binder#bind(HasValue, SerializableFunction, Setter) * @param <BEAN> * the type of the target bean * @param <FIELDVALUE> * the field value type to be written to the bean - * + * * @since 8.0 * @author Vaadin Ltd * @@ -39,12 +39,13 @@ import java.util.function.BiConsumer; public interface Setter<BEAN, FIELDVALUE> extends BiConsumer<BEAN, FIELDVALUE>, Serializable { - /** Save value to the bean property + /** + * Save value to the bean property * * @param bean - * the target bean + * the target bean * @param fieldvalue - * the field value to be written to the bean + * the field value to be written to the bean */ @Override void accept(BEAN bean, FIELDVALUE fieldvalue); diff --git a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java index fa1f48b790..7dd7e5ce59 100644 --- a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java +++ b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java @@ -63,31 +63,31 @@ public class UnsupportedBrowserHandler extends SynchronizedRequestHandler { VaadinResponse response) throws IOException { try (Writer page = response.getWriter()) { WebBrowser b = VaadinSession.getCurrent().getBrowser(); - + page.write( - "<html><body><h1>I'm sorry, but your browser is not supported</h1>" - + "<p>The version (" + b.getBrowserMajorVersion() + "." - + b.getBrowserMinorVersion() - + ") of the browser you are using " - + " is outdated and not supported.</p>" - + "<p>You should <b>consider upgrading</b> to a more up-to-date browser.</p> " - + "<p>The most popular browsers are <b>" - + " <a href=\"https://www.google.com/chrome\">Chrome</a>," - + " <a href=\"http://www.mozilla.com/firefox\">Firefox</a>," - + (b.isWindows() - ? " <a href=\"http://windows.microsoft.com/en-US/internet-explorer/downloads/ie\">Internet Explorer</a>," - : "") - + " <a href=\"http://www.opera.com/browser\">Opera</a>" - + " and <a href=\"http://www.apple.com/safari\">Safari</a>.</b><br/>" - + "Upgrading to the latest version of one of these <b>will make the web safer, faster and better looking.</b></p>" - + (b.isIE() - ? "<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js\"></script>" - + "<p>If you can not upgrade your browser, please consider trying <a onclick=\"CFInstall.check({mode:'overlay'});return false;\" href=\"http://www.google.com/chromeframe\">Chrome Frame</a>.</p>" - : "") // - + "<p><sub><a onclick=\"document.cookie='" - + FORCE_LOAD_COOKIE - + "';window.location.reload();return false;\" href=\"#\">Continue without updating</a> (not recommended)</sub></p>" - + "</body>\n" + "</html>"); + "<html><body><h1>I'm sorry, but your browser is not supported</h1>" + + "<p>The version (" + b.getBrowserMajorVersion() + + "." + b.getBrowserMinorVersion() + + ") of the browser you are using " + + " is outdated and not supported.</p>" + + "<p>You should <b>consider upgrading</b> to a more up-to-date browser.</p> " + + "<p>The most popular browsers are <b>" + + " <a href=\"https://www.google.com/chrome\">Chrome</a>," + + " <a href=\"http://www.mozilla.com/firefox\">Firefox</a>," + + (b.isWindows() + ? " <a href=\"http://windows.microsoft.com/en-US/internet-explorer/downloads/ie\">Internet Explorer</a>," + : "") + + " <a href=\"http://www.opera.com/browser\">Opera</a>" + + " and <a href=\"http://www.apple.com/safari\">Safari</a>.</b><br/>" + + "Upgrading to the latest version of one of these <b>will make the web safer, faster and better looking.</b></p>" + + (b.isIE() + ? "<script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js\"></script>" + + "<p>If you can not upgrade your browser, please consider trying <a onclick=\"CFInstall.check({mode:'overlay'});return false;\" href=\"http://www.google.com/chromeframe\">Chrome Frame</a>.</p>" + : "") // + + "<p><sub><a onclick=\"document.cookie='" + + FORCE_LOAD_COOKIE + + "';window.location.reload();return false;\" href=\"#\">Continue without updating</a> (not recommended)</sub></p>" + + "</body>\n" + "</html>"); } } } diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java index 16489da95d..c3daf2c617 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java @@ -47,6 +47,7 @@ import com.liferay.portal.kernel.util.PortalClassLoaderUtil; import com.liferay.portal.kernel.util.PropsUtil; import com.vaadin.server.communication.PortletDummyRequestHandler; import com.vaadin.server.communication.PortletUIInitHandler; +import com.vaadin.ui.UI; import com.vaadin.util.CurrentInstance; /** @@ -359,8 +360,7 @@ public class VaadinPortlet extends GenericPortlet Class<?> portletRequestClass = Class.forName( "com.bea.portlet.container.PortletRequestImpl"); servletRequestMethod = portletRequestClass - .getDeclaredMethod("getInternalRequest" - ); + .getDeclaredMethod("getInternalRequest"); servletRequestMethod.setAccessible(true); } diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java index 9b87c081bc..5979933285 100644 --- a/server/src/main/java/com/vaadin/server/VaadinSession.java +++ b/server/src/main/java/com/vaadin/server/VaadinSession.java @@ -675,10 +675,10 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { } /** - * Gets the currently used session. The current session is - * automatically defined when processing requests related to the session - * (see {@link ThreadLocal}) and in {@link VaadinSession#access(Command)} - * and {@link UI#access(Command)}. In other cases, (e.g. from background + * Gets the currently used session. The current session is automatically + * defined when processing requests related to the session (see + * {@link ThreadLocal}) and in {@link VaadinSession#access(Command)} and + * {@link UI#access(Command)}. In other cases, (e.g. from background * threads, the current session is not automatically defined. * <p> * The session is stored using a weak reference to avoid leaking memory in diff --git a/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java index 17043deb7b..b6f333398c 100644 --- a/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java @@ -124,17 +124,14 @@ public class ClientRpcWriter implements Serializable { List<ClientMethodInvocation> oldPendingRpc = pendingInvocations; int totalCalls = pendingInvocations.size() + paintablePendingRpc.size(); - pendingInvocations = new ArrayList<>( - totalCalls); + pendingInvocations = new ArrayList<>(totalCalls); // merge two ordered comparable lists for (int destIndex = 0, oldIndex = 0, paintableIndex = 0; destIndex < totalCalls; destIndex++) { if (paintableIndex >= paintablePendingRpc.size() - || (oldIndex < oldPendingRpc.size() - && oldPendingRpc - .get(oldIndex).compareTo( - paintablePendingRpc.get( - paintableIndex)) <= 0)) { + || (oldIndex < oldPendingRpc.size() && oldPendingRpc + .get(oldIndex).compareTo(paintablePendingRpc + .get(paintableIndex)) <= 0)) { pendingInvocations.add(oldPendingRpc.get(oldIndex++)); } else { pendingInvocations diff --git a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java index 2a5af77b84..9a219c5d93 100644 --- a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java @@ -678,7 +678,7 @@ public class FileUploadHandler implements RequestHandler { response.setContentType("text/html"); try (OutputStream out = response.getOutputStream()) { final PrintWriter outWriter = new PrintWriter( - new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); + new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))); outWriter.print("<html><body>download handled</body></html>"); outWriter.flush(); } @@ -687,8 +687,8 @@ public class FileUploadHandler implements RequestHandler { private void cleanStreamVariable(VaadinSession session, final UI ui, final ClientConnector owner, final String variableName) { session.accessSynchronously(() -> { - ui.getConnectorTracker().cleanStreamVariable( - owner.getConnectorId(), variableName); + ui.getConnectorTracker().cleanStreamVariable(owner.getConnectorId(), + variableName); }); } } diff --git a/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java index 52c32ff892..0a07ac503e 100644 --- a/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java +++ b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java @@ -22,7 +22,6 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.logging.Logger; diff --git a/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java index a75e6a810b..490fbb81f0 100644 --- a/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java @@ -78,7 +78,8 @@ public class PortletBootstrapHandler extends BootstrapHandler { && !portalTheme.equals(context.getThemeName())) { String portalThemeUri = getThemeUri(context, portalTheme); // XSS safe - originates from portal properties - builder.append("vaadin.loadTheme('").append(portalThemeUri).append("');"); + builder.append("vaadin.loadTheme('").append(portalThemeUri) + .append("');"); } super.appendMainScriptTagContents(context, builder); diff --git a/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java index 7540fcb190..a3e3fac898 100644 --- a/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java @@ -61,7 +61,7 @@ public class PortletDummyRequestHandler implements RequestHandler { final OutputStream out = ((ResourceResponse) response) .getPortletOutputStream(); try (PrintWriter outWriter = new PrintWriter( - new BufferedWriter(new OutputStreamWriter(out, "UTF-8")))) { + new BufferedWriter(new OutputStreamWriter(out, "UTF-8")))) { outWriter.print("<html><body>dummy page</body></html>"); } diff --git a/server/src/main/java/com/vaadin/server/communication/PushHandler.java b/server/src/main/java/com/vaadin/server/communication/PushHandler.java index 75a5c9d94f..5a81b8020c 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java @@ -71,13 +71,14 @@ public class PushHandler { * open by calling resource.suspend(). If there is a pending push, send it * now. */ - private final PushEventCallback establishCallback = (AtmosphereResource resource, UI ui) -> { + private final PushEventCallback establishCallback = ( + AtmosphereResource resource, UI ui) -> { getLogger().log(Level.FINER, - "New push connection for resource {0} with transport {1}", - new Object[] { resource.uuid(), resource.transport() }); - + "New push connection for resource {0} with transport {1}", + new Object[] { resource.uuid(), resource.transport() }); + resource.getResponse().setContentType("text/plain; charset=UTF-8"); - + VaadinSession session = ui.getSession(); if (resource.transport() == TRANSPORT.STREAMING) { // Must ensure that the streaming response contains @@ -87,21 +88,21 @@ public class PushHandler { // connection) resource.getResponse().addHeader("Connection", "close"); } - + String requestToken = resource.getRequest() - .getParameter(ApplicationConstants.CSRF_TOKEN_PARAMETER); + .getParameter(ApplicationConstants.CSRF_TOKEN_PARAMETER); if (!VaadinService.isCsrfTokenValid(session, requestToken)) { getLogger().log(Level.WARNING, - "Invalid CSRF token in new connection received from {0}", - resource.getRequest().getRemoteHost()); + "Invalid CSRF token in new connection received from {0}", + resource.getRequest().getRemoteHost()); // Refresh on client side, create connection just for // sending a message sendRefreshAndDisconnect(resource); return; } - + suspend(resource); - + AtmospherePushConnection connection = getConnectionForUI(ui); assert (connection != null); connection.connect(resource); @@ -114,43 +115,43 @@ public class PushHandler { * the request and send changed UI state via the push channel (we do not * respond to the request directly.) */ - private final PushEventCallback receiveCallback = (AtmosphereResource resource, UI ui) -> { + private final PushEventCallback receiveCallback = ( + AtmosphereResource resource, UI ui) -> { getLogger().log(Level.FINER, "Received message from resource {0}", - resource.uuid()); - + resource.uuid()); + AtmosphereRequest req = resource.getRequest(); - + AtmospherePushConnection connection = getConnectionForUI(ui); - + assert connection != null : "Got push from the client " - + "even though the connection does not seem to be " - + "valid. This might happen if a HttpSession is " - + "serialized and deserialized while the push " - + "connection is kept open or if the UI has a " - + "connection of unexpected type."; - + + "even though the connection does not seem to be " + + "valid. This might happen if a HttpSession is " + + "serialized and deserialized while the push " + + "connection is kept open or if the UI has a " + + "connection of unexpected type."; + Reader reader = connection.receiveMessage(req.getReader()); if (reader == null) { // The whole message was not yet received return; } - + // Should be set up by caller VaadinRequest vaadinRequest = VaadinService.getCurrentRequest(); assert vaadinRequest != null; - + try { new ServerRpcHandler().handleRpc(ui, reader, vaadinRequest); connection.push(false); } catch (JsonException e) { - getLogger().log(Level.SEVERE, "Error writing JSON to response", - e); + getLogger().log(Level.SEVERE, "Error writing JSON to response", e); // Refresh on client side sendRefreshAndDisconnect(resource); } catch (InvalidUIDLSecurityKeyException e) { getLogger().log(Level.WARNING, - "Invalid security key received from {0}", - resource.getRequest().getRemoteHost()); + "Invalid security key received from {0}", + resource.getRequest().getRemoteHost()); // Refresh on client side sendRefreshAndDisconnect(resource); } diff --git a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java index 140e41b992..ce3b399973 100644 --- a/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java @@ -37,7 +37,6 @@ import org.atmosphere.util.VoidAnnotationProcessor; import com.vaadin.server.RequestHandler; import com.vaadin.server.ServiceDestroyEvent; -import com.vaadin.server.ServiceDestroyListener; import com.vaadin.server.ServiceException; import com.vaadin.server.ServletPortletHelper; import com.vaadin.server.SessionExpiredHandler; diff --git a/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java index 85b1fda1bf..3700e67c36 100644 --- a/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java +++ b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java @@ -54,8 +54,7 @@ public class SessionRequestHandler implements RequestHandler { session.lock(); ArrayList<RequestHandler> requestHandlers; try { - requestHandlers = new ArrayList<>( - session.getRequestHandlers()); + requestHandlers = new ArrayList<>(session.getRequestHandlers()); } finally { session.unlock(); } diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java index 689ac21cd7..a31b64a883 100644 --- a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java +++ b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java @@ -85,24 +85,24 @@ public class WidgetSetBuilder { } widgetsetFile.createNewFile(); try (PrintStream printStream = new PrintStream( - new FileOutputStream(widgetsetFile))) { + new FileOutputStream(widgetsetFile))) { printStream.print("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd\">\n"); + + "<!DOCTYPE module PUBLIC \"-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd\">\n"); printStream.print("<module>\n"); printStream.print(" <!--\n" - + " Uncomment the following to compile the widgetset for one browser only.\n\n" - + " Multiple browsers can be specified as a comma separated list. The\n" - + " supported user agents at the moment of writing were:\n" - + " ie8,ie9,gecko1_8,safari,opera\n\n" - + " The value gecko1_8 is used for Firefox and safari is used for webkit\n" - + " based browsers including Google Chrome.\n" - + " -->\n" - + " <!-- <set-property name=\"user.agent\" value=\"safari\"/> -->\n\n" - + " <!--\n" - + " To enable SuperDevMode, uncomment this line.\n\n" - + " See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more\n" - + " information and instructions.\n" + " -->\n" - + " <!-- <set-configuration-property name=\"devModeRedirectEnabled\" value=\"true\" /> -->\n\n"); + + " Uncomment the following to compile the widgetset for one browser only.\n\n" + + " Multiple browsers can be specified as a comma separated list. The\n" + + " supported user agents at the moment of writing were:\n" + + " ie8,ie9,gecko1_8,safari,opera\n\n" + + " The value gecko1_8 is used for Firefox and safari is used for webkit\n" + + " based browsers including Google Chrome.\n" + + " -->\n" + + " <!-- <set-property name=\"user.agent\" value=\"safari\"/> -->\n\n" + + " <!--\n" + + " To enable SuperDevMode, uncomment this line.\n\n" + + " See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more\n" + + " information and instructions.\n" + " -->\n" + + " <!-- <set-configuration-property name=\"devModeRedirectEnabled\" value=\"true\" /> -->\n\n"); printStream.print("\n</module>\n"); } changed = true; @@ -156,7 +156,7 @@ public class WidgetSetBuilder { private static void commitChanges(File widgetsetFile, String content) throws IOException { try (BufferedWriter bufferedWriter = new BufferedWriter( - new OutputStreamWriter(new FileOutputStream(widgetsetFile)))) { + new OutputStreamWriter(new FileOutputStream(widgetsetFile)))) { bufferedWriter.write(content); } } diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java index 1630a18e65..608cdd9cfa 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java +++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java @@ -22,9 +22,9 @@ import java.util.Objects; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; +import com.vaadin.shared.ui.colorpicker.AbstractColorPickerState; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc; -import com.vaadin.shared.ui.colorpicker.AbstractColorPickerState; import com.vaadin.ui.components.colorpicker.ColorPickerPopup; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; diff --git a/server/src/main/java/com/vaadin/ui/AbstractListing.java b/server/src/main/java/com/vaadin/ui/AbstractListing.java index 6800703afd..97fa1f3516 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractListing.java +++ b/server/src/main/java/com/vaadin/ui/AbstractListing.java @@ -280,7 +280,7 @@ public abstract class AbstractListing<T> extends AbstractComponent * This method is separated from {@link writeDesign(Element, DesignContext)} * to be overridable in subclasses that need to replace this, but still must * be able to call {@code super.writeDesign(...)}. - * + * * @see #doReadDesign(Element, DesignContext) * * @param design @@ -360,7 +360,7 @@ public abstract class AbstractListing<T> extends AbstractComponent * This method is separated from {@link readDesign(Element, DesignContext)} * to be overridable in subclasses that need to replace this, but still must * be able to call {@code super.readDesign(...)}. - * + * * @see #doWriteDesign(Element, DesignContext) * * @param design diff --git a/server/src/main/java/com/vaadin/ui/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/AbstractTextField.java index 07044bf472..c716c66978 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractTextField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractTextField.java @@ -272,6 +272,7 @@ public abstract class AbstractTextField extends AbstractField<String> /** * Clears the value of this field. */ + @Override public void clear() { setValue(""); } diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java index 2df887016d..a15dd6d96c 100644 --- a/server/src/main/java/com/vaadin/ui/ComboBox.java +++ b/server/src/main/java/com/vaadin/ui/ComboBox.java @@ -23,11 +23,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import com.vaadin.server.KeyMapper; -import com.vaadin.server.Resource; -import com.vaadin.server.ResourceReference; -import com.vaadin.server.SerializableBiPredicate; -import com.vaadin.server.SerializableConsumer; import org.jsoup.nodes.Element; import com.vaadin.data.HasValue; @@ -41,6 +36,11 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcDecorator; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.Resource; +import com.vaadin.server.ResourceReference; +import com.vaadin.server.SerializableBiPredicate; +import com.vaadin.server.SerializableConsumer; import com.vaadin.shared.Registration; import com.vaadin.shared.data.DataCommunicatorConstants; import com.vaadin.shared.ui.combobox.ComboBoxConstants; @@ -238,13 +238,12 @@ public class ComboBox<T> extends AbstractSingleSelect<T> * conversion is performed before the comparison. * * @param captionFilter - * filter to check if an item is shown when user typed some text into the ComboBox + * filter to check if an item is shown when user typed some text + * into the ComboBox * @param items * the data items to display */ - public void setItems( - CaptionFilter captionFilter, - Collection<T> items) { + public void setItems(CaptionFilter captionFilter, Collection<T> items) { DataProvider<T, String> provider = DataProvider.create(items) .convertFilter(filterText -> item -> captionFilter.test( getItemCaptionGenerator().apply(item), filterText)); @@ -259,12 +258,12 @@ public class ComboBox<T> extends AbstractSingleSelect<T> * conversion is performed before the comparison. * * @param captionFilter - * filter to check if an item is shown when user typed some text into the ComboBox + * filter to check if an item is shown when user typed some text + * into the ComboBox * @param items * the data items to display */ - public void setItems( - CaptionFilter captionFilter, + public void setItems(CaptionFilter captionFilter, @SuppressWarnings("unchecked") T... items) { DataProvider<T, String> provider = DataProvider.create(items) .convertFilter(filterText -> item -> captionFilter.test( @@ -555,8 +554,8 @@ public class ComboBox<T> extends AbstractSingleSelect<T> public Registration addValueChangeListener( HasValue.ValueChangeListener<T> listener) { return addSelectionListener(event -> { - listener.valueChange(new ValueChangeEvent<>(event.getComponent(), this, - event.isUserOriginated())); + listener.valueChange(new ValueChangeEvent<>(event.getComponent(), + this, event.isUserOriginated())); }); } @@ -676,20 +675,23 @@ public class ComboBox<T> extends AbstractSingleSelect<T> } /** - * Predicate to check {@link ComboBox} item captions against user typed strings. + * Predicate to check {@link ComboBox} item captions against user typed + * strings. * * @see #setItems(CaptionFilter, Collection) * @see #setItems(CaptionFilter, Object[]) */ @FunctionalInterface - public interface CaptionFilter extends SerializableBiPredicate<String, String> { + public interface CaptionFilter + extends SerializableBiPredicate<String, String> { /** * Check item caption against entered text * * @param itemCaption * @param filterText - * @return {@code true} if item passes the filter and should be listed, {@code false} otherwise + * @return {@code true} if item passes the filter and should be listed, + * {@code false} otherwise */ @Override public boolean test(String itemCaption, String filterText); diff --git a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java index ca901f6a6f..f66ba4c25d 100644 --- a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java @@ -725,8 +725,7 @@ public class ConnectorTracker implements Serializable { @SuppressWarnings("unchecked") HashMap<ClientConnector, String> stringDiffStates = (HashMap<ClientConnector, String>) in .readObject(); - diffStates = new HashMap<>( - stringDiffStates.size() * 2); + diffStates = new HashMap<>(stringDiffStates.size() * 2); for (ClientConnector key : stringDiffStates.keySet()) { try { diffStates.put(key, Json.parse(stringDiffStates.get(key))); diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java index 8738bad2dc..c813442ffd 100644 --- a/server/src/main/java/com/vaadin/ui/CustomField.java +++ b/server/src/main/java/com/vaadin/ui/CustomField.java @@ -166,7 +166,7 @@ public abstract class CustomField<T> extends AbstractField<T> * <p> * By default, {@link Focusable} events are handled by the super class and * ultimately ignored. - * + * * @param focusDelegate * the focusable component to which focus events are redirected */ diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index 73d5c986f8..8b07501f07 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -77,7 +77,6 @@ import com.vaadin.shared.ui.grid.GridState; import com.vaadin.shared.ui.grid.GridStaticCellType; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.shared.ui.grid.SectionState; -import com.vaadin.ui.Grid.SelectionMode; import com.vaadin.ui.components.grid.ColumnReorderListener; import com.vaadin.ui.components.grid.ColumnResizeListener; import com.vaadin.ui.components.grid.ColumnVisibilityChangeListener; diff --git a/server/src/main/java/com/vaadin/ui/HasValueChangeMode.java b/server/src/main/java/com/vaadin/ui/HasValueChangeMode.java index d877d4ec69..a59be6d058 100644 --- a/server/src/main/java/com/vaadin/ui/HasValueChangeMode.java +++ b/server/src/main/java/com/vaadin/ui/HasValueChangeMode.java @@ -57,12 +57,12 @@ public interface HasValueChangeMode extends Component { /** * Returns the currently set timeout, in milliseconds, for how often - * {@link ValueChangeEvent}s are triggered if the current {@link ValueChangeMode} - * is set to either {@link ValueChangeMode#LAZY} or + * {@link ValueChangeEvent}s are triggered if the current + * {@link ValueChangeMode} is set to either {@link ValueChangeMode#LAZY} or * {@link ValueChangeMode#TIMEOUT}. * - * @return the timeout in milliseconds of how often {@link ValueChangeEvent}s are - * triggered. + * @return the timeout in milliseconds of how often + * {@link ValueChangeEvent}s are triggered. */ public int getValueChangeTimeout(); diff --git a/server/src/main/java/com/vaadin/ui/MenuBar.java b/server/src/main/java/com/vaadin/ui/MenuBar.java index b769ab42bf..4cb8870c2f 100644 --- a/server/src/main/java/com/vaadin/ui/MenuBar.java +++ b/server/src/main/java/com/vaadin/ui/MenuBar.java @@ -16,8 +16,10 @@ package com.vaadin.ui; import java.io.Serializable; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; +import java.util.Deque; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -35,8 +37,6 @@ import com.vaadin.shared.ui.menubar.MenuBarState; import com.vaadin.ui.Component.Focusable; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; -import java.util.ArrayDeque; -import java.util.Deque; /** * <p> diff --git a/server/src/main/java/com/vaadin/ui/MultiSelect.java b/server/src/main/java/com/vaadin/ui/MultiSelect.java index a3677d6d4e..6519921c88 100644 --- a/server/src/main/java/com/vaadin/ui/MultiSelect.java +++ b/server/src/main/java/com/vaadin/ui/MultiSelect.java @@ -29,12 +29,12 @@ import com.vaadin.shared.Registration; /** * Multi selection component which allows to select and deselect multiple items. - * + * * @author Vaadin Ltd - * + * * @param <T> * the type of the items to select - * + * * @since 8.0 * */ diff --git a/server/src/main/java/com/vaadin/ui/RichTextArea.java b/server/src/main/java/com/vaadin/ui/RichTextArea.java index 44ecb7aae0..b54840fe32 100644 --- a/server/src/main/java/com/vaadin/ui/RichTextArea.java +++ b/server/src/main/java/com/vaadin/ui/RichTextArea.java @@ -169,6 +169,7 @@ public class RichTextArea extends AbstractField<String> /** * Clears the value of this field. */ + @Override public void clear() { setValue(""); } diff --git a/server/src/main/java/com/vaadin/ui/SingleSelect.java b/server/src/main/java/com/vaadin/ui/SingleSelect.java index 6c013529e1..f2ae85e95e 100644 --- a/server/src/main/java/com/vaadin/ui/SingleSelect.java +++ b/server/src/main/java/com/vaadin/ui/SingleSelect.java @@ -19,9 +19,9 @@ import com.vaadin.data.HasValue; /** * Single selection component whose selection is treated as a value. - * + * * @author Vaadin Ltd - * + * * @param <V> * the selection value type * diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java index 9f0cc6d0dc..437a188361 100644 --- a/server/src/main/java/com/vaadin/ui/UI.java +++ b/server/src/main/java/com/vaadin/ui/UI.java @@ -413,7 +413,7 @@ public abstract class UI extends AbstractSingleComponentContainer /** * Fire a window order event. - * + * * @param windows * The windows with their orders whose order has been updated. */ @@ -1788,13 +1788,13 @@ public abstract class UI extends AbstractSingleComponentContainer * <p> * The other way to listen window position for specific window is * {@link Window#addWindowOrderChangeListener(WindowOrderChangeListener)} - * + * * @see Window#addWindowOrderChangeListener(WindowOrderChangeListener) - * + * * @param listener * the WindowModeChangeListener to add. * @since 8.0.0 - * + * * @return a registration object for removing the listener */ public Registration addWindowOrderUpdateListener( @@ -1810,12 +1810,12 @@ public abstract class UI extends AbstractSingleComponentContainer * <p> * The other way to listen window position for specific window is * {@link Window#addWindowOrderChangeListener(WindowOrderChangeListener)} - * + * * @see Window.WindowOrderChangeEvent - * + * * @author Vaadin Ltd * @since 8.0.0 - * + * */ public static class WindowOrderUpdateEvent extends Component.Event { @@ -1830,7 +1830,7 @@ public abstract class UI extends AbstractSingleComponentContainer /** * Gets the windows in the order they appear in the UI: top most window * is first, bottom one last. - * + * * @return the windows collection */ public Collection<Window> getWindows() { @@ -1840,9 +1840,9 @@ public abstract class UI extends AbstractSingleComponentContainer /** * An interface used for listening to Windows order update events. - * + * * @since 8.0.0 - * + * * @see Window.WindowOrderChangeEvent */ @FunctionalInterface @@ -1858,7 +1858,7 @@ public abstract class UI extends AbstractSingleComponentContainer * {@link Window}s whose order positions are updated. Use * {@link Window#getOrderPosition()} to get window position for specific * window. - * + * * @param event */ public void windowOrderUpdated(WindowOrderUpdateEvent event); diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java index f41ef41244..b0c2b7e19e 100644 --- a/server/src/main/java/com/vaadin/ui/Window.java +++ b/server/src/main/java/com/vaadin/ui/Window.java @@ -335,11 +335,11 @@ public class Window extends Panel * Window with position 0 is on the bottom, and window with greatest * position is at the top. If window has no position (it's not yet attached * or hidden) then position is {@code -1}. - * + * * @see UI#addWindowOrderUpdateListener(com.vaadin.ui.UI.WindowOrderUpdateListener) - * + * * @since 8.0.0 - * + * * @return window order position. */ public int getOrderPosition() { @@ -396,11 +396,11 @@ public class Window extends Panel /** * Event which is fired when the window order position is changed. - * + * * @see UI.WindowOrderUpdateEvent - * + * * @author Vaadin Ltd - * + * */ public static class WindowOrderChangeEvent extends Component.Event { @@ -413,7 +413,7 @@ public class Window extends Panel /** * Gets the Window. - * + * * @return the window */ public Window getWindow() { @@ -422,7 +422,7 @@ public class Window extends Panel /** * Gets the new window order position. - * + * * @return the new order position */ public int getOrder() { @@ -432,7 +432,7 @@ public class Window extends Panel /** * An interface used for listening to Window order change events. - * + * * @see UI.WindowOrderUpdateListener */ @FunctionalInterface @@ -448,7 +448,7 @@ public class Window extends Panel * {@link Window} whose order position is changed. Use * {@link WindowOrderChangeEvent#getOrder()} to get a new order * position. - * + * * @param event */ public void windowOrderChanged(WindowOrderChangeEvent event); @@ -463,9 +463,9 @@ public class Window extends Panel * <p> * The other way to listen positions of all windows in UI is * {@link UI#addWindowOrderUpdateListener(com.vaadin.ui.UI.WindowOrderUpdateListener)} - * + * * @see UI#addWindowOrderUpdateListener(com.vaadin.ui.UI.WindowOrderUpdateListener) - * + * * @param listener * the WindowModeChangeListener to add. */ @@ -478,8 +478,8 @@ public class Window extends Panel } protected void fireWindowOrderChange(Integer order) { - if (order == null || this.orderPosition != order) { - this.orderPosition = (order == null) ? -1 : order; + if (order == null || orderPosition != order) { + orderPosition = (order == null) ? -1 : order; fireEvent(new Window.WindowOrderChangeEvent(this, getOrderPosition())); } diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java index 9ee87dc0c8..7cb13cb120 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java @@ -187,9 +187,9 @@ public class ColorPickerSelect extends CustomField<Color> { * <p> * Value can be {@code null} if component is not yet initialized via * {@link #initContent()} - * + * * @see ColorPickerSelect#initContent() - * + * * @return the selected color, may be {@code null} */ @Override diff --git a/server/src/main/java/com/vaadin/ui/components/grid/EditorComponentGenerator.java b/server/src/main/java/com/vaadin/ui/components/grid/EditorComponentGenerator.java index c21142ffee..b33c59a891 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/EditorComponentGenerator.java +++ b/server/src/main/java/com/vaadin/ui/components/grid/EditorComponentGenerator.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Component; * A callback interface for generating an editor component corresponding to an * editable column of a grid. The generated component will be used in the grid * editor to edit the value of the column for the selected grid row. - * + * * @author Vaadin Ltd. * @since 8.0 * @@ -35,7 +35,7 @@ public interface EditorComponentGenerator<BEAN> /** * Gets a component for a given {@code bean}. - * + * * @param bean * the bean this component will be used to edit * @return the generated component diff --git a/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java b/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java index 2851b9d100..046719e978 100644 --- a/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java +++ b/server/src/main/java/com/vaadin/ui/components/grid/SortOrderProvider.java @@ -31,8 +31,8 @@ import com.vaadin.ui.Grid.Column; * @author Vaadin Ltd */ @FunctionalInterface -public interface SortOrderProvider extends - SerializableFunction<SortDirection, Stream<SortOrder<String>>> { +public interface SortOrderProvider + extends SerializableFunction<SortDirection, Stream<SortOrder<String>>> { /** * Generates the sort orders when rows are sorted by a column. diff --git a/server/src/main/java/com/vaadin/ui/declarative/Design.java b/server/src/main/java/com/vaadin/ui/declarative/Design.java index 0644b27877..027fb3bc02 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/Design.java +++ b/server/src/main/java/com/vaadin/ui/declarative/Design.java @@ -472,7 +472,8 @@ public class Design implements Serializable { } // create listener for component creations that binds the created // components to the componentRoot instance fields - ComponentCreationListener creationListener = (ComponentCreatedEvent event) -> { + ComponentCreationListener creationListener = ( + ComponentCreatedEvent event) -> { binder.bindField(event.getComponent(), event.getLocalId()); }; designContext.addComponentCreationListener(creationListener); diff --git a/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java index a4a4f0ffdf..f860e30e7c 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java +++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java @@ -19,6 +19,7 @@ import java.beans.IntrospectionException; import java.io.Serializable; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -27,7 +28,6 @@ import java.util.Map; import java.util.logging.Logger; import com.vaadin.ui.Component; -import java.util.Arrays; /** * Binder utility that binds member fields of a design class instance to given @@ -250,8 +250,7 @@ public class FieldBinder implements Serializable { Class<?> searchClass) { ArrayList<java.lang.reflect.Field> memberFields = new ArrayList<>(); - memberFields.addAll(Arrays.asList(searchClass - .getDeclaredFields())); + memberFields.addAll(Arrays.asList(searchClass.getDeclaredFields())); return memberFields; } diff --git a/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java b/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java index 6b58b29e8a..83c409c58e 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java +++ b/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java @@ -33,8 +33,8 @@ public interface ShouldWriteDataDelegate extends Serializable { /** * The default delegate implementation that assumes that all component data - * is provided by a data provider connected to a back end system and that the - * data should thus not be written. + * is provided by a data provider connected to a back end system and that + * the data should thus not be written. */ public static final ShouldWriteDataDelegate DEFAULT = ( Component component) -> false; diff --git a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java index f372954e27..fd195efcb7 100644 --- a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java +++ b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java @@ -104,7 +104,7 @@ import elemental.json.JsonValue; * supported in the object passed to the <code>render</code> function - other * functions should not use the property. Readable and writable. * </ul> - * + * * @param <T> * the grid type this renderer can be attached to * @param <V> diff --git a/server/src/main/java/com/vaadin/util/CurrentInstance.java b/server/src/main/java/com/vaadin/util/CurrentInstance.java index 327c61d4b0..df23f6c8bc 100644 --- a/server/src/main/java/com/vaadin/util/CurrentInstance.java +++ b/server/src/main/java/com/vaadin/util/CurrentInstance.java @@ -53,7 +53,8 @@ import com.vaadin.ui.UI; */ public class CurrentInstance implements Serializable { private static final Object NULL_OBJECT = new Object(); - private static final CurrentInstance CURRENT_INSTANCE_NULL = new CurrentInstance(NULL_OBJECT); + private static final CurrentInstance CURRENT_INSTANCE_NULL = new CurrentInstance( + NULL_OBJECT); private final WeakReference<Object> instance; diff --git a/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java index af7e613bbf..6c4594eb34 100644 --- a/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java +++ b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java @@ -5,7 +5,7 @@ import com.vaadin.ui.Label; /* * This simple test shows the performance difference between the StringTokenizer implementation and the String.split() implementation in AbstractComponent. * Your results will vary. - * The real world use case motivating it was a 10k Row table, which generated labels for 10 columns. + * The real world use case motivating it was a 10k Row table, which generated labels for 10 columns. * This is 1/10th of what this performance tester demonstrates. * * Please run with -server and -Xloggc:/tmp/gclog.vgc -verbose:gc -XX:+PrintCompilation diff --git a/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java b/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java index e0f6e2eaa5..9ed2e8edda 100644 --- a/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java +++ b/server/src/test/java/com/vaadin/data/BeanBinderInstanceFieldTest.java @@ -32,7 +32,7 @@ import com.vaadin.ui.TextField; /** * Unit tests for {@link BeanBinder#bindInstanceFields(Object)} method. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/data/BeanBinderTest.java b/server/src/test/java/com/vaadin/data/BeanBinderTest.java index d45cfe04fd..1b9f2f0ac7 100644 --- a/server/src/test/java/com/vaadin/data/BeanBinderTest.java +++ b/server/src/test/java/com/vaadin/data/BeanBinderTest.java @@ -198,7 +198,8 @@ public class BeanBinderTest private void assertInvalid(HasValue<?> field, String message) { BinderValidationStatus<?> status = binder.validate(); - List<BindingValidationStatus<?>> errors = status.getFieldValidationErrors(); + List<BindingValidationStatus<?>> errors = status + .getFieldValidationErrors(); assertEquals(1, errors.size()); assertSame(field, errors.get(0).getField()); assertEquals(message, errors.get(0).getMessage().get()); diff --git a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java index bc46395d08..64bde4d772 100644 --- a/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java +++ b/server/src/test/java/com/vaadin/data/BinderConverterValidatorTest.java @@ -97,12 +97,13 @@ public class BinderConverterValidatorTest binding.bind(Person::getFirstName, Person::setFirstName); BinderValidationStatus<Person> status = binder.validate(); - List<BindingValidationStatus<?>> errors = status.getFieldValidationErrors(); + List<BindingValidationStatus<?>> errors = status + .getFieldValidationErrors(); assertEquals(1, errors.size()); - BindingValidationStatus<?> validationStatus = errors.stream().findFirst() - .get(); + BindingValidationStatus<?> validationStatus = errors.stream() + .findFirst().get(); String msg = validationStatus.getMessage().get(); assertEquals(msg1, msg); diff --git a/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java b/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java index 820447172e..78a132b04d 100644 --- a/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java +++ b/server/src/test/java/com/vaadin/data/BinderMultiSelectTest.java @@ -65,8 +65,7 @@ public class BinderMultiSelectTest converterBinder.forField(select) .withConverter(new TestEnumSetToStringConverter()) - .bind(AtomicReference::get, - AtomicReference::set); + .bind(AtomicReference::get, AtomicReference::set); } @Test diff --git a/server/src/test/java/com/vaadin/data/BinderTestBase.java b/server/src/test/java/com/vaadin/data/BinderTestBase.java index 7a238ac7ce..8cad82d570 100644 --- a/server/src/test/java/com/vaadin/data/BinderTestBase.java +++ b/server/src/test/java/com/vaadin/data/BinderTestBase.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 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/server/src/test/java/com/vaadin/data/HasValueTest.java b/server/src/test/java/com/vaadin/data/HasValueTest.java index f250d6a5b6..b40b7e64a1 100644 --- a/server/src/test/java/com/vaadin/data/HasValueTest.java +++ b/server/src/test/java/com/vaadin/data/HasValueTest.java @@ -18,8 +18,6 @@ package com.vaadin.data; import org.junit.Test; import org.mockito.Mockito; -import com.vaadin.data.HasValue; - /** * @author Vaadin Ltd * diff --git a/server/src/test/java/com/vaadin/data/ResultTest.java b/server/src/test/java/com/vaadin/data/ResultTest.java index 1dcda58a4d..8f594c1300 100644 --- a/server/src/test/java/com/vaadin/data/ResultTest.java +++ b/server/src/test/java/com/vaadin/data/ResultTest.java @@ -15,10 +15,11 @@ */ package com.vaadin.data; -import com.vaadin.server.SerializableFunction; import org.junit.Assert; import org.junit.Test; +import com.vaadin.server.SerializableFunction; + /** * @author Vaadin Ltd * @@ -70,7 +71,8 @@ public class ResultTest { Result<String> result = new SimpleResult<String>("foo", null) { @Override - public <S> Result<S> flatMap(SerializableFunction<String, Result<S>> mapper) { + public <S> Result<S> flatMap( + SerializableFunction<String, Result<S>> mapper) { return mapper.apply("foo"); } }; @@ -89,7 +91,8 @@ public class ResultTest { Result<String> result = new SimpleResult<String>("foo", null) { @Override - public <S> Result<S> flatMap(SerializableFunction<String, Result<S>> mapper) { + public <S> Result<S> flatMap( + SerializableFunction<String, Result<S>> mapper) { return new SimpleResult<>(null, "bar"); } }; diff --git a/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java index 58ce4c3f75..5fbaaaeb8a 100644 --- a/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/AbstractDataProviderTest.java @@ -21,9 +21,6 @@ import java.util.stream.Stream; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.provider.AbstractDataProvider; -import com.vaadin.data.provider.DataChangeEvent; -import com.vaadin.data.provider.Query; import com.vaadin.shared.Registration; /** diff --git a/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java index 6e9727af3f..585abc230a 100644 --- a/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/BackendDataProviderTest.java @@ -7,8 +7,6 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.vaadin.data.provider.BackEndDataProvider; -import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; import com.vaadin.shared.data.sort.SortDirection; diff --git a/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java b/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java index f185d0969e..f49dbf1f88 100644 --- a/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java +++ b/server/src/test/java/com/vaadin/data/provider/DataCommunicatorTest.java @@ -21,9 +21,6 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import com.vaadin.data.provider.DataCommunicator; -import com.vaadin.data.provider.DataProviderListener; -import com.vaadin.data.provider.ListDataProvider; import com.vaadin.server.MockVaadinSession; import com.vaadin.server.SerializablePredicate; import com.vaadin.server.VaadinRequest; diff --git a/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java index fa7ca2d840..da909af29a 100644 --- a/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java +++ b/server/src/test/java/com/vaadin/data/provider/DataProviderTestBase.java @@ -12,12 +12,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.provider.DataChangeEvent; -import com.vaadin.data.provider.DataProvider; -import com.vaadin.data.provider.DataProviderListener; -import com.vaadin.data.provider.Query; -import com.vaadin.data.provider.Sort; -import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; public abstract class DataProviderTestBase<D extends DataProvider<StrBean, SerializablePredicate<StrBean>>> { @@ -66,8 +60,7 @@ public abstract class DataProviderTestBase<D extends DataProvider<StrBean, Seria private Query<StrBean, SerializablePredicate<StrBean>> createQuery( List<SortOrder<String>> sortOrder, Comparator<StrBean> comp, SerializablePredicate<StrBean> filter) { - return new Query<>(0, - Integer.MAX_VALUE, sortOrder, comp, filter); + return new Query<>(0, Integer.MAX_VALUE, sortOrder, comp, filter); } private Query<StrBean, SerializablePredicate<StrBean>> createQuery( diff --git a/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java index 8cb9c2a4fe..148b5f98f8 100644 --- a/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java +++ b/server/src/test/java/com/vaadin/data/provider/ListDataProviderTest.java @@ -6,10 +6,6 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.provider.DataProvider; -import com.vaadin.data.provider.ListDataProvider; -import com.vaadin.data.provider.Query; -import com.vaadin.data.provider.SortOrder; import com.vaadin.server.SerializablePredicate; public class ListDataProviderTest diff --git a/server/src/test/java/com/vaadin/data/validator/StringLengthValidatorTest.java b/server/src/test/java/com/vaadin/data/validator/StringLengthValidatorTest.java index 7fb1c2ff76..758059c288 100644 --- a/server/src/test/java/com/vaadin/data/validator/StringLengthValidatorTest.java +++ b/server/src/test/java/com/vaadin/data/validator/StringLengthValidatorTest.java @@ -7,8 +7,8 @@ import org.junit.Test; public class StringLengthValidatorTest extends ValidatorTestBase { - private static final String LONG_STRING = Stream.generate(() -> "x").limit(1000) - .collect(Collectors.joining()); + private static final String LONG_STRING = Stream.generate(() -> "x") + .limit(1000).collect(Collectors.joining()); @Test public void testNullStringFails() { diff --git a/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java b/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java index 23270cab5e..591debe9ba 100644 --- a/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java +++ b/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java @@ -99,7 +99,7 @@ public class BeanToValidate { } public void setAddresses(Address[] address) { - this.addresses = address; + addresses = address; } public Address getAddress() { diff --git a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java index 1aacaf44cc..98224d90c1 100644 --- a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java @@ -24,7 +24,6 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.declarative.Design; import com.vaadin.ui.declarative.Design.ComponentFactory; @@ -40,15 +39,16 @@ public class ComponentFactoryTest { // Set static component factory that delegate to a thread local factory static { - Design.setComponentFactory((String fullyQualifiedClassName, DesignContext context) -> { - ComponentFactory componentFactory = currentComponentFactory - .get(); - if (componentFactory == null) { - componentFactory = defaultFactory; - } - return componentFactory.createComponent(fullyQualifiedClassName, - context); - }); + Design.setComponentFactory( + (String fullyQualifiedClassName, DesignContext context) -> { + ComponentFactory componentFactory = currentComponentFactory + .get(); + if (componentFactory == null) { + componentFactory = defaultFactory; + } + return componentFactory + .createComponent(fullyQualifiedClassName, context); + }); } @Test(expected = IllegalArgumentException.class) @@ -59,11 +59,13 @@ public class ComponentFactoryTest { @Test public void testComponentFactoryLogging() { final List<String> messages = new ArrayList<>(); - currentComponentFactory.set((ComponentFactory) (String fullyQualifiedClassName, DesignContext context) -> { - messages.add("Requested class " + fullyQualifiedClassName); - return defaultFactory.createComponent(fullyQualifiedClassName, - context); - }); + currentComponentFactory + .set((ComponentFactory) (String fullyQualifiedClassName, + DesignContext context) -> { + messages.add("Requested class " + fullyQualifiedClassName); + return defaultFactory + .createComponent(fullyQualifiedClassName, context); + }); Design.read(new ByteArrayInputStream("<vaadin-label />".getBytes())); @@ -75,15 +77,24 @@ public class ComponentFactoryTest { @Test(expected = DesignException.class) public void testComponentFactoryReturningNull() { - currentComponentFactory.set((ComponentFactory) (String fullyQualifiedClassName, DesignContext context) -> null); + currentComponentFactory + .set((ComponentFactory) (String fullyQualifiedClassName, + DesignContext context) -> null); Design.read(new ByteArrayInputStream("<vaadin-label />".getBytes())); } @Test(expected = DesignException.class) public void testComponentFactoryThrowingStuff() { - currentComponentFactory.set((ComponentFactory) (String fullyQualifiedClassName, DesignContext context) -> defaultFactory.createComponent( - "foobar." + fullyQualifiedClassName, context) // Will throw because class is not found + currentComponentFactory.set((ComponentFactory) ( + String fullyQualifiedClassName, + DesignContext context) -> defaultFactory.createComponent( + "foobar." + fullyQualifiedClassName, context) // Will + // throw + // because + // class + // is not + // found ); Design.read(new ByteArrayInputStream("<vaadin-label />".getBytes())); @@ -92,11 +103,13 @@ public class ComponentFactoryTest { @Test public void testGetDefaultInstanceUsesComponentFactory() { final List<String> classes = new ArrayList<>(); - currentComponentFactory.set((ComponentFactory) (String fullyQualifiedClassName, DesignContext context) -> { - classes.add(fullyQualifiedClassName); - return defaultFactory.createComponent(fullyQualifiedClassName, - context); - }); + currentComponentFactory + .set((ComponentFactory) (String fullyQualifiedClassName, + DesignContext context) -> { + classes.add(fullyQualifiedClassName); + return defaultFactory + .createComponent(fullyQualifiedClassName, context); + }); DesignContext designContext = new DesignContext(); designContext.getDefaultInstance(new DefaultInstanceTestComponent()); diff --git a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java index 30c07ccb11..f448f5c2b2 100644 --- a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java @@ -361,8 +361,7 @@ public class DesignFormatterTest { && SharedUtil.equals(other.getIcon(), act.getIcon()) && act.getKeyCode() == other.getKeyCode() && act.getModifiers().length == other.getModifiers().length) { - HashSet<Integer> thisSet = new HashSet<>( - act.getModifiers().length); + HashSet<Integer> thisSet = new HashSet<>(act.getModifiers().length); // this is a bit tricky comparison, but there is no nice way of // making int[] into a Set for (int mod : act.getModifiers()) { diff --git a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java index cfea7a6fda..f3a44a7bf2 100644 --- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java +++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java @@ -16,7 +16,6 @@ package com.vaadin.tests.design.designroot; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.TextField; diff --git a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java index 7286b7ea2d..a290d43ea3 100644 --- a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java +++ b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java @@ -23,7 +23,6 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.event.EventRouter; -import com.vaadin.server.ErrorEvent; import com.vaadin.server.ErrorHandler; import com.vaadin.ui.Component; import com.vaadin.ui.Component.Listener; diff --git a/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java index 90bc775efa..f701e089ce 100644 --- a/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java +++ b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java @@ -98,8 +98,7 @@ public class ShortcutActionTest { && SharedUtil.equals(other.getIcon(), act.getIcon()) && act.getKeyCode() == other.getKeyCode() && act.getModifiers().length == other.getModifiers().length) { - HashSet<Integer> thisSet = new HashSet<>( - act.getModifiers().length); + HashSet<Integer> thisSet = new HashSet<>(act.getModifiers().length); // this is a bit tricky comparison, but there is no nice way of // making int[] into a Set for (int mod : act.getModifiers()) { diff --git a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java index e33f8373ce..8a97e2217c 100644 --- a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java @@ -14,6 +14,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -30,7 +31,6 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.ui.Component; -import java.util.Arrays; public class ClassesSerializableTest { @@ -42,7 +42,8 @@ public class ClassesSerializableTest { private static final String[] BASE_PACKAGES = { "com.vaadin" }; - private static final String[] EXCLUDED_PATTERNS = { "com\\.vaadin\\.demo\\..*", // + private static final String[] EXCLUDED_PATTERNS = { + "com\\.vaadin\\.demo\\..*", // "com\\.vaadin\\.external\\.org\\.apache\\.commons\\.fileupload\\..*", // "com\\.vaadin\\.launcher\\..*", // "com\\.vaadin\\.client\\..*", // diff --git a/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java index 7a44e861da..65b7b437e0 100644 --- a/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java @@ -160,7 +160,9 @@ public class AttachDetachListenersTest { @Override public void appendTo(StringBuffer buffer) { buffer.append("EventEquals("); - buffer.append("expected ").append(expected.getClass().getSimpleName()).append(" with connector ").append(expected.getConnector()); + buffer.append("expected ") + .append(expected.getClass().getSimpleName()) + .append(" with connector ").append(expected.getConnector()); buffer.append(")"); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java index 7aabfe4f7f..b333c89fc8 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java @@ -35,8 +35,8 @@ public abstract class DeclarativeMarginTestBase<L extends Layout & MarginHandler MarginInfo m = new MarginInfo(top, right, bottom, left); - String design = getMarginTag(componentTag, defaultMargin, top, right, bottom, - left); + String design = getMarginTag(componentTag, defaultMargin, top, + right, bottom, left); // The assertEquals machinery in DeclarativeTestBase uses bean // introspection and MarginInfo is not a proper bean. It ends up @@ -48,14 +48,13 @@ public abstract class DeclarativeMarginTestBase<L extends Layout & MarginHandler } } - private String getMarginTag(String componentTag, boolean defaultMargin, boolean top, boolean right, - boolean bottom, boolean left) { + private String getMarginTag(String componentTag, boolean defaultMargin, + boolean top, boolean right, boolean bottom, boolean left) { String s = "<" + componentTag + " "; String suffix = defaultMargin ? "=false " : " "; if (top == left && top == right && top == bottom) { - if(top != defaultMargin) - { + if (top != defaultMargin) { s += "margin" + suffix; } } else { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractdatefield/AbstractDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractdatefield/AbstractDateFieldDeclarativeTest.java index 880a6a47f7..dcda449615 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractdatefield/AbstractDateFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractdatefield/AbstractDateFieldDeclarativeTest.java @@ -32,7 +32,7 @@ import com.vaadin.ui.AbstractDateField; * declarative test for a real component should extend it and implement abstract * methods to be able to test the common properties. Components specific * properties should be tested additionally in the subclasses implementations. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java index 7e84bce54c..84b4b6135d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java @@ -18,7 +18,6 @@ package com.vaadin.tests.server.component.abstractorderedlayout; import java.util.Arrays; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import com.vaadin.shared.ui.label.ContentMode; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java index a2a25cb818..2da2d6aede 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java @@ -73,11 +73,11 @@ public class RemoveFromParentLockingTest { try { target.addComponent(testComponent); throw new AssertionError( - "Moving component when not holding its sessions's lock should throw"); + "Moving component when not holding its sessions's lock should throw"); } catch (IllegalStateException e) { Assert.assertEquals( - "Cannot remove from parent when the session is not locked.", - e.getMessage()); + "Cannot remove from parent when the session is not locked.", + e.getMessage()); } } @@ -106,12 +106,12 @@ public class RemoveFromParentLockingTest { try { lockedComponent.addComponent(notLockedComponent); throw new AssertionError( - "Moving component when not holding its sessions's lock should throw"); + "Moving component when not holding its sessions's lock should throw"); } catch (IllegalStateException e) { Assert.assertEquals( - "Cannot remove from parent when the session is not locked." - + " Furthermore, there is another locked session, indicating that the component might be about to be moved from one session to another.", - e.getMessage()); + "Cannot remove from parent when the session is not locked." + + " Furthermore, there is another locked session, indicating that the component might be about to be moved from one session to another.", + e.getMessage()); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java index eede9138c8..00bba9cd1d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.UI; /** diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java index 2c646e47a0..990121e704 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java @@ -30,7 +30,7 @@ import com.vaadin.ui.AbstractColorPicker.PopupStyle; * declarative test for a real component should extend it and implement abstract * methods to be able to test the common properties. Components specific * properties should be tested additionally in the subclasses implementations. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerAreaDeclarativeTest.java index 715acfd050..4169906629 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerAreaDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerAreaDeclarativeTest.java @@ -20,7 +20,7 @@ import com.vaadin.ui.ColorPickerArea; /** * Declarative test for ColorPickerArea. Provides only information about * ColorPickerArea class. All tests are in the superclass. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerDeclarativeTest.java index 41d730eb18..e76e1d6c01 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorPickerDeclarativeTest.java @@ -20,7 +20,7 @@ import com.vaadin.ui.ColorPicker; /** * Declarative test for ColorPicker. Provides only information about * ColorPickerArea class. All tests are in the superclass. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java index c35af4a6a2..1677f8699b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java @@ -100,8 +100,9 @@ public class ComboBoxDeclarativeTest Method writeMethod) { if (readMethod != null) { Class<?> returnType = readMethod.getReturnType(); - if (StyleGenerator.class.equals(returnType)) + if (StyleGenerator.class.equals(returnType)) { return false; + } } return super.acceptProperty(clazz, readMethod, writeMethod); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java index d8b75b130e..8c435f831d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java @@ -586,6 +586,7 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> { return testRead(design, expected, false); } + @Override @SuppressWarnings("rawtypes") public Grid<?> testRead(String design, Grid expected, boolean retestWrite) { return testRead(design, expected, retestWrite, false); diff --git a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java index 43176a5ce8..6b81df7e70 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java @@ -22,7 +22,6 @@ import java.io.IOException; import org.junit.Assert; import org.junit.Test; -import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.server.component.DeclarativeMarginTestBase; import com.vaadin.ui.Alignment; @@ -38,7 +37,7 @@ public class GridLayoutDeclarativeTest @Test public void testMargins() { - testMargins("vaadin-grid-layout",false); + testMargins("vaadin-grid-layout", false); } @Test diff --git a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java index a71aed674b..baae580ccc 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java @@ -26,9 +26,9 @@ import com.vaadin.ui.ListSelect; * There is only {@link ListSelect#setRows(int)}/{@link ListSelect#getRows()} * explicit test. All other tests are in the super class ( * {@link AbstractMultiSelectDeclarativeTest}). - * + * * @see AbstractMultiSelectDeclarativeTest - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java index f7114394d4..2b80546e80 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java @@ -22,7 +22,7 @@ import com.vaadin.ui.NativeSelect; * Declarative support tests for {@link NativeSelect}. All tests are in the * super class ({@link AbstractSingleSelectDeclarativeTest}). This class * declares only tag name and native select class (test parameters). - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java index c7908fd6b0..bb96bf0c3d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java @@ -22,7 +22,7 @@ import com.vaadin.ui.TextField; /** * Declarative test for PasswordField. Provides only information about * ColorPickerArea class. All tests are in the superclass. - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/radiobuttongroup/RadioButtonGroupDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/radiobuttongroup/RadioButtonGroupDeclarativeTest.java index d25c12a4d7..fbc1d912a9 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/radiobuttongroup/RadioButtonGroupDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/radiobuttongroup/RadioButtonGroupDeclarativeTest.java @@ -29,9 +29,9 @@ import com.vaadin.ui.RadioButtonGroup; * Only {@link RadioButtonGroup#setHtmlContentAllowed(boolean)} is tested here * explicitly. All other tests are in the super class ( * {@link AbstractSingleSelectDeclarativeTest}). - * + * * @see AbstractSingleSelectDeclarativeTest - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java index 60ec97ad50..b48a3477ab 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java @@ -7,6 +7,7 @@ import static org.junit.Assert.assertSame; import java.util.Iterator; +import org.junit.Assert; import org.junit.Test; import com.vaadin.ui.Component; @@ -15,7 +16,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.TabSheet.Tab; -import org.junit.Assert; public class TabSheetTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java index 99841e9cf9..5f1eba4176 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java @@ -25,9 +25,9 @@ import com.vaadin.ui.TwinColSelect; * <p> * There are only TwinColSelect specific properties explicit tests. All other * tests are in the super class ( {@link AbstractMultiSelectDeclarativeTest}). - * + * * @see AbstractMultiSelectDeclarativeTest - * + * * @author Vaadin Ltd * */ diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java index 872683cec3..8416a216c1 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java @@ -11,9 +11,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.ui.HasComponents.ComponentAttachEvent; -import com.vaadin.ui.HasComponents.ComponentAttachListener; import com.vaadin.ui.HasComponents.ComponentDetachEvent; -import com.vaadin.ui.HasComponents.ComponentDetachListener; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java index 68461b676f..d98477c66d 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractMultiSelectTest.java @@ -37,8 +37,8 @@ import org.junit.runners.Parameterized.Parameters; import org.mockito.Mockito; import com.vaadin.data.HasValue.ValueChangeEvent; -import com.vaadin.data.provider.DataProvider; import com.vaadin.data.Listing; +import com.vaadin.data.provider.DataProvider; import com.vaadin.event.selection.MultiSelectionEvent; import com.vaadin.event.selection.MultiSelectionListener; import com.vaadin.shared.Registration; @@ -318,8 +318,8 @@ public class AbstractMultiSelectTest<S extends AbstractMultiSelect<String> & Lis Assert.assertSame(registration, actualRegistration); - selectionListener.get().selectionChange(new MultiSelectionEvent<>(select, - Mockito.mock(Set.class), true)); + selectionListener.get().selectionChange(new MultiSelectionEvent<>( + select, Mockito.mock(Set.class), true)); Assert.assertEquals(select, event.get().getComponent()); Assert.assertEquals(set, event.get().getValue()); diff --git a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java index 51e4fa71e9..1b814921e7 100644 --- a/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java +++ b/server/src/test/java/com/vaadin/ui/AbstractSingleSelectTest.java @@ -32,9 +32,9 @@ import org.junit.Test; import org.mockito.Mockito; import com.vaadin.data.HasValue.ValueChangeEvent; +import com.vaadin.data.Listing; import com.vaadin.data.provider.DataProvider; import com.vaadin.data.provider.bov.Person; -import com.vaadin.data.Listing; import com.vaadin.event.selection.SingleSelectionEvent; import com.vaadin.event.selection.SingleSelectionListener; import com.vaadin.shared.Registration; @@ -81,8 +81,7 @@ public class AbstractSingleSelectTest { listing = new PersonListing(); listing.setItems(PERSON_A, PERSON_B, PERSON_C); selectionChanges = new ArrayList<>(); - listing.addSelectionListener( - e -> selectionChanges.add(e.getValue())); + listing.addSelectionListener(e -> selectionChanges.add(e.getValue())); } public static final Person PERSON_C = new Person("c", 3); diff --git a/server/src/test/java/com/vaadin/ui/RadioButtonGroupBoVTest.java b/server/src/test/java/com/vaadin/ui/RadioButtonGroupBoVTest.java index 2fa64ee0ec..82124454e2 100644 --- a/server/src/test/java/com/vaadin/ui/RadioButtonGroupBoVTest.java +++ b/server/src/test/java/com/vaadin/ui/RadioButtonGroupBoVTest.java @@ -23,20 +23,15 @@ import java.util.EnumSet; * @author Vaadin Ltd * @since 8.0 */ -public class RadioButtonGroupBoVTest -{ +public class RadioButtonGroupBoVTest { public enum Status { - STATE_A, - STATE_B, - STATE_C, - STATE_D; + STATE_A, STATE_B, STATE_C, STATE_D; public String getCaption() { return "** " + toString(); } } - public void createOptionGroup() { RadioButtonGroup<Status> s = new RadioButtonGroup<>(); s.setItems(EnumSet.allOf(Status.class)); diff --git a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java index 8dfbc70e56..281690d7ee 100644 --- a/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java +++ b/server/src/test/java/com/vaadin/ui/RadioButtonGroupTest.java @@ -34,8 +34,8 @@ public class RadioButtonGroupTest { public void setUp() { radioButtonGroup = new RadioButtonGroup<>(); // Intentional deviation from upcoming selection order - radioButtonGroup - .setDataProvider(DataProvider.create("Third", "Second", "First")); + radioButtonGroup.setDataProvider( + DataProvider.create("Third", "Second", "First")); } @Test diff --git a/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java index a18105b5bb..56f1293556 100644 --- a/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java +++ b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java @@ -15,6 +15,11 @@ */ package com.vaadin.ui; +import static com.vaadin.ui.ComponentTest.getRpcProxy; +import static com.vaadin.ui.ComponentTest.isDirty; +import static com.vaadin.ui.ComponentTest.syncToClient; +import static com.vaadin.ui.ComponentTest.updateDiffState; + import org.junit.Assert; import org.junit.Test; @@ -22,12 +27,8 @@ import com.vaadin.server.ClientConnector; import com.vaadin.server.ServerRpcManager.RpcInvocationException; import com.vaadin.shared.ui.richtextarea.RichTextAreaServerRpc; import com.vaadin.tests.util.MockUI; -import static com.vaadin.ui.ComponentTest.getRpcProxy; -import static com.vaadin.ui.ComponentTest.isDirty; -import static com.vaadin.ui.ComponentTest.syncToClient; -import static com.vaadin.ui.ComponentTest.updateDiffState; -public class RichTextAreaTest { +public class RichTextAreaTest { @Test public void initiallyEmpty() { diff --git a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java index 3505ef7532..e2da8e0278 100644 --- a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java +++ b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java @@ -15,14 +15,7 @@ */ package com.vaadin.util; -import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinService; -import com.vaadin.server.VaadinSession; -import com.vaadin.ui.UI; -import org.easymock.EasyMock; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertNull; import java.lang.ref.WeakReference; import java.lang.reflect.Field; @@ -33,7 +26,15 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import static org.junit.Assert.assertNull; +import org.easymock.EasyMock; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinService; +import com.vaadin.server.VaadinSession; +import com.vaadin.ui.UI; public class CurrentInstanceTest { @@ -78,8 +79,7 @@ public class CurrentInstanceTest { IllegalAccessException { Field f = CurrentInstance.class.getDeclaredField("instances"); f.setAccessible(true); - return (ThreadLocal<Map<Class<?>, CurrentInstance>>) f - .get(null); + return (ThreadLocal<Map<Class<?>, CurrentInstance>>) f.get(null); } public void testInheritedClearedAfterRemove() { @@ -149,8 +149,7 @@ public class CurrentInstanceTest { .setCurrent(session2); // Use weak ref to verify object is collected - WeakReference<VaadinSession> ref = new WeakReference<>( - session1); + WeakReference<VaadinSession> ref = new WeakReference<>(session1); session1 = null; waitUntilGarbageCollected(ref); diff --git a/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java b/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java index 65cc55aebd..1b79dbea29 100644 --- a/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/data/selection/SelectionServerRpc.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 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 @@ public interface SelectionServerRpc extends ServerRpc { /** * Selects an item based on its key. - * + * * @param key * the key of the item to select */ @@ -32,7 +32,7 @@ public interface SelectionServerRpc extends ServerRpc { /** * Deselects an item based on its key. - * + * * @param key * the key of the item to deselect */ diff --git a/shared/src/main/java/com/vaadin/shared/extension/abstractlisting/AbstractListingExtensionState.java b/shared/src/main/java/com/vaadin/shared/extension/abstractlisting/AbstractListingExtensionState.java index ec64db3e3e..bc33d0e9a6 100644 --- a/shared/src/main/java/com/vaadin/shared/extension/abstractlisting/AbstractListingExtensionState.java +++ b/shared/src/main/java/com/vaadin/shared/extension/abstractlisting/AbstractListingExtensionState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.communication.SharedState; /** * Default shared state implementation for AbstractListingExtension. - * + * * @author Vaadin Ltd. * * @since 8.0 diff --git a/shared/src/main/java/com/vaadin/shared/extension/filedownloader/FileDownloaderState.java b/shared/src/main/java/com/vaadin/shared/extension/filedownloader/FileDownloaderState.java index dd8fb81b98..9c397d5443 100644 --- a/shared/src/main/java/com/vaadin/shared/extension/filedownloader/FileDownloaderState.java +++ b/shared/src/main/java/com/vaadin/shared/extension/filedownloader/FileDownloaderState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.communication.SharedState; /** * Shared state for FileDownloader. - * + * * @author Vaadin Ltd. * * @since 8.0 diff --git a/shared/src/main/java/com/vaadin/shared/ui/WindowOrderRpc.java b/shared/src/main/java/com/vaadin/shared/ui/WindowOrderRpc.java index e3cd8290a7..8af9eb12e0 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/WindowOrderRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/WindowOrderRpc.java @@ -1,12 +1,12 @@ /* * Copyright 2000-2016 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.shared.communication.ServerRpc; * Window order RPC interface. * <p> * Notifies server when windows order is changed. - * + * * @author Vaadin Ltd * @since 8.0.0 * @@ -33,7 +33,7 @@ public interface WindowOrderRpc extends ServerRpc { /** * Sends RPC request about windows order change. - * + * * @param windowOrders * new windows order */ diff --git a/shared/src/main/java/com/vaadin/shared/ui/abstractlisting/AbstractListingState.java b/shared/src/main/java/com/vaadin/shared/ui/abstractlisting/AbstractListingState.java index 894443f171..f3cd040704 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/abstractlisting/AbstractListingState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/abstractlisting/AbstractListingState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.AbstractFieldState; /** * Shared state for {@code AbstractListing}. - * + * * @author Vaadin Ltd * @since 8.0 * diff --git a/shared/src/main/java/com/vaadin/shared/ui/abstractmultiselect/AbstractMultiSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/abstractmultiselect/AbstractMultiSelectState.java index 9019cfbc92..cd7abac3f4 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/abstractmultiselect/AbstractMultiSelectState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/abstractmultiselect/AbstractMultiSelectState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.ui.abstractlisting.AbstractListingState; /** * Shared state for {@code AbstractMultiSelect}. - * + * * @author Vaadin Ltd * @since 8.0 * diff --git a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerAreaState.java index eba6571b7b..3dd9d42ba3 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerAreaState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerAreaState.java @@ -17,7 +17,7 @@ package com.vaadin.shared.ui.colorpicker; /** * Default shared state implementation for ColorPickerArea. - * + * * @author Vaadin Ltd. * * @since 8.0 diff --git a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java index 7e0543d755..56d8bc6636 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java @@ -17,7 +17,7 @@ package com.vaadin.shared.ui.colorpicker; /** * Default shared state implementation for ColorPicker. - * + * * @author Vaadin Ltd. * * @since 8.0 diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java index a19a2bb9eb..cae4845900 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnResizeMode.java @@ -21,15 +21,15 @@ package com.vaadin.shared.ui.grid; public enum ColumnResizeMode { /** - * When column resize mode is set to Animated, columns - * are resized as they are dragged. + * When column resize mode is set to Animated, columns are resized as they + * are dragged. */ ANIMATED, /** - * When column resize mode is set to Simple, dragging to resize - * a column will show a marker, and the column will resize only - * after the mouse button or touch is released. + * When column resize mode is set to Simple, dragging to resize a column + * will show a marker, and the column will resize only after the mouse + * button or touch is released. */ SIMPLE diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/AbstractRendererState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/AbstractRendererState.java index ef6390fd60..2bfe3b1b57 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/AbstractRendererState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/AbstractRendererState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.communication.SharedState; /** * Default shared state implementation for AbstractRenderer. - * + * * @author Vaadin Ltd. * * @since 8.0 diff --git a/shared/src/main/java/com/vaadin/shared/ui/passwordfield/PasswordFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/passwordfield/PasswordFieldState.java index 35efc468d0..6cfdae0196 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/passwordfield/PasswordFieldState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/passwordfield/PasswordFieldState.java @@ -19,7 +19,7 @@ import com.vaadin.shared.ui.textfield.TextFieldState; /** * State class for PasswordField. - * + * * @author Vaadin Ltd * @since 8.0 * diff --git a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java index a163bbd399..40d884d3e0 100644 --- a/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java +++ b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java @@ -305,7 +305,7 @@ public class SharedUtil implements Serializable { /** * Checks if the given array contains duplicates (according to * {@link Object#equals(Object)}. - * + * * @param values * the array to check for duplicates * @return <code>true</code> if the array contains duplicates, @@ -319,7 +319,7 @@ public class SharedUtil implements Serializable { /** * Return duplicate values in the given array in the format * "duplicateValue1, duplicateValue2". - * + * * @param values * the values to check for duplicates * @return a comma separated string of duplicates or an empty string if no diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java index 3ba2cbbf6a..627e579ef7 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java @@ -10,38 +10,47 @@ import com.vaadin.testbench.elementsbase.ServerClass; @ServerClass("com.vaadin.ui.Calendar") public class CalendarElement extends com.vaadin.testbench.elements.CalendarElement { + @Override public List<WebElement> getWeekNumbers() { return findElements(By.className("v-calendar-week-number")); } + @Override public boolean hasMonthView() { return isElementPresent(By.className("v-calendar-week-numbers")); } + @Override public boolean hasWeekView() { return isElementPresent(By.className("v-calendar-header-week")); } + @Override public List<WebElement> getDayNumbers() { return findElements(By.className("v-calendar-day-number")); } + @Override public List<WebElement> getMonthDays() { return findElements(By.className("v-calendar-month-day")); } + @Override public boolean hasDayView() { return getDayHeaders().size() == 1; } + @Override public List<WebElement> getDayHeaders() { return findElements(By.className("v-calendar-header-day")); } + @Override public void back() { findElement(By.className("v-calendar-back")).click(); } + @Override public void next() { findElement(By.className("v-calendar-next")).click(); } diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java index 0f3b7b9d42..89bddf309f 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java @@ -13,6 +13,7 @@ public class ComboBoxElement private static org.openqa.selenium.By bySuggestionPopup = By .vaadin("#popup"); + @Override public WebElement getInputField() { return findElement(By.vaadin("#textbox")); } @@ -27,6 +28,7 @@ public class ComboBoxElement getInputField().clear(); } + @Override public WebElement getSuggestionPopup() { return findElement(bySuggestionPopup); } diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java index 6c46af7b96..f0ba310023 100644 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java @@ -20,6 +20,7 @@ public class GridElement extends com.vaadin.testbench.elements.GridElement { * @throws NoSuchElementException * if the given details row is currently not open */ + @Override public TestBenchElement getDetails(int rowIndex) throws NoSuchElementException { return getSubPart("#details[" + rowIndex + "]"); 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 { |