Remove trailing whitespace from code and javadoc

Change-Id: I4c852b7f9928e190572876690d5bef1234494a5d

741 files changed, 7581 insertions, 7581 deletions

diff --git a/server/src/main/java/com/vaadin/annotations/AutoGenerated.java b/server/src/main/java/com/vaadin/annotations/AutoGenerated.java
index 1ad9f67ad1..a20c9c99a7 100644
--- a/server/src/main/java/com/vaadin/annotations/AutoGenerated.java
+++ b/server/src/main/java/com/vaadin/annotations/AutoGenerated.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
@@ -17,9 +17,9 @@ package com.vaadin.annotations;
 
 /**
  * Marker annotation for automatically generated code elements.
- * 
+ *
  * These elements may be modified or removed by code generation.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 6.0
  */
diff --git a/server/src/main/java/com/vaadin/annotations/DesignRoot.java b/server/src/main/java/com/vaadin/annotations/DesignRoot.java
index a00a00dc0b..7a913be4fc 100644
--- a/server/src/main/java/com/vaadin/annotations/DesignRoot.java
+++ b/server/src/main/java/com/vaadin/annotations/DesignRoot.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
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.Design;
  * the same package as the annotated class and by default the design filename is
  * derived from the class name. Using the {@link #value()} parameter you can
  * specify another design file name.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/annotations/JavaScript.java b/server/src/main/java/com/vaadin/annotations/JavaScript.java
index 445ef75ddf..e160357558 100644
--- a/server/src/main/java/com/vaadin/annotations/JavaScript.java
+++ b/server/src/main/java/com/vaadin/annotations/JavaScript.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
@@ -49,7 +49,7 @@ import com.vaadin.server.ClientConnector;
  * http://host.com/file1.js as is and file2.js from /com/example/file2.js on the
  * server's classpath using the ClassLoader that was used to load
  * com.example.MyConnector.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -58,7 +58,7 @@ import com.vaadin.server.ClientConnector;
 public @interface JavaScript {
     /**
      * JavaScript files to load before initializing the client-side connector.
-     * 
+     *
      * @return an array of JavaScript file urls
      */
     public String[] value();
diff --git a/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.java b/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.java
index 86723b97fc..11f3f51d70 100644
--- a/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.java
+++ b/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.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
@@ -40,7 +40,7 @@ import com.vaadin.ui.UI;
  * {@link UIProvider#isPreservedOnRefresh(com.vaadin.server.UICreateEvent)}, the
  * decision can also be made dynamically based on other parameters than only
  * whether this annotation is present on the UI class.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
diff --git a/server/src/main/java/com/vaadin/annotations/Push.java b/server/src/main/java/com/vaadin/annotations/Push.java
index 736bc4488b..f382ced9d2 100644
--- a/server/src/main/java/com/vaadin/annotations/Push.java
+++ b/server/src/main/java/com/vaadin/annotations/Push.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.ui.UI;
  * class configures the UI for automatic push. If some other push mode is
  * desired, it can be passed as a parameter, e.g.
  * <code>@Push(PushMode.MANUAL)</code>.
- * 
+ *
  * @see PushMode
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.1
  */
@@ -44,7 +44,7 @@ public @interface Push {
     /**
      * Returns the {@link PushMode} to use for the annotated UI. The default
      * push mode when this annotation is present is {@link PushMode#AUTOMATIC}.
-     * 
+     *
      * @return the push mode to use
      */
     public PushMode value() default PushMode.AUTOMATIC;
@@ -53,7 +53,7 @@ public @interface Push {
      * Returns the transport type used for the push for the annotated UI. The
      * default transport type when this annotation is present is
      * {@link Transport#WEBSOCKET}.
-     * 
+     *
      * @return the transport type to use
      */
     public Transport transport() default Transport.WEBSOCKET;
diff --git a/server/src/main/java/com/vaadin/annotations/StyleSheet.java b/server/src/main/java/com/vaadin/annotations/StyleSheet.java
index 191e39ee24..a84504accc 100644
--- a/server/src/main/java/com/vaadin/annotations/StyleSheet.java
+++ b/server/src/main/java/com/vaadin/annotations/StyleSheet.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
@@ -54,7 +54,7 @@ import com.vaadin.server.ClientConnector;
  * http://host.com/file1.css as is and file2.css from /com/example/file2.css on
  * the server's classpath using the ClassLoader that was used to load
  * com.example.MyConnector.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -63,7 +63,7 @@ import com.vaadin.server.ClientConnector;
 public @interface StyleSheet {
     /**
      * Style sheets to load before initializing the client-side connector.
-     * 
+     *
      * @return an array of style sheet urls
      */
     public String[] value();
diff --git a/server/src/main/java/com/vaadin/annotations/Theme.java b/server/src/main/java/com/vaadin/annotations/Theme.java
index 03fa1179bc..02b8ba4b40 100644
--- a/server/src/main/java/com/vaadin/annotations/Theme.java
+++ b/server/src/main/java/com/vaadin/annotations/Theme.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/server/src/main/java/com/vaadin/annotations/Title.java b/server/src/main/java/com/vaadin/annotations/Title.java
index 07eaf17e33..caf4cf2c5f 100644
--- a/server/src/main/java/com/vaadin/annotations/Title.java
+++ b/server/src/main/java/com/vaadin/annotations/Title.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
@@ -33,7 +33,7 @@ import com.vaadin.ui.UI;
 public @interface Title {
     /**
      * Gets the HTML title that should be used if the UI is used on it's own.
-     * 
+     *
      * @return a page title string
      */
     public String value();
diff --git a/server/src/main/java/com/vaadin/annotations/Viewport.java b/server/src/main/java/com/vaadin/annotations/Viewport.java
index c5b0abd56f..e1d47a0170 100644
--- a/server/src/main/java/com/vaadin/annotations/Viewport.java
+++ b/server/src/main/java/com/vaadin/annotations/Viewport.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,9 +28,9 @@ import java.lang.annotation.Target;
  * <p>
  * If you want to dynamically provide different viewport values for different
  * browser, you should use {@link ViewportGeneratorClass} instead.
- * 
+ *
  * @since 7.4
- * 
+ *
  * @author Vaadin Ltd
  */
 @Target(ElementType.TYPE)
@@ -40,7 +40,7 @@ import java.lang.annotation.Target;
 public @interface Viewport {
     /**
      * Gets the viewport tag content.
-     * 
+     *
      * @return the viewport tag content
      */
     public String value();
diff --git a/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.java b/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.java
index aec7ac07e6..6a989af9ea 100644
--- a/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.java
+++ b/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.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,11 +31,11 @@ import com.vaadin.server.ViewportGenerator;
  * <p>
  * If you want to use the same viewport values for all requests, you can use the
  * simpler {@link Viewport} annotation instead.
- * 
+ *
  * @see ViewportGenerator
- * 
+ *
  * @since 7.4
- * 
+ *
  * @author Vaadin Ltd
  */
 @Target(ElementType.TYPE)
@@ -47,7 +47,7 @@ public @interface ViewportGeneratorClass {
      * Gets the viewport generator class to use. Please note that the class must
      * be public and have a default constructor. It must additionally be
      * declared as static if it's declared as an inner class.
-     * 
+     *
      * @return the viewport generator class
      */
     public Class<? extends ViewportGenerator> value();
diff --git a/server/src/main/java/com/vaadin/annotations/Widgetset.java b/server/src/main/java/com/vaadin/annotations/Widgetset.java
index 2dcf93af13..06e10f7f0f 100644
--- a/server/src/main/java/com/vaadin/annotations/Widgetset.java
+++ b/server/src/main/java/com/vaadin/annotations/Widgetset.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/server/src/main/java/com/vaadin/data/Binder.java b/server/src/main/java/com/vaadin/data/Binder.java
index daac947c07..6f8bad31fe 100644
--- a/server/src/main/java/com/vaadin/data/Binder.java
+++ b/server/src/main/java/com/vaadin/data/Binder.java
@@ -288,7 +288,7 @@ public class Binder<BEAN> implements Serializable {
          * {@link #withStatusChangeHandler(StatusChangeHandler)} method call or
          * {@link #withStatusChangeHandler(StatusChangeHandler)} after this
          * method call.
-         * 
+         *
          * @see #withStatusChangeHandler(StatusChangeHandler)
          * @see AbstractComponent#setComponentError(ErrorMessage)
          * @param label
@@ -327,7 +327,7 @@ public class Binder<BEAN> implements Serializable {
          * {@link #withConverter(Converter)}. Also it means that the shorthand
          * method {@link #withStatusLabel(Label)} also may not be called after
          * this method.
-         * 
+         *
          * @see #withStatusLabel(Label)
          * @see AbstractComponent#setComponentError(ErrorMessage)
          * @param handler
@@ -340,7 +340,7 @@ public class Binder<BEAN> implements Serializable {
         /**
          * Validates the field value and returns a {@code Result} instance
          * representing the outcome of the validation.
-         * 
+         *
          * @see Binder#validate()
          * @see Validator#apply(Object)
          *
@@ -815,7 +815,7 @@ public class Binder<BEAN> implements Serializable {
 
     /**
      * Default {@link StatusChangeHandler} functional method implementation.
-     * 
+     *
      * @param event
      *            the validation event
      */
diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java
index 1f8924062b..a7d9836558 100644
--- a/server/src/main/java/com/vaadin/data/Buffered.java
+++ b/server/src/main/java/com/vaadin/data/Buffered.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,20 +24,20 @@ import com.vaadin.legacy.data.Validator.InvalidValueException;
  * <p>
  * Defines the interface to commit and discard changes to an object, supporting
  * buffering.
- * 
+ *
  * <p>
  * In <i>buffered</i> mode the initial value is read from the data source and
  * then buffered. Any subsequential writes or reads will be done on the buffered
  * value. Calling {@link #commit()} will write the buffered value to the data
  * source while calling {@link #discard()} while discard the buffered value and
  * re-read the value from the data source.
- * 
+ *
  * <p>
  * In <i>non-buffered</i> mode the value is always read directly from the data
  * source. Any write is done directly to the data source with no buffering in
  * between. Reads are also done directly from the data source. Calling
  * {@link #commit()} or {@link #discard()} in this mode is efficiently a no-op.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -47,7 +47,7 @@ public interface Buffered extends Serializable {
      * Updates all changes since the previous commit to the data source. The
      * value stored in the object will always be updated into the data source
      * when <code>commit</code> is called.
-     * 
+     *
      * @throws SourceException
      *             if the operation fails because of an exception is thrown by
      *             the data source. The cause is included in the exception.
@@ -60,7 +60,7 @@ public interface Buffered extends Serializable {
     /**
      * Discards all changes since last commit. The object updates its value from
      * the data source.
-     * 
+     *
      * @throws SourceException
      *             if the operation fails because of an exception is thrown by
      *             the data source. The cause is included in the exception.
@@ -77,7 +77,7 @@ public interface Buffered extends Serializable {
      * When in non-buffered mode both read and write operations will be done
      * directly on the data source. In this mode the {@link #commit()} and
      * {@link #discard()} methods serve no purpose.
-     * 
+     *
      * @param buffered
      *            true if buffered mode should be turned on, false otherwise
      * @since 7.0
@@ -86,7 +86,7 @@ public interface Buffered extends Serializable {
 
     /**
      * Checks the buffered mode
-     * 
+     *
      * @return true if buffered mode is on, false otherwise
      * @since 7.0
      */
@@ -95,7 +95,7 @@ public interface Buffered extends Serializable {
     /**
      * Tests if the value stored in the object has been modified since it was
      * last updated from the data source.
-     * 
+     *
      * @return <code>true</code> if the value in the object has been modified
      *         since the last data source update, <code>false</code> if not.
      */
@@ -105,7 +105,7 @@ public interface Buffered extends Serializable {
      * An exception that signals that one or more exceptions occurred while a
      * buffered object tried to access its data source or if there is a problem
      * in processing a data source.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -121,7 +121,7 @@ public interface Buffered extends Serializable {
 
         /**
          * Creates a source exception that does not include a cause.
-         * 
+         *
          * @param source
          *            the source object implementing the Buffered interface.
          */
@@ -131,7 +131,7 @@ public interface Buffered extends Serializable {
 
         /**
          * Creates a source exception from multiple causes.
-         * 
+         *
          * @param source
          *            the source object implementing the Buffered interface.
          * @param causes
@@ -144,7 +144,7 @@ public interface Buffered extends Serializable {
 
         /**
          * Gets the cause of the exception.
-         * 
+         *
          * @return The (first) cause for the exception, null if no cause.
          */
         @Override
@@ -157,7 +157,7 @@ public interface Buffered extends Serializable {
 
         /**
          * Gets all the causes for this exception.
-         * 
+         *
          * @return throwables that caused this exception
          */
         public final Throwable[] getCauses() {
@@ -166,7 +166,7 @@ public interface Buffered extends Serializable {
 
         /**
          * Gets a source of the exception.
-         * 
+         *
          * @return the Buffered object which generated this exception.
          */
         public Buffered getSource() {
diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
index 4b5e131f34..f4fe3e9615 100644
--- a/server/src/main/java/com/vaadin/data/BufferedValidatable.java
+++ b/server/src/main/java/com/vaadin/data/BufferedValidatable.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.legacy.data.Validatable;
  * <code>Buffered</code> interfaces. The combination of the interfaces defines
  * if the invalid data is committed to datasource.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
diff --git a/server/src/main/java/com/vaadin/data/Collapsible.java b/server/src/main/java/com/vaadin/data/Collapsible.java
index 0ef290312d..a189c2ece8 100644
--- a/server/src/main/java/com/vaadin/data/Collapsible.java
+++ b/server/src/main/java/com/vaadin/data/Collapsible.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
@@ -35,7 +35,7 @@ import com.vaadin.data.Container.Ordered;
  * {@linkContainer.Indexed}. From the accessors point of view, items in
  * collapsed subtrees don't exist.
  * <p>
- * 
+ *
  */
 public interface Collapsible extends Hierarchical, Ordered {
 
@@ -44,11 +44,11 @@ public interface Collapsible extends Hierarchical, Ordered {
      * Collapsing the {@link Item} indicated by <code>itemId</code> hides all
      * children, and their respective children, from the {@link Container}.
      * </p>
-     * 
+     *
      * <p>
      * If called on a leaf {@link Item}, this method does nothing.
      * </p>
-     * 
+     *
      * @param itemId
      *            the identifier of the collapsed {@link Item}
      * @param collapsed
@@ -63,12 +63,12 @@ public interface Collapsible extends Hierarchical, Ordered {
      * Checks whether the {@link Item}, identified by <code>itemId</code> is
      * collapsed or not.
      * </p>
-     * 
+     *
      * <p>
      * If an {@link Item} is "collapsed" its children are not included in
      * methods used to list Items in this container.
      * </p>
-     * 
+     *
      * @param itemId
      *            The {@link Item}'s identifier that is to be checked.
      * @return <code>true</code> iff the {@link Item} identified by
diff --git a/server/src/main/java/com/vaadin/data/Container.java b/server/src/main/java/com/vaadin/data/Container.java
index 746139ecb5..6832a57b06 100644
--- a/server/src/main/java/com/vaadin/data/Container.java
+++ b/server/src/main/java/com/vaadin/data/Container.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
@@ -29,7 +29,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * {@link Item}s, but it imposes certain constraints on its contents. These
  * constraints state the following:
  * </p>
- * 
+ *
  * <ul>
  * <li>All Items in the Container must have the same number of Properties.
  * <li>All Items in the Container must have the same Property ID's (see
@@ -39,7 +39,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <li>All Items within a container are uniquely identified by their non-null
  * IDs.
  * </ul>
- * 
+ *
  * <p>
  * The Container can be visualized as a representation of a relational database
  * table. Each Item in the Container represents a row in the table, and all
@@ -47,18 +47,18 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * that as with the cells in a database table, no Property in a Container may be
  * empty, though they may contain <code>null</code> values.
  * </p>
- * 
+ *
  * <p>
  * Note that though uniquely identified, the Items in a Container are not
  * necessarily {@link Container.Ordered ordered} or {@link Container.Indexed
  * indexed}.
  * </p>
- * 
+ *
  * <p>
  * Containers can derive Item ID's from the item properties or use other,
  * container specific or user specified identifiers.
  * </p>
- * 
+ *
  * <p>
  * If a container is {@link Filterable filtered} or {@link Sortable sorted},
  * most of the the methods of the container interface and its subinterfaces
@@ -67,16 +67,16 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * See individual method javadoc for exceptions to this (adding and removing
  * items).
  * </p>
- * 
+ *
  * <p>
  * <img src=doc-files/Container_full.gif>
  * </p>
- * 
+ *
  * <p>
  * The Container interface is split to several subinterfaces so that a class can
  * implement only the ones it needs.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 3.0
  */
@@ -88,7 +88,7 @@ public interface Container extends Serializable {
      * returned.
      * <p>
      * Containers should not return Items that are filtered out.
-     * 
+     *
      * @param itemId
      *            ID of the {@link Item} to retrieve
      * @return the {@link Item} with the given ID or <code>null</code> if the
@@ -99,7 +99,7 @@ public interface Container extends Serializable {
     /**
      * Gets the ID's of all Properties stored in the Container. The ID's cannot
      * be modified through the returned collection.
-     * 
+     *
      * @return unmodifiable collection of Property IDs
      */
     public Collection<?> getContainerPropertyIds();
@@ -115,7 +115,7 @@ public interface Container extends Serializable {
      * <p>
      * Calling this method for large lazy containers can be an expensive
      * operation and should be avoided when practical.
-     * 
+     *
      * @return unmodifiable collection of Item IDs
      */
     public Collection<?> getItemIds();
@@ -125,7 +125,7 @@ public interface Container extends Serializable {
      * Container. If the Container does not contain the item or it is filtered
      * out, or the Container does not have the Property, <code>null</code> is
      * returned.
-     * 
+     *
      * @param itemId
      *            ID of the visible Item which contains the Property
      * @param propertyId
@@ -136,7 +136,7 @@ public interface Container extends Serializable {
 
     /**
      * Gets the data type of all Properties identified by the given Property ID.
-     * 
+     *
      * @param propertyId
      *            ID identifying the Properties
      * @return data type of the Properties
@@ -148,7 +148,7 @@ public interface Container extends Serializable {
      * <p>
      * Filtering can hide items so that they will not be visible through the
      * container API.
-     * 
+     *
      * @return number of Items in the Container
      */
     public int size();
@@ -160,7 +160,7 @@ public interface Container extends Serializable {
      * container API, and this method should respect visibility of items (i.e.
      * only indicate visible items as being in the container) if feasible for
      * the container.
-     * 
+     *
      * @param itemId
      *            ID the of Item to be tested
      * @return boolean indicating if the Container holds the specified Item
@@ -169,17 +169,17 @@ public interface Container extends Serializable {
 
     /**
      * Creates a new Item with the given ID in the Container.
-     * 
+     *
      * <p>
      * The new Item is returned, and it is ready to have its Properties
      * modified. Returns <code>null</code> if the operation fails or the
      * Container already contains a Item with the given ID.
      * </p>
-     * 
+     *
      * <p>
      * This functionality is optional.
      * </p>
-     * 
+     *
      * @param itemId
      *            ID of the Item to be created
      * @return Created new Item, or <code>null</code> in case of a failure
@@ -191,17 +191,17 @@ public interface Container extends Serializable {
 
     /**
      * Creates a new Item into the Container, and assign it an automatic ID.
-     * 
+     *
      * <p>
      * The new ID is returned, or <code>null</code> if the operation fails.
      * After a successful call you can use the {@link #getItem(Object ItemId)
      * <code>getItem</code>}method to fetch the Item.
      * </p>
-     * 
+     *
      * <p>
      * This functionality is optional.
      * </p>
-     * 
+     *
      * @return ID of the newly created Item, or <code>null</code> in case of a
      *         failure
      * @throws UnsupportedOperationException
@@ -212,16 +212,16 @@ public interface Container extends Serializable {
 
     /**
      * Removes the Item identified by <code>ItemId</code> from the Container.
-     * 
+     *
      * <p>
      * Containers that support filtering should also allow removing an item that
      * is currently filtered out.
      * </p>
-     * 
+     *
      * <p>
      * This functionality is optional.
      * </p>
-     * 
+     *
      * @param itemId
      *            ID of the Item to remove
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -237,7 +237,7 @@ public interface Container extends Serializable {
      * type and default value of the new Property are given as parameters.
      * <p>
      * This functionality is optional.
-     * 
+     *
      * @param propertyId
      *            ID of the Property
      * @param type
@@ -258,7 +258,7 @@ public interface Container extends Serializable {
      * Note that the Property will be removed from all Items in the Container.
      * <p>
      * This functionality is optional.
-     * 
+     *
      * @param propertyId
      *            ID of the Property to remove
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -272,12 +272,12 @@ public interface Container extends Serializable {
 
     /**
      * Removes all Items from the Container.
-     * 
+     *
      * <p>
      * Note that Property ID and type information is preserved. This
      * functionality is optional.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the operation succeeded, <code>false</code>
      *         if not
      * @throws UnsupportedOperationException
@@ -288,7 +288,7 @@ public interface Container extends Serializable {
     /**
      * Interface for Container classes whose {@link Item}s can be traversed in
      * order.
-     * 
+     *
      * <p>
      * If the container is filtered or sorted, the traversal applies to the
      * filtered and sorted view.
@@ -307,7 +307,7 @@ public interface Container extends Serializable {
          * Gets the ID of the Item following the Item that corresponds to
          * <code>itemId</code>. If the given Item is the last or not found in
          * the Container, <code>null</code> is returned.
-         * 
+         *
          * @param itemId
          *            ID of a visible Item in the Container
          * @return ID of the next visible Item or <code>null</code>
@@ -318,7 +318,7 @@ public interface Container extends Serializable {
          * Gets the ID of the Item preceding the Item that corresponds to
          * <code>itemId</code>. If the given Item is the first or not found in
          * the Container, <code>null</code> is returned.
-         * 
+         *
          * @param itemId
          *            ID of a visible Item in the Container
          * @return ID of the previous visible Item or <code>null</code>
@@ -327,14 +327,14 @@ public interface Container extends Serializable {
 
         /**
          * Gets the ID of the first Item in the Container.
-         * 
+         *
          * @return ID of the first visible Item in the Container
          */
         public Object firstItemId();
 
         /**
          * Gets the ID of the last Item in the Container..
-         * 
+         *
          * @return ID of the last visible Item in the Container
          */
         public Object lastItemId();
@@ -342,7 +342,7 @@ public interface Container extends Serializable {
         /**
          * Tests if the Item corresponding to the given Item ID is the first
          * Item in the Container.
-         * 
+         *
          * @param itemId
          *            ID of an Item in the Container
          * @return <code>true</code> if the Item is first visible item in the
@@ -353,7 +353,7 @@ public interface Container extends Serializable {
         /**
          * Tests if the Item corresponding to the given Item ID is the last Item
          * in the Container.
-         * 
+         *
          * @return <code>true</code> if the Item is last visible item in the
          *         Container, <code>false</code> if not
          */
@@ -365,9 +365,9 @@ public interface Container extends Serializable {
          * Adding an item after null item adds the item as first item of the
          * ordered container.
          * </p>
-         * 
+         *
          * @see Ordered Ordered: adding items in filtered or sorted containers
-         * 
+         *
          * @param previousItemId
          *            Id of the visible item in ordered container after which to
          *            insert the new item.
@@ -385,9 +385,9 @@ public interface Container extends Serializable {
          * Adding an item after null item adds the item as first item of the
          * ordered container.
          * </p>
-         * 
+         *
          * @see Ordered Ordered: adding items in filtered or sorted containers
-         * 
+         *
          * @param previousItemId
          *            Id of the visible item in ordered container after which to
          *            insert the new item.
@@ -431,7 +431,7 @@ public interface Container extends Serializable {
          * <p>
          * Sorting a container can irreversibly change the order of its items or
          * only change the order temporarily, depending on the container.
-         * 
+         *
          * @param propertyId
          *            Array of container property IDs, whose values are used to
          *            sort the items in container as primary, secondary, ...
@@ -450,7 +450,7 @@ public interface Container extends Serializable {
 
         /**
          * Gets the container property IDs which can be used to sort the items.
-         * 
+         *
          * @return the IDs of the properties that can be used for sorting the
          *         container
          */
@@ -474,7 +474,7 @@ public interface Container extends Serializable {
          * Gets the index of the Item corresponding to the itemId. The following
          * is <code>true</code> for the returned index: 0 <= index < size(), or
          * index = -1 if there is no visible item with that id in the container.
-         * 
+         *
          * @param itemId
          *            ID of an Item in the Container
          * @return index of the Item, or -1 if (the filtered and sorted view of)
@@ -486,7 +486,7 @@ public interface Container extends Serializable {
          * Get the item id for the item at the position given by
          * <code>index</code>.
          * <p>
-         * 
+         *
          * @param index
          *            the index of the requested item id
          * @return the item id of the item at the given index
@@ -512,7 +512,7 @@ public interface Container extends Serializable {
          * <p>
          * For quick migration to new API see:
          * {@link ContainerHelpers#getItemIdsUsingGetIdByIndex(int, int, Indexed)}
-         * 
+         *
          * @param startIndex
          *            the index for the first item which id to include
          * @param numberOfItems
@@ -520,7 +520,7 @@ public interface Container extends Serializable {
          *            start index, must be >= 0
          * @return List containing the requested item ids or empty list if
          *         <code>numberOfItems</code> == 0; not null
-         * 
+         *
          * @throws IllegalArgumentException
          *             if <code>numberOfItems</code> is < 0
          * @throws IndexOutOfBoundsException
@@ -528,7 +528,7 @@ public interface Container extends Serializable {
          *             container. (i.e.
          *             <code>startIndex &lt; 0 || container.size()-1 &lt; startIndex</code>
          *             )
-         * 
+         *
          * @since 7.0
          */
         public List<?> getItemIds(int startIndex, int numberOfItems);
@@ -546,7 +546,7 @@ public interface Container extends Serializable {
          * given position. See {@link Indexed}, {@link Ordered},
          * {@link Filterable} and {@link Sortable} for more information.
          * </p>
-         * 
+         *
          * @param index
          *            Index (in the filtered and sorted view) to add the new
          *            item.
@@ -569,7 +569,7 @@ public interface Container extends Serializable {
          * given position. See {@link Indexed}, {@link Filterable} and
          * {@link Sortable} for more information.
          * </p>
-         * 
+         *
          * @param index
          *            Index (in the filtered and sorted view) at which to add
          *            the new item.
@@ -585,28 +585,28 @@ public interface Container extends Serializable {
         /**
          * An <code>Event</code> object specifying information about the added
          * items.
-         * 
+         *
          * @since 7.4
          */
         public interface ItemAddEvent extends ItemSetChangeEvent {
 
             /**
              * Gets the item id of the first added item.
-             * 
+             *
              * @return item id of the first added item
              */
             public Object getFirstItemId();
 
             /**
              * Gets the index of the first added item.
-             * 
+             *
              * @return index of the first added item
              */
             public int getFirstIndex();
 
             /**
              * Gets the number of the added items.
-             * 
+             *
              * @return the number of added items.
              */
             public int getAddedItemsCount();
@@ -615,27 +615,27 @@ public interface Container extends Serializable {
         /**
          * An <code>Event</code> object specifying information about the removed
          * items.
-         * 
+         *
          * @since 7.4
          */
         public interface ItemRemoveEvent extends ItemSetChangeEvent {
             /**
              * Gets the item id of the first removed item.
-             * 
+             *
              * @return item id of the first removed item
              */
             public Object getFirstItemId();
 
             /**
              * Gets the index of the first removed item.
-             * 
+             *
              * @return index of the first removed item
              */
             public int getFirstIndex();
 
             /**
              * Gets the number of the removed items.
-             * 
+             *
              * @return the number of removed items
              */
             public int getRemovedItemsCount();
@@ -648,7 +648,7 @@ public interface Container extends Serializable {
      * hierarchically. This means that the Items in the container belong in a
      * tree-like structure, with the following quirks:
      * </p>
-     * 
+     *
      * <ul>
      * <li>The Item structure may have more than one root elements
      * <li>The Items in the hierarchy can be declared explicitly to be able or
@@ -660,7 +660,7 @@ public interface Container extends Serializable {
         /**
          * Gets the IDs of all Items that are children of the specified Item.
          * The returned collection is unmodifiable.
-         * 
+         *
          * @param itemId
          *            ID of the Item whose children the caller is interested in
          * @return An unmodifiable {@link java.util.Collection collection}
@@ -671,7 +671,7 @@ public interface Container extends Serializable {
 
         /**
          * Gets the ID of the parent Item of the specified Item.
-         * 
+         *
          * @param itemId
          *            ID of the Item whose parent the caller wishes to find out.
          * @return the ID of the parent Item. Will be <code>null</code> if the
@@ -683,7 +683,7 @@ public interface Container extends Serializable {
          * Gets the IDs of all Items in the container that don't have a parent.
          * Such items are called <code>root</code> Items. The returned
          * collection is unmodifiable.
-         * 
+         *
          * @return An unmodifiable {@link java.util.Collection collection}
          *         containing IDs of all root elements of the container
          */
@@ -697,11 +697,11 @@ public interface Container extends Serializable {
          * also possible to detach a node from the hierarchy (and thus make it
          * root) by setting the parent <code>null</code>.
          * </p>
-         * 
+         *
          * <p>
          * This operation is optional.
          * </p>
-         * 
+         *
          * @param itemId
          *            ID of the item to be set as the child of the Item
          *            identified with <code>newParentId</code>
@@ -716,7 +716,7 @@ public interface Container extends Serializable {
 
         /**
          * Tests if the Item with given ID can have children.
-         * 
+         *
          * @param itemId
          *            ID of the Item in the container whose child capability is
          *            to be tested
@@ -738,12 +738,12 @@ public interface Container extends Serializable {
          * {@link #setParent(Object itemId, Object newParentId)}or
          * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
          * </p>
-         * 
+         *
          * <p>
          * This operation is optional. If it is not implemented, the method
          * always returns <code>false</code>.
          * </p>
-         * 
+         *
          * @param itemId
          *            ID of the Item in the container whose child capability is
          *            to be set
@@ -763,7 +763,7 @@ public interface Container extends Serializable {
          * at least one unless it is empty. The
          * {@link #getParent(Object itemId)} method always returns
          * <code>null</code> for root Items.
-         * 
+         *
          * @param itemId
          *            ID of the Item whose root status is to be tested
          * @return <code>true</code> if the specified Item is a root,
@@ -777,12 +777,12 @@ public interface Container extends Serializable {
          * or if it is a leaf. The {@link #getChildren(Object itemId)} method
          * always returns <code>null</code> for leaf Items.
          * </p>
-         * 
+         *
          * <p>
          * Note that being a leaf does not imply whether or not an Item is
          * allowed to have children.
          * </p>
-         * 
+         *
          * @param itemId
          *            ID of the Item to be tested
          * @return <code>true</code> if the specified Item has children,
@@ -795,11 +795,11 @@ public interface Container extends Serializable {
          * Removes the Item identified by <code>ItemId</code> from the
          * Container.
          * </p>
-         * 
+         *
          * <p>
          * Note that this does not remove any children the item might have.
          * </p>
-         * 
+         *
          * @param itemId
          *            ID of the Item to remove
          * @return <code>true</code> if the operation succeeded,
@@ -846,7 +846,7 @@ public interface Container extends Serializable {
      * The functionality of SimpleFilterable can be implemented using the
      * {@link Filterable} API and {@link SimpleStringFilter}.
      * </p>
-     * 
+     *
      * @since 5.0 (renamed from Filterable to SimpleFilterable in 6.6)
      */
     public interface SimpleFilterable extends Container, Serializable {
@@ -864,7 +864,7 @@ public interface Container extends Serializable {
          * <p>
          * If a container has multiple filters, only items accepted by all
          * filters are visible.
-         * 
+         *
          * @param propertyId
          *            Property for which the filter is applied to.
          * @param filterString
@@ -885,7 +885,7 @@ public interface Container extends Serializable {
 
         /**
          * Remove all filters from the given property.
-         * 
+         *
          * @param propertyId
          *            for which to remove filters
          */
@@ -908,16 +908,16 @@ public interface Container extends Serializable {
      * An {@link Filter} should implement {@link #equals(Object)} and
      * {@link #hashCode()} correctly to avoid duplicate filter registrations
      * etc.
-     * 
+     *
      * @see Filterable
-     * 
+     *
      * @since 6.6
      */
     public interface Filter extends Serializable {
 
         /**
          * Check if an item passes the filter (in-memory filtering).
-         * 
+         *
          * @param itemId
          *            identifier of the item being filtered; may be null when
          *            the item is being added to the container
@@ -933,10 +933,10 @@ public interface Container extends Serializable {
         /**
          * Check if a change in the value of a property can affect the filtering
          * result. May always return true, at the cost of performance.
-         * 
+         *
          * If the filter cannot determine whether it may depend on the property
          * or not, should return true.
-         * 
+         *
          * @param propertyId
          * @return true if the filtering result may/does change based on changes
          *         to the property identified by propertyId
@@ -977,12 +977,12 @@ public interface Container extends Serializable {
      * at index 0, at index {@link com.vaadin.data.Container#size()} or at an
      * undefined position is up to the implementation.
      * </p>
-     * 
+     *
      * <p>
      * This API replaces the old Filterable interface, renamed to
      * {@link SimpleFilterable} in Vaadin 6.6.
      * </p>
-     * 
+     *
      * @since 6.6
      */
     public interface Filterable extends Container, Serializable {
@@ -991,7 +991,7 @@ public interface Container extends Serializable {
          * <p>
          * If a container has multiple filters, only items accepted by all
          * filters are visible.
-         * 
+         *
          * @throws UnsupportedFilterException
          *             if the filter is not supported by the container
          */
@@ -1013,7 +1013,7 @@ public interface Container extends Serializable {
 
         /**
          * Returns the filters which have been applied to the container
-         * 
+         *
          * @return A collection of filters which have been applied to the
          *         container. An empty collection if no filters have been
          *         applied.
@@ -1030,7 +1030,7 @@ public interface Container extends Serializable {
 
         /**
          * Sets the Container that serves as the data source of the viewer.
-         * 
+         *
          * @param newDataSource
          *            The new data source Item
          */
@@ -1038,7 +1038,7 @@ public interface Container extends Serializable {
 
         /**
          * Gets the Container serving as the data source of the viewer.
-         * 
+         *
          * @return data source Container
          */
         public Container getContainerDataSource();
@@ -1066,14 +1066,14 @@ public interface Container extends Serializable {
     /**
      * An <code>Event</code> object specifying the Container whose Item set has
      * changed (items added, removed or reordered).
-     * 
+     *
      * A simple property value change is not an item set change.
      */
     public interface ItemSetChangeEvent extends Serializable {
 
         /**
          * Gets the Property where the event occurred.
-         * 
+         *
          * @return source of the event
          */
         public Container getContainer();
@@ -1090,7 +1090,7 @@ public interface Container extends Serializable {
         /**
          * Lets the listener know a Containers visible (filtered and/or sorted,
          * if applicable) Item set has changed.
-         * 
+         *
          * @param event
          *            change event text
          */
@@ -1105,7 +1105,7 @@ public interface Container extends Serializable {
      * <p>
      * An item set change refers to addition, removal or reordering of items in
      * the container. A simple property value change is not an item set change.
-     * 
+     *
      * <p>
      * Note: The general Java convention is not to explicitly declare that a
      * class generates events, but to directly define the
@@ -1119,7 +1119,7 @@ public interface Container extends Serializable {
 
         /**
          * Adds an Item set change listener for the object.
-         * 
+         *
          * @param listener
          *            listener to be added
          */
@@ -1135,7 +1135,7 @@ public interface Container extends Serializable {
 
         /**
          * Removes the Item set change listener from the object.
-         * 
+         *
          * @param listener
          *            listener to be removed
          */
@@ -1165,7 +1165,7 @@ public interface Container extends Serializable {
 
         /**
          * Retrieves the Container whose contents have been modified.
-         * 
+         *
          * @return Source Container of the event.
          */
         public Container getContainer();
@@ -1185,7 +1185,7 @@ public interface Container extends Serializable {
         /**
          * Notifies this listener that the set of property IDs supported by the
          * Container has changed.
-         * 
+         *
          * @param event
          *            Change event.
          */
@@ -1200,14 +1200,14 @@ public interface Container extends Serializable {
      * that it will generate a <code>PropertySetChangeEvent</code> when the set
      * of property IDs supported by the container is modified.
      * </p>
-     * 
+     *
      * <p>
      * A property set change means the addition, removal or other structural
      * changes to the properties of a container. Changes concerning the set of
      * items in the container and their property values are not property set
      * changes.
      * </p>
-     * 
+     *
      * <p>
      * Note that the general Java convention is not to explicitly declare that a
      * class generates events, but to directly define the
@@ -1221,7 +1221,7 @@ public interface Container extends Serializable {
 
         /**
          * Registers a new Property set change listener for this Container.
-         * 
+         *
          * @param listener
          *            The new Listener to be registered
          */
@@ -1237,7 +1237,7 @@ public interface Container extends Serializable {
 
         /**
          * Removes a previously registered Property set change listener.
-         * 
+         *
          * @param listener
          *            Listener to be removed
          */
diff --git a/server/src/main/java/com/vaadin/data/ContainerHelpers.java b/server/src/main/java/com/vaadin/data/ContainerHelpers.java
index cba93f9338..fcb5a78456 100644
--- a/server/src/main/java/com/vaadin/data/ContainerHelpers.java
+++ b/server/src/main/java/com/vaadin/data/ContainerHelpers.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
@@ -25,7 +25,7 @@ import com.vaadin.data.Container.Indexed;
 /**
  * Contains helper methods for containers that can be used to ease development
  * of containers in Vaadin.
- * 
+ *
  * @since 7.0
  */
 public class ContainerHelpers implements Serializable {
@@ -37,7 +37,7 @@ public class ContainerHelpers implements Serializable {
      * during development. This should not be used in a "finished product"
      * unless fetching an id for an index is very inexpensive because a separate
      * request will be performed for each index in the range.
-     * 
+     *
      * @param startIndex
      *            index of the first item id to get
      * @param numberOfIds
diff --git a/server/src/main/java/com/vaadin/data/HasValue.java b/server/src/main/java/com/vaadin/data/HasValue.java
index 4ab27e65b1..e6420bcb18 100644
--- a/server/src/main/java/com/vaadin/data/HasValue.java
+++ b/server/src/main/java/com/vaadin/data/HasValue.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
@@ -48,7 +48,7 @@ public interface HasValue<V> extends Serializable {
         /**
          * Creates a new {@code ValueChange} event containing the current value
          * of the given value-bearing source connector.
-         * 
+         *
          * @param <C>
          *            the type of the source connector
          * @param source
@@ -66,7 +66,7 @@ public interface HasValue<V> extends Serializable {
 
         /**
          * Returns the new value of the source connector.
-         * 
+         *
          * @return the new value
          */
         public V getValue() {
@@ -76,7 +76,7 @@ public interface HasValue<V> extends Serializable {
         /**
          * Returns whether this event was triggered by user interaction, on the
          * client side, or programmatically, on the server side.
-         * 
+         *
          * @return {@code true} if this event originates from the client,
          *         {@code false} otherwise.
          */
@@ -90,7 +90,7 @@ public interface HasValue<V> extends Serializable {
      *
      * @param <V>
      *            the value type
-     * 
+     *
      * @see ValueChange
      * @see Registration
      */
@@ -101,7 +101,7 @@ public interface HasValue<V> extends Serializable {
         /**
          * Invoked when this listener receives a value change event from an
          * event source to which it has been added.
-         * 
+         *
          * @param event
          *            the received event, not null
          */
@@ -121,7 +121,7 @@ public interface HasValue<V> extends Serializable {
      * <p>
      * <i>Implementation note:</i> the implementing class should document
      * whether null values are accepted or not.
-     * 
+     *
      * @param value
      *            the new value
      * @throws IllegalArgumentException
@@ -134,7 +134,7 @@ public interface HasValue<V> extends Serializable {
      * <p>
      * <i>Implementation note:</i> the implementing class should document
      * whether null values may be returned or not.
-     * 
+     *
      * @return the current value
      */
     public V getValue();
@@ -143,7 +143,7 @@ public interface HasValue<V> extends Serializable {
      * Adds an {@link ValueChangeListener}. The listener is called when the
      * value of this {@code hasValue} is changed either by the user or
      * programmatically.
-     * 
+     *
      * @param listener
      *            the value change listener, not null
      * @return a registration for the listener
diff --git a/server/src/main/java/com/vaadin/data/Item.java b/server/src/main/java/com/vaadin/data/Item.java
index 13f965f098..dbffdaa0a2 100644
--- a/server/src/main/java/com/vaadin/data/Item.java
+++ b/server/src/main/java/com/vaadin/data/Item.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
@@ -25,7 +25,7 @@ import java.util.Collection;
  * locally unique non-null identifier. The interface is split into subinterfaces
  * to enable a class to implement only the functionalities it needs.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 3.0
  */
@@ -35,7 +35,7 @@ public interface Item extends Serializable {
      * Gets the Property corresponding to the given Property ID stored in the
      * Item. If the Item does not contain the Property, <code>null</code> is
      * returned.
-     * 
+     *
      * @param id
      *            identifier of the Property to get
      * @return the Property with the given ID or <code>null</code>
@@ -44,7 +44,7 @@ public interface Item extends Serializable {
 
     /**
      * Gets the collection of IDs of all Properties stored in the Item.
-     * 
+     *
      * @return unmodifiable collection containing IDs of the Properties stored
      *         the Item
      */
@@ -52,11 +52,11 @@ public interface Item extends Serializable {
 
     /**
      * Tries to add a new Property into the Item.
-     * 
+     *
      * <p>
      * This functionality is optional.
      * </p>
-     * 
+     *
      * @param id
      *            ID of the new Property
      * @param property
@@ -71,11 +71,11 @@ public interface Item extends Serializable {
 
     /**
      * Removes the Property identified by ID from the Item.
-     * 
+     *
      * <p>
      * This functionality is optional.
      * </p>
-     * 
+     *
      * @param id
      *            ID of the Property to be removed
      * @return <code>true</code> if the operation succeeded
@@ -93,7 +93,7 @@ public interface Item extends Serializable {
 
         /**
          * Sets the Item that serves as the data source of the viewer.
-         * 
+         *
          * @param newDataSource
          *            The new data source Item
          */
@@ -101,7 +101,7 @@ public interface Item extends Serializable {
 
         /**
          * Gets the Item serving as the data source of the viewer.
-         * 
+         *
          * @return data source Item
          */
         public Item getItemDataSource();
@@ -134,7 +134,7 @@ public interface Item extends Serializable {
 
         /**
          * Retrieves the Item whose contents has been modified.
-         * 
+         *
          * @return source Item of the event
          */
         public Item getItem();
@@ -148,7 +148,7 @@ public interface Item extends Serializable {
 
         /**
          * Notifies this listener that the Item's property set has changed.
-         * 
+         *
          * @param event
          *            Property set change event object
          */
@@ -173,7 +173,7 @@ public interface Item extends Serializable {
 
         /**
          * Registers a new property set change listener for this Item.
-         * 
+         *
          * @param listener
          *            The new Listener to be registered.
          */
@@ -189,7 +189,7 @@ public interface Item extends Serializable {
 
         /**
          * Removes a previously registered property set change listener.
-         * 
+         *
          * @param listener
          *            Listener to be removed.
          */
diff --git a/server/src/main/java/com/vaadin/data/Property.java b/server/src/main/java/com/vaadin/data/Property.java
index 23af4ae306..ac19f27197 100644
--- a/server/src/main/java/com/vaadin/data/Property.java
+++ b/server/src/main/java/com/vaadin/data/Property.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,27 +24,27 @@ import java.io.Serializable;
  * value. This interface contains methods to inspect and modify the stored value
  * and its type, and the object's read-only state.
  * </p>
- * 
+ *
  * <p>
  * The <code>Property</code> also defines the events
  * <code>ReadOnlyStatusChangeEvent</code> and <code>ValueChangeEvent</code>, and
  * the associated <code>listener</code> and <code>notifier</code> interfaces.
  * </p>
- * 
+ *
  * <p>
  * The <code>Property.Viewer</code> interface should be used to attach the
  * Property to an external data source. This way the value in the data source
  * can be inspected using the <code>Property</code> interface.
  * </p>
- * 
+ *
  * <p>
  * The <code>Property.editor</code> interface should be implemented if the value
  * needs to be changed through the implementing class.
  * </p>
- * 
+ *
  * @param T
  *            type of values of the property
- * 
+ *
  * @author Vaadin Ltd
  * @since 3.0
  */
@@ -53,7 +53,7 @@ public interface Property<T> extends Serializable {
     /**
      * Gets the value stored in the Property. The returned object is compatible
      * with the class returned by getType().
-     * 
+     *
      * @return the value stored in the Property
      */
     public T getValue();
@@ -65,14 +65,14 @@ public interface Property<T> extends Serializable {
      * missing, one should declare the Property to be in read-only mode and
      * throw <code>Property.ReadOnlyException</code> in this function.
      * </p>
-     * 
+     *
      * Note : Since Vaadin 7.0, setting the value of a non-String property as a
      * String is no longer supported.
-     * 
+     *
      * @param newValue
      *            New value of the Property. This should be assignable to the
      *            type returned by getType
-     * 
+     *
      * @throws Property.ReadOnlyException
      *             if the object is in read-only mode
      */
@@ -84,7 +84,7 @@ public interface Property<T> extends Serializable {
      * to safely cast the value returned from <code>getValue</code> to the given
      * type and pass any variable assignable to this type as an argument to
      * <code>setValue</code>.
-     * 
+     *
      * @return type of the Property
      */
     public Class<? extends T> getType();
@@ -94,7 +94,7 @@ public interface Property<T> extends Serializable {
      * the method <code>setValue</code> will throw
      * <code>ReadOnlyException</code> and will not modify the value of the
      * Property.
-     * 
+     *
      * @return <code>true</code> if the Property is in read-only mode,
      *         <code>false</code> if it's not
      */
@@ -102,10 +102,10 @@ public interface Property<T> extends Serializable {
 
     /**
      * Sets the Property's read-only mode to the specified status.
-     * 
+     *
      * This functionality is optional, but all properties must implement the
      * <code>isReadOnly</code> mode query correctly.
-     * 
+     *
      * @param newStatus
      *            new read-only status of the Property
      */
@@ -114,12 +114,12 @@ public interface Property<T> extends Serializable {
     /**
      * A Property that is capable of handle a transaction that can end in commit
      * or rollback.
-     * 
+     *
      * Note that this does not refer to e.g. database transactions but rather
      * two-phase commit that allows resetting old field values (in e.g. a
      * FieldGroup) if the commit of one of the properties fails after other
      * properties have already been committed.
-     * 
+     *
      * @param <T>
      *            The type of the property
      * @author Vaadin Ltd
@@ -129,7 +129,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Starts a transaction.
-         * 
+         *
          * <p>
          * If the value is set during a transaction the value must not replace
          * the original value until {@link #commit()} is called. Still,
@@ -173,7 +173,7 @@ public interface Property<T> extends Serializable {
     /**
      * <code>Exception</code> object that signals that a requested Property
      * modification failed because it's in read-only mode.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -190,7 +190,7 @@ public interface Property<T> extends Serializable {
         /**
          * Constructs a new <code>ReadOnlyException</code> with the specified
          * detail message.
-         * 
+         *
          * @param msg
          *            the detail message
          */
@@ -202,7 +202,7 @@ public interface Property<T> extends Serializable {
     /**
      * Interface implemented by the viewer classes capable of using a Property
      * as a data source.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -210,7 +210,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Sets the Property that serves as the data source of the viewer.
-         * 
+         *
          * @param newDataSource
          *            the new data source Property
          */
@@ -218,7 +218,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Gets the Property serving as the data source of the viewer.
-         * 
+         *
          * @return the Property serving as the viewers data source
          */
         public Property getPropertyDataSource();
@@ -234,7 +234,7 @@ public interface Property<T> extends Serializable {
      * Property is in a read-only mode, attempts to modify it will result in the
      * <code>ReadOnlyException</code> being thrown.
      * </p>
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -247,7 +247,7 @@ public interface Property<T> extends Serializable {
     /**
      * An <code>Event</code> object specifying the Property whose value has been
      * changed.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -255,7 +255,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Retrieves the Property that has been modified.
-         * 
+         *
          * @return source Property of the event
          */
         public Property getProperty();
@@ -264,7 +264,7 @@ public interface Property<T> extends Serializable {
     /**
      * The <code>listener</code> interface for receiving
      * <code>ValueChangeEvent</code> objects.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -272,7 +272,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Notifies this listener that the Property's value has changed.
-         * 
+         *
          * @param event
          *            value change event object
          */
@@ -292,7 +292,7 @@ public interface Property<T> extends Serializable {
      * class really will send the events, or if it just defines the methods to
      * be able to implement an interface.
      * </p>
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -300,7 +300,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Registers a new value change listener for this Property.
-         * 
+         *
          * @param listener
          *            the new Listener to be registered
          */
@@ -316,7 +316,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Removes a previously registered value change listener.
-         * 
+         *
          * @param listener
          *            listener to be removed
          */
@@ -336,7 +336,7 @@ public interface Property<T> extends Serializable {
     /**
      * An <code>Event</code> object specifying the Property whose read-only
      * status has been changed.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -344,7 +344,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Property whose read-only state has changed.
-         * 
+         *
          * @return source Property of the event.
          */
         public Property getProperty();
@@ -353,7 +353,7 @@ public interface Property<T> extends Serializable {
     /**
      * The listener interface for receiving
      * <code>ReadOnlyStatusChangeEvent</code> objects.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -362,7 +362,7 @@ public interface Property<T> extends Serializable {
         /**
          * Notifies this listener that a Property's read-only status has
          * changed.
-         * 
+         *
          * @param event
          *            Read-only status change event object
          */
@@ -383,7 +383,7 @@ public interface Property<T> extends Serializable {
      * class really will send the events, or if it just defines the methods to
      * be able to implement an interface.
      * </p>
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -391,7 +391,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Registers a new read-only status change listener for this Property.
-         * 
+         *
          * @param listener
          *            the new Listener to be registered
          */
@@ -407,7 +407,7 @@ public interface Property<T> extends Serializable {
 
         /**
          * Removes a previously registered read-only status change listener.
-         * 
+         *
          * @param listener
          *            listener to be removed
          */
diff --git a/server/src/main/java/com/vaadin/data/StatusChangeHandler.java b/server/src/main/java/com/vaadin/data/StatusChangeHandler.java
index 0fbfcf3d46..7b8f76fb47 100644
--- a/server/src/main/java/com/vaadin/data/StatusChangeHandler.java
+++ b/server/src/main/java/com/vaadin/data/StatusChangeHandler.java
@@ -26,10 +26,10 @@ import com.vaadin.data.Binder.Binding;
  * Register an instance of this class using
  * {@link Binding#withStatusChangeHandler(StatusChangeHandler) to be able to
  * listen to validation status updates.
- * 
+ *
  * @see Binding#withStatusChangeHandler(StatusChangeHandler)
  * @see ValidationStatusChangeEvent
- * 
+ *
  * @author Vaadin Ltd
  * @since 8.0
  *
diff --git a/server/src/main/java/com/vaadin/data/ValidationError.java b/server/src/main/java/com/vaadin/data/ValidationError.java
index 1aa8d2b9a8..1f68d72151 100644
--- a/server/src/main/java/com/vaadin/data/ValidationError.java
+++ b/server/src/main/java/com/vaadin/data/ValidationError.java
@@ -21,7 +21,7 @@ import java.util.Objects;
 /**
  * Represents a validation error. An error contains a reference to a field whose
  * value is invalid and a message describing a validation failure.
- * 
+ *
  * @author Vaadin Ltd
  * @since 8.0
  *
@@ -36,7 +36,7 @@ public class ValidationError<V> implements Serializable {
     /**
      * Creates a new instance of ValidationError with provided validated field
      * and error message.
-     * 
+     *
      * @param field
      *            the validated field
      * @param message
@@ -50,7 +50,7 @@ public class ValidationError<V> implements Serializable {
 
     /**
      * Returns a reference to the validated field.
-     * 
+     *
      * @return the validated field
      */
     public HasValue<V> getField() {
@@ -59,7 +59,7 @@ public class ValidationError<V> implements Serializable {
 
     /**
      * Returns a validation error message.
-     * 
+     *
      * @return the validation error message
      */
     public String getMessage() {
diff --git a/server/src/main/java/com/vaadin/data/ValidationStatus.java b/server/src/main/java/com/vaadin/data/ValidationStatus.java
index 9582ad8153..c4d28b8e79 100644
--- a/server/src/main/java/com/vaadin/data/ValidationStatus.java
+++ b/server/src/main/java/com/vaadin/data/ValidationStatus.java
@@ -22,11 +22,11 @@ import com.vaadin.data.Binder.Binding;
  * <p>
  * The status is the part of {@link ValidationStatusChangeEvent} which indicate
  * whether the validation failed or not.
- * 
+ *
  * @see ValidationStatusChangeEvent
  * @see Binding#withStatusChangeHandler(StatusChangeHandler)
  * @see StatusChangeHandler
- * 
+ *
  * @author Vaadin Ltd
  * @since 8.0
  */
diff --git a/server/src/main/java/com/vaadin/data/ValidationStatusChangeEvent.java b/server/src/main/java/com/vaadin/data/ValidationStatusChangeEvent.java
index fba7e5c510..ad97b7b8d5 100644
--- a/server/src/main/java/com/vaadin/data/ValidationStatusChangeEvent.java
+++ b/server/src/main/java/com/vaadin/data/ValidationStatusChangeEvent.java
@@ -25,10 +25,10 @@ import com.vaadin.data.Binder.Binding;
  * Validation status change event which is fired each time when validation is
  * done. Use {@link Binding#withStatusChangeHandler(StatusChangeHandler)} method
  * to add your validation handler to listen to the event.
- * 
+ *
  * @see Binding#withStatusChangeHandler(StatusChangeHandler)
  * @see StatusChangeHandler
- * 
+ *
  * @author Vaadin Ltd
  * @since 8.0
  *
@@ -43,7 +43,7 @@ public class ValidationStatusChangeEvent extends EventObject {
      * <p>
      * The {@code message} must be null if the {@code status} is
      * {@link ValidationStatus#OK}.
-     * 
+     *
      * @param source
      *            field whose status has changed, not {@code null}
      * @param status
@@ -67,7 +67,7 @@ public class ValidationStatusChangeEvent extends EventObject {
 
     /**
      * Returns validation status of the event.
-     * 
+     *
      * @return validation status
      */
     public ValidationStatus getStatus() {
@@ -77,7 +77,7 @@ public class ValidationStatusChangeEvent extends EventObject {
     /**
      * Returns error validation message if status is
      * {@link ValidationStatus#ERROR}.
-     * 
+     *
      * @return an optional validation error status or an empty optional if
      *         status is not an error
      */
diff --git a/server/src/main/java/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/data/Validator.java
index 28dabca7e7..903e44deda 100644
--- a/server/src/main/java/com/vaadin/data/Validator.java
+++ b/server/src/main/java/com/vaadin/data/Validator.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 java.util.function.Predicate;
  * failed the validation.
  * <p>
  * For instance, the following validator checks if a number is positive:
- * 
+ *
  * <pre>
  * Validator&lt;Integer&gt; v = num -> {
  *     if (num >= 0)
@@ -37,12 +37,12 @@ import java.util.function.Predicate;
  *         return Result.error("number must be positive");
  * };
  * </pre>
- * 
+ *
  * @author Vaadin Ltd.
  *
  * @param <T>
  *            the type of the value to validate
- * 
+ *
  * @see Result
  */
 @FunctionalInterface
@@ -56,16 +56,16 @@ public interface Validator<T> extends Function<T, Result<T>>, Serializable {
      * <p>
      * For instance, the following chained validator checks if a number is
      * between 0 and 10, inclusive:
-     * 
+     *
      * <pre>
      * Validator&lt;Integer&gt; v = Validator.from(num -> num >= 0, "number must be >= 0")
      *         .chain(Validator.from(num -> num <= 10, "number must be <= 10"));
      * </pre>
-     * 
+     *
      * @param next
      *            the validator to apply next, not null
      * @return a chained validator
-     * 
+     *
      * @see #from(Predicate, String)
      */
     public default Validator<T> chain(Function<T, Result<T>> next) {
@@ -76,7 +76,7 @@ public interface Validator<T> extends Function<T, Result<T>>, Serializable {
     /**
      * Validates the given value. Returns a {@code Result} instance representing
      * the outcome of the validation.
-     * 
+     *
      * @param value
      *            the input value to validate
      * @return the validation result
@@ -86,7 +86,7 @@ public interface Validator<T> extends Function<T, Result<T>>, Serializable {
 
     /**
      * Returns a validator that passes any value.
-     * 
+     *
      * @param <T>
      *            the value type
      * @return an always-passing validator
@@ -103,12 +103,12 @@ public interface Validator<T> extends Function<T, Result<T>>, Serializable {
      * <p>
      * For instance, the following validator checks if a number is between 0 and
      * 10, inclusive:
-     * 
+     *
      * <pre>
      * Validator&lt;Integer&gt; v = Validator.from(num -> num >= 0 && num <= 10,
      *         "number must be between 0 and 10");
      * </pre>
-     * 
+     *
      * @param <T>
      *            the value type
      * @param guard
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
index 2a9aeb8c7f..e7f8a8e558 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.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
@@ -108,7 +108,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * <p>
      * For null values, a null item is passed to
      * {@link #setItemDataSource(Item)} to be properly clear fields.
-     * 
+     *
      * @param bean
      *            The bean to use as data source.
      */
@@ -191,9 +191,9 @@ public class BeanFieldGroup<T> extends FieldGroup {
     /**
      * Checks whether a bean validation implementation (e.g. Hibernate Validator
      * or Apache Bean Validation) is available.
-     * 
+     *
      * TODO move this method to some more generic location
-     * 
+     *
      * @return true if a JSR-303 bean validation implementation is available
      */
     protected static boolean isBeanValidationImplementationAvailable() {
@@ -220,7 +220,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * <p>
      * The returned {@link BeanFieldGroup} can be used for further
      * configuration.
-     * 
+     *
      * @see #bindFieldsBuffered(Object, Object)
      * @see #bindMemberFields(Object)
      * @since 7.2
@@ -242,7 +242,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * <p>
      * The returned {@link BeanFieldGroup} can be used for further
      * configuration.
-     * 
+     *
      * @see #bindFieldsUnbuffered(Object, Object)
      * @see #bindMemberFields(Object)
      * @since 7.2
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java b/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
index efe6f99d9a..75056fbe5c 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/Caption.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/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 3925967ea2..9306355337 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.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
@@ -40,7 +40,7 @@ import com.vaadin.ui.Table;
  * This class contains a basic implementation for {@link FieldGroupFieldFactory}
  * .The class is singleton, use {@link #get()} method to get reference to the
  * instance.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
@@ -54,9 +54,9 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
 
     /**
      * Gets the singleton instance.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @return the singleton instance
      */
     public static DefaultFieldGroupFieldFactory get() {
@@ -208,7 +208,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
     /**
      * Fallback when no specific field has been created. Typically returns a
      * TextField.
-     * 
+     *
      * @param <T>
      *            The type of field to create
      * @param type
@@ -230,7 +230,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
     /**
      * Populates the given select with all the enums in the given {@link Enum}
      * class. Uses {@link Enum}.toString() for caption.
-     * 
+     *
      * @param select
      *            The select to populate
      * @param enumClass
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
index 140912ec84..316f32a345 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.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
@@ -22,14 +22,14 @@ import com.vaadin.legacy.ui.LegacyField;
 /**
  * Factory interface for creating new LegacyField-instances based on the data
  * type that should be edited.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
  */
 public interface FieldGroupFieldFactory extends Serializable {
     /**
      * Creates a field based on the data type that we want to edit
-     * 
+     *
      * @param dataType
      *            The type that we want to edit using the field
      * @param fieldType
diff --git a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
index 3a31a79a7d..73df489b5d 100644
--- a/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.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
@@ -38,18 +38,18 @@ import java.lang.annotation.Target;
         &#64;PropertyId("foo")
         TextField myField = new TextField();
     }
-    
+
     class Entity {
         String foo;
     }
-    
+
     {
         Editor e = new Editor();
         BeanFieldGroup.bindFieldsUnbuffered(new Entity(), e);
     }
    </pre>
  * </code>
- * 
+ *
  * @since 7.0
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/data/sort/Sort.java b/server/src/main/java/com/vaadin/data/sort/Sort.java
index 81e0d08c73..6daa7f16f5 100644
--- a/server/src/main/java/com/vaadin/data/sort/Sort.java
+++ b/server/src/main/java/com/vaadin/data/sort/Sort.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.data.sort.SortDirection;
 /**
  * Fluid Sort API. Provides a convenient, human-readable way of specifying
  * multi-column sort order.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -35,7 +35,7 @@ public class Sort implements Serializable {
 
     /**
      * Initial constructor, called by the static by() methods.
-     * 
+     *
      * @param propertyId
      *            a property ID, corresponding to a property in the data source
      * @param direction
@@ -49,7 +49,7 @@ public class Sort implements Serializable {
     /**
      * Chaining constructor, called by the non-static then() methods. This
      * constructor links to the previous Sort object.
-     * 
+     *
      * @param previous
      *            the sort marker that comes before this one
      * @param propertyId
@@ -76,7 +76,7 @@ public class Sort implements Serializable {
     /**
      * Start building a Sort order by sorting a provided column in ascending
      * order.
-     * 
+     *
      * @param propertyId
      *            a property id, corresponding to a data source property
      * @return a sort object
@@ -87,7 +87,7 @@ public class Sort implements Serializable {
 
     /**
      * Start building a Sort order by sorting a provided column.
-     * 
+     *
      * @param propertyId
      *            a property id, corresponding to a data source property
      * @param direction
@@ -102,7 +102,7 @@ public class Sort implements Serializable {
      * Continue building a Sort order. The provided property is sorted in
      * ascending order if the previously added properties have been evaluated as
      * equals.
-     * 
+     *
      * @param propertyId
      *            a property id, corresponding to a data source property
      * @return a sort object
@@ -115,7 +115,7 @@ public class Sort implements Serializable {
      * Continue building a Sort order. The provided property is sorted in
      * specified order if the previously added properties have been evaluated as
      * equals.
-     * 
+     *
      * @param propertyId
      *            a property id, corresponding to a data source property
      * @param direction
@@ -128,7 +128,7 @@ public class Sort implements Serializable {
 
     /**
      * Build a sort order list, ready to be passed to Grid
-     * 
+     *
      * @return a sort order list.
      */
     public List<SortOrder> build() {
diff --git a/server/src/main/java/com/vaadin/data/sort/SortOrder.java b/server/src/main/java/com/vaadin/data/sort/SortOrder.java
index 2c419f88b7..12080f0063 100644
--- a/server/src/main/java/com/vaadin/data/sort/SortOrder.java
+++ b/server/src/main/java/com/vaadin/data/sort/SortOrder.java
@@ -22,7 +22,7 @@ import com.vaadin.shared.data.sort.SortDirection;
 /**
  * Sort order descriptor. Links together a {@link SortDirection} value and a
  * Vaadin container property ID.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -33,7 +33,7 @@ public class SortOrder implements Serializable {
 
     /**
      * Create a SortOrder object. Both arguments must be non-null.
-     * 
+     *
      * @param propertyId
      *            id of the data source property to sort by
      * @param direction
@@ -54,7 +54,7 @@ public class SortOrder implements Serializable {
 
     /**
      * Returns the property ID.
-     * 
+     *
      * @return a property ID
      */
     public Object getPropertyId() {
@@ -63,7 +63,7 @@ public class SortOrder implements Serializable {
 
     /**
      * Returns the {@link SortDirection} value.
-     * 
+     *
      * @return a sort direction value
      */
     public SortDirection getDirection() {
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
index 7b1e53c72f..8599e7c900 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.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
@@ -39,25 +39,25 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
 
 /**
  * An abstract base class for in-memory containers for JavaBeans.
- * 
+ *
  * <p>
  * The properties of the container are determined automatically by introspecting
  * the used JavaBean class and explicitly adding or removing properties is not
  * supported. Only beans of the same type can be added to the container.
  * </p>
- * 
+ *
  * <p>
  * Subclasses should implement any public methods adding items to the container,
  * typically calling the protected methods {@link #addItem(Object, Object)},
  * {@link #addItemAfter(Object, Object, Object)} and
  * {@link #addItemAt(int, Object, Object)}.
  * </p>
- * 
+ *
  * @param <IDTYPE>
  *            The type of the item identifier
  * @param <BEANTYPE>
  *            The type of the Bean
- * 
+ *
  * @since 6.5
  */
 public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
@@ -69,20 +69,20 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * Resolver that maps beans to their (item) identifiers, removing the need
      * to explicitly specify item identifiers when there is no need to customize
      * this.
-     * 
+     *
      * Note that beans can also be added with an explicit id even if a resolver
      * has been set.
-     * 
+     *
      * @param <IDTYPE>
      * @param <BEANTYPE>
-     * 
+     *
      * @since 6.5
      */
     public static interface BeanIdResolver<IDTYPE, BEANTYPE>
             extends Serializable {
         /**
          * Return the item identifier for a bean.
-         * 
+         *
          * @param bean
          * @return
          */
@@ -91,7 +91,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * A item identifier resolver that returns the value of a bean property.
-     * 
+     *
      * The bean must have a getter for the property, and the getter must return
      * an object of type IDTYPE.
      */
@@ -131,7 +131,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * The resolver that finds the item ID for a bean, or null not to use
      * automatic resolving.
-     * 
+     *
      * Methods that add a bean without specifying an ID must not be called if no
      * resolver has been set.
      */
@@ -156,7 +156,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Constructs a {@code AbstractBeanContainer} for beans of the given type.
-     * 
+     *
      * @param type
      *            the type of the beans that will be added to the container.
      * @throws IllegalArgumentException
@@ -173,7 +173,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getType(java.lang.Object)
      */
     @Override
@@ -188,7 +188,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Create a BeanItem for a bean using pre-parsed bean metadata (based on
      * {@link #getBeanType()}).
-     * 
+     *
      * @param bean
      * @return created {@link BeanItem} or null if bean is null
      */
@@ -198,10 +198,10 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Returns the type of beans this Container can contain.
-     * 
+     *
      * This comes from the bean type constructor parameter, and bean metadata
      * (including container properties) is based on this.
-     * 
+     *
      * @return
      */
     public Class<? super BEANTYPE> getBeanType() {
@@ -210,7 +210,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getContainerPropertyIds()
      */
     @Override
@@ -220,7 +220,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeAllItems()
      */
     @Override
@@ -247,7 +247,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getItem(java.lang.Object)
      */
     @Override
@@ -263,7 +263,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getItemIds()
      */
     @Override
@@ -274,7 +274,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object,
      * java.lang.Object)
      */
@@ -289,7 +289,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     @Override
@@ -329,7 +329,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Container.Filterable#addContainerFilter(java.lang.Object,
      * java.lang.String, boolean, boolean)
@@ -348,7 +348,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Filterable#removeAllContainerFilters()
      */
     @Override
@@ -363,7 +363,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Container.Filterable#removeContainerFilters(java.lang
      * .Object)
@@ -392,7 +392,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.AbstractInMemoryContainer#hasContainerFilters()
      */
     @Override
@@ -402,7 +402,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.AbstractInMemoryContainer#getContainerFilters()
      */
     @Override
@@ -413,7 +413,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Make this container listen to the given property provided it notifies
      * when its value changes.
-     * 
+     *
      * @param item
      *            The {@link Item} that contains the property
      * @param propertyId
@@ -432,7 +432,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Remove this container as a listener for the given property.
-     * 
+     *
      * @param item
      *            The {@link Item} that contains the property
      * @param propertyId
@@ -448,7 +448,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Remove this contains as a listener for all the properties in the given
      * {@link Item}.
-     * 
+     *
      * @param item
      *            The {@link Item} that contains the properties
      */
@@ -460,7 +460,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
     @Override
@@ -470,7 +470,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      * boolean[])
      */
@@ -509,7 +509,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Check that a bean can be added to the container (is of the correct type
      * for the container).
-     * 
+     *
      * @param bean
      * @return
      */
@@ -519,11 +519,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds the bean to the Container.
-     * 
+     *
      * Note: the behavior of this method changed in Vaadin 6.6 - now items are
      * added at the very end of the unfiltered container and not after the last
      * visible item if filtering is used.
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(Object)
      */
     protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
@@ -535,7 +535,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds the bean after the given bean.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
      */
     protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
@@ -549,16 +549,16 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds a new bean at the given index.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @param index
      *            Index at which the bean should be added.
      * @param newItemId
      *            The item id for the bean to add to the container.
      * @param bean
      *            The bean to add to the container.
-     * 
+     *
      * @return Returns the new BeanItem or null if the operation fails.
      */
     protected BeanItem<BEANTYPE> addItemAt(int index, IDTYPE newItemId,
@@ -572,11 +572,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds a bean to the container using the bean item id resolver to find its
      * identifier.
-     * 
+     *
      * A bean id resolver must be set before calling this method.
-     * 
+     *
      * @see #addItem(Object, Object)
-     * 
+     *
      * @param bean
      *            the bean to add
      * @return BeanItem<BEANTYPE> item added or null
@@ -601,11 +601,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds a bean to the container after a specified item identifier, using the
      * bean item id resolver to find its identifier.
-     * 
+     *
      * A bean id resolver must be set before calling this method.
-     * 
+     *
      * @see #addItemAfter(Object, Object, Object)
-     * 
+     *
      * @param previousItemId
      *            the identifier of the bean after which this bean should be
      *            added, null to add to the beginning
@@ -634,11 +634,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds a bean at a specified (filtered view) position in the container
      * using the bean item id resolver to find its identifier.
-     * 
+     *
      * A bean id resolver must be set before calling this method.
-     * 
+     *
      * @see #addItemAfter(Object, Object, Object)
-     * 
+     *
      * @param index
      *            the index (in the filtered view) at which to add the item
      * @param bean
@@ -666,13 +666,13 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * Adds all the beans from a {@link Collection} in one operation using the
      * bean item identifier resolver. More efficient than adding them one by
      * one.
-     * 
+     *
      * A bean id resolver must be set before calling this method.
-     * 
+     *
      * Note: the behavior of this method changed in Vaadin 6.6 - now items are
      * added at the very end of the unfiltered container and not after the last
      * visible item if filtering is used.
-     * 
+     *
      * @param collection
      *            The collection of beans to add. Must not be null.
      * @throws IllegalStateException
@@ -725,7 +725,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Use the bean resolver to get the identifier for a bean.
-     * 
+     *
      * @param bean
      * @return resolved bean identifier, null if could not be resolved
      * @throws IllegalStateException
@@ -742,13 +742,13 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Sets the resolver that finds the item id for a bean, or null not to use
      * automatic resolving.
-     * 
+     *
      * Methods that add a bean without specifying an id must not be called if no
      * resolver has been set.
-     * 
+     *
      * Note that methods taking an explicit id can be used whether a resolver
      * has been defined or not.
-     * 
+     *
      * @param beanIdResolver
      *            to use or null to disable automatic id resolution
      */
@@ -759,7 +759,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Returns the resolver that finds the item ID for a bean.
-     * 
+     *
      * @return resolver used or null if automatic item id resolving is disabled
      */
     public BeanIdResolver<IDTYPE, BEANTYPE> getBeanIdResolver() {
@@ -768,7 +768,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Create an item identifier resolver using a named bean property.
-     * 
+     *
      * @param propertyId
      *            property identifier, which must map to a getter in BEANTYPE
      * @return created resolver
@@ -819,9 +819,9 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds a property for the container and all its items.
-     * 
+     *
      * Primarily for internal use, may change in future versions.
-     * 
+     *
      * @param propertyId
      * @param propertyDescriptor
      * @return true if the property was added
@@ -852,13 +852,13 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds a nested container property for the container, e.g.
      * "manager.address.street".
-     * 
+     *
      * All intermediate getters must exist and should return non-null values
      * when the property value is accessed. If an intermediate getter returns
      * null, a null value will be returned.
-     * 
+     *
      * @see NestedMethodProperty
-     * 
+     *
      * @param propertyId
      * @return true if the property was added
      */
@@ -871,14 +871,14 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * Adds a nested container properties for all sub-properties of a named
      * property to the container. The named property itself is removed from the
      * model as its subproperties are added.
-     * 
+     *
      * All intermediate getters must exist and should return non-null values
      * when the property value is accessed. If an intermediate getter returns
      * null, a null value will be returned.
-     * 
+     *
      * @see NestedMethodProperty
      * @see #addNestedContainerProperty(String)
-     * 
+     *
      * @param propertyId
      */
     @SuppressWarnings("unchecked")
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java
index c9c77be6e6..c95ddf0061 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractContainer.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.data.Container;
 /**
  * Abstract container class that manages event listeners and sending events to
  * them ({@link PropertySetChangeNotifier}, {@link ItemSetChangeNotifier}).
- * 
+ *
  * Note that this class provides the internal implementations for both types of
  * events and notifiers as protected methods, but does not implement the
  * {@link PropertySetChangeNotifier} and {@link ItemSetChangeNotifier}
@@ -34,7 +34,7 @@ import com.vaadin.data.Container;
  * Subclasses implementing those interfaces should also override the
  * corresponding {@link #addListener()} and {@link #removeListener()} methods to
  * make them public.
- * 
+ *
  * @since 6.6
  */
 public abstract class AbstractContainer implements Container {
@@ -52,7 +52,7 @@ public abstract class AbstractContainer implements Container {
     /**
      * An <code>event</code> object specifying the container whose Property set
      * has changed.
-     * 
+     *
      * This class does not provide information about which properties were
      * concerned by the change, but subclasses can provide additional
      * information about the changes.
@@ -73,7 +73,7 @@ public abstract class AbstractContainer implements Container {
     /**
      * An <code>event</code> object specifying the container whose Item set has
      * changed.
-     * 
+     *
      * This class does not provide information about the exact changes
      * performed, but subclasses can add provide additional information about
      * the changes.
@@ -97,7 +97,7 @@ public abstract class AbstractContainer implements Container {
      * Implementation of the corresponding method in
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
-     * 
+     *
      * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     protected void addPropertySetChangeListener(
@@ -122,7 +122,7 @@ public abstract class AbstractContainer implements Container {
      * Implementation of the corresponding method in
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
-     * 
+     *
      * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.
      *      PropertySetChangeListener)
      */
@@ -149,7 +149,7 @@ public abstract class AbstractContainer implements Container {
      * Implementation of the corresponding method in
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
-     * 
+     *
      * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     protected void addItemSetChangeListener(
@@ -174,7 +174,7 @@ public abstract class AbstractContainer implements Container {
      * Implementation of the corresponding method in
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
-     * 
+     *
      * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     protected void removeItemSetChangeListener(
@@ -202,11 +202,11 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * Sends a Property set change event to all interested listeners.
-     * 
+     *
      * Use {@link #fireContainerPropertySetChange()} instead of this method
      * unless additional information about the exact changes is available and
      * should be included in the event.
-     * 
+     *
      * @param event
      *            the property change event to send, optionally with additional
      *            information
@@ -233,7 +233,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * Sends an Item set change event to all registered interested listeners.
-     * 
+     *
      * @param event
      *            the item set change event to send, optionally with additional
      *            information
@@ -250,7 +250,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * Sets the property set change listener collection. For internal use only.
-     * 
+     *
      * @param propertySetChangeListeners
      */
     protected void setPropertySetChangeListeners(
@@ -268,7 +268,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * Sets the item set change listener collection. For internal use only.
-     * 
+     *
      * @param itemSetChangeListeners
      */
     protected void setItemSetChangeListeners(
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
index 095d4929a6..44803613d6 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.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
@@ -36,7 +36,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * in-memory containers. Concrete in-memory container classes can either inherit
  * this class, inherit {@link AbstractContainer}, or implement the
  * {@link Container} interface directly.
- * 
+ *
  * Adding and removing items (if desired) must be implemented in subclasses by
  * overriding the appropriate add*Item() and remove*Item() and removeAllItems()
  * methods, calling the corresponding
@@ -45,12 +45,12 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * {@link #internalAddItemAtEnd(Object, Item, boolean)},
  * {@link #internalRemoveItem(Object)} and {@link #internalRemoveAllItems()}
  * methods.
- * 
+ *
  * By default, adding and removing container properties is not supported, and
  * subclasses need to implement {@link #getContainerPropertyIds()}. Optionally,
  * subclasses can override {@link #addContainerProperty(Object, Class, Object)}
  * and {@link #removeContainerProperty(Object)} to implement them.
- * 
+ *
  * Features:
  * <ul>
  * <li>{@link Container.Ordered}
@@ -60,12 +60,12 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <li>{@link Sortable} (internal implementation, does not implement the
  * interface directly)
  * </ul>
- * 
+ *
  * To implement {@link Sortable}, subclasses need to implement
  * {@link #getSortablePropertyIds()} and call the superclass method
  * {@link #sortContainer(Object[], boolean[])} in the method
  * <code>sort(Object[], boolean[])</code>.
- * 
+ *
  * To implement {@link Filterable}, subclasses need to implement the methods
  * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
  * (calling {@link #addFilter(Filter)}),
@@ -73,14 +73,14 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * {@link #removeAllFilters()}) and
  * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
  * (calling {@link #removeFilter(com.vaadin.data.Container.Filter)}).
- * 
+ *
  * To implement {@link SimpleFilterable}, subclasses also need to implement the
  * methods
  * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
  * and {@link SimpleFilterable#removeContainerFilters(Object)} calling
  * {@link #addFilter(com.vaadin.data.Container.Filter)} and
  * {@link #removeFilters(Object)} respectively.
- * 
+ *
  * @param <ITEMIDTYPE>
  *            the class of item identifiers in the container, use Object if can
  *            be any class
@@ -90,7 +90,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * @param <ITEMCLASS>
  *            the (base) class of the Item instances in the container, use
  *            {@link Item} if unknown
- * 
+ *
  * @since 6.6
  */
 public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITEMCLASS extends Item>
@@ -100,7 +100,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * An ordered {@link List} of all item identifiers in the container,
      * including those that have been filtered out.
-     * 
+     *
      * Must not be null.
      */
     private List<ITEMIDTYPE> allItemIds;
@@ -108,10 +108,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * An ordered {@link List} of item identifiers in the container after
      * filtering, excluding those that have been filtered out.
-     * 
+     *
      * This is what the external API of the {@link Container} interface and its
      * subinterfaces shows (e.g. {@link #size()}, {@link #nextItemId(Object)}).
-     * 
+     *
      * If null, the full item id list is used instead.
      */
     private List<ITEMIDTYPE> filteredItemIds;
@@ -182,12 +182,12 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * An <code>Event</code> object specifying information about the added
      * items.
-     * 
+     *
      * <p>
      * This class provides information about the first added item and the number
      * of added items.
      * </p>
-     * 
+     *
      * @since 7.4
      */
     protected static class BaseItemAddEvent extends BaseItemAddOrRemoveEvent
@@ -207,12 +207,12 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * An <code>Event</code> object specifying information about the removed
      * items.
-     * 
+     *
      * <p>
      * This class provides information about the first removed item and the
      * number of removed items.
      * </p>
-     * 
+     *
      * @since 7.4
      */
     protected static class BaseItemRemoveEvent extends BaseItemAddOrRemoveEvent
@@ -231,9 +231,9 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Get an item even if filtered out.
-     * 
+     *
      * For internal use only.
-     * 
+     *
      * @param itemId
      * @return
      */
@@ -494,7 +494,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * This method should reset any internal data structures and then repopulate
      * them so {@link #getItemIds()} and other methods only return the filtered
      * items.
-     * 
+     *
      * @param hasFilters
      *            true if filters has been set for the container, false
      *            otherwise
@@ -538,7 +538,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Checks if the given itemId passes the filters set for the container. The
      * caller should make sure the itemId exists in the container. For
      * non-existing itemIds the behavior is undefined.
-     * 
+     *
      * @param itemId
      *            An itemId that exists in the container.
      * @return true if the itemId passes all filters or no filters are set,
@@ -561,20 +561,20 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Adds a container filter and re-filter the view.
-     * 
+     *
      * The filter must implement Filter and its sub-filters (if any) must also
      * be in-memory filterable.
-     * 
+     *
      * This can be used to implement
      * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
      * and optionally also
      * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
      * (with {@link SimpleStringFilter}).
-     * 
+     *
      * Note that in some cases, incompatible filters cannot be detected when
      * added and an {@link UnsupportedFilterException} may occur when performing
      * filtering.
-     * 
+     *
      * @throws UnsupportedFilterException
      *             if the filter is detected as not supported by the container
      */
@@ -585,7 +585,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Returns true if any filters have been applied to the container.
-     * 
+     *
      * @return true if the container has filters applied, false otherwise
      * @since 7.1
      */
@@ -595,7 +595,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Filterable#getContainerFilters()
      */
     protected Collection<Filter> getContainerFilters() {
@@ -604,7 +604,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Remove a specific container filter and re-filter the view (if necessary).
-     * 
+     *
      * This can be used to implement
      * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
      * .
@@ -623,7 +623,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Remove all container filters for all properties and re-filter the view.
-     * 
+     *
      * This can be used to implement
      * {@link Filterable#removeAllContainerFilters()}.
      */
@@ -637,7 +637,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Checks if there is a filter that applies to a given property.
-     * 
+     *
      * @param propertyId
      * @return true if there is an active filter for the property
      */
@@ -659,10 +659,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Remove all container filters for a given property identifier and
      * re-filter the view. This also removes filters applying to multiple
      * properties including the one identified by propertyId.
-     * 
+     *
      * This can be used to implement
      * {@link Filterable#removeContainerFilters(Object)}.
-     * 
+     *
      * @param propertyId
      * @return Collection<Filter> removed filters
      */
@@ -691,7 +691,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Returns the ItemSorter used for comparing items in a sort. See
      * {@link #setItemSorter(ItemSorter)} for more information.
-     * 
+     *
      * @return The ItemSorter used for comparing two items in a sort.
      */
     protected ItemSorter getItemSorter() {
@@ -703,7 +703,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * {@link ItemSorter#compare(Object, Object)} method is called with item ids
      * to perform the sorting. A default ItemSorter is used if this is not
      * explicitly set.
-     * 
+     *
      * @param itemSorter
      *            The ItemSorter used for comparing two items in a sort (not
      *            null).
@@ -714,10 +714,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Sort base implementation to be used to implement {@link Sortable}.
-     * 
+     *
      * Subclasses should call this from a public
      * {@link #sort(Object[], boolean[])} method when implementing Sortable.
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      */
@@ -749,7 +749,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * operation. Typically this method calls
      * <code>Collections.sort(aCollection, getItemSorter())</code> on all arrays
      * (containing item ids) that need to be sorted.
-     * 
+     *
      */
     protected void doSort() {
         Collections.sort(getAllItemIds(), getItemSorter());
@@ -776,7 +776,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Removes all items from the internal data structures of this class. This
      * can be used to implement {@link #removeAllItems()} in subclasses.
-     * 
+     *
      * No notification is sent, the caller has to fire a suitable item set
      * change notification.
      */
@@ -791,10 +791,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Removes a single item from the internal data structures of this class.
      * This can be used to implement {@link #removeItem(Object)} in subclasses.
-     * 
+     *
      * No notification is sent, the caller has to fire a suitable item set
      * change notification.
-     * 
+     *
      * @param itemId
      *            the identifier of the item to remove
      * @return true if an item was successfully removed, false if failed to
@@ -819,16 +819,16 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Adds the bean to all internal data structures at the given position.
      * Fails if an item with itemId is already in the container. Returns a the
      * item if it was added successfully, null otherwise.
-     * 
+     *
      * <p>
      * Caller should initiate filtering after calling this method.
      * </p>
-     * 
+     *
      * For internal use only - subclasses should use
      * {@link #internalAddItemAtEnd(Object, Item, boolean)},
      * {@link #internalAddItemAt(int, Object, Item, boolean)} and
      * {@link #internalAddItemAfter(Object, Object, Item, boolean)} instead.
-     * 
+     *
      * @param position
      *            The position at which the item should be inserted in the
      *            unfiltered collection of items
@@ -836,7 +836,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      *            The item identifier for the item to insert
      * @param item
      *            The item to insert
-     * 
+     *
      * @return ITEMCLASS if the item was added successfully, null otherwise
      */
     private ITEMCLASS internalAddAt(int position, ITEMIDTYPE itemId,
@@ -861,7 +861,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Add an item at the end of the container, and perform filtering if
      * necessary. An event is fired if the filtered view changes.
-     * 
+     *
      * @param newItemId
      * @param item
      *            new item to add
@@ -890,9 +890,9 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Add an item after a given (visible) item, and perform filtering. An event
      * is fired if the filtered view changes.
-     * 
+     *
      * The new item is added at the beginning if previousItemId is null.
-     * 
+     *
      * @param previousItemId
      *            item id of a visible item after which to add the new item, or
      *            null to add at the beginning
@@ -930,7 +930,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Add an item at a given (visible after filtering) item index, and perform
      * filtering. An event is fired if the filtered view changes.
-     * 
+     *
      * @param index
      *            position where to add the item (visible/view index)
      * @param newItemId
@@ -962,10 +962,10 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * involve storing the item or any relevant information about it in internal
      * container-specific collections if necessary, as well as registering
      * listeners etc.
-     * 
+     *
      * The full identifier list in {@link AbstractInMemoryContainer} has already
      * been updated to reflect the new item when this method is called.
-     * 
+     *
      * @param position
      * @param itemId
      * @param item
@@ -979,9 +979,9 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Notify item set change listeners that an item has been added to the
      * container.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param position
      *            position of the added item in the view
      * @param itemId
@@ -997,7 +997,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Notify item set change listeners that items has been added to the
      * container.
-     * 
+     *
      * @param firstPosition
      *            position of the first visible added item in the view
      * @param firstItemId
@@ -1015,9 +1015,9 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Notify item set change listeners that an item has been removed from the
      * container.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param position
      *            position of the removed item in the view prior to removal (if
      *            was visible)
@@ -1032,7 +1032,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Notify item set change listeners that items has been removed from the
      * container.
-     * 
+     *
      * @param firstPosition
      *            position of the first visible removed item in the view prior
      *            to removal
@@ -1041,7 +1041,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      *            to satisfy {@link Container#removeItem(Object)} API
      * @param numberOfItems
      *            the number of removed visible items
-     * 
+     *
      */
     protected void fireItemsRemoved(int firstPosition, Object firstItemId,
             int numberOfItems) {
@@ -1054,7 +1054,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Returns the internal list of visible item identifiers after filtering.
-     * 
+     *
      * For internal use only.
      */
     protected List<ITEMIDTYPE> getVisibleItemIds() {
@@ -1070,9 +1070,9 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * returned if there is no visible items.
      * <p>
      * For internal use only.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @return item id of the first visible item
      */
     protected ITEMIDTYPE getFirstVisibleItem() {
@@ -1084,7 +1084,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Returns true is the container has active filters.
-     * 
+     *
      * @return true if the container is currently filtered
      */
     protected boolean isFiltered() {
@@ -1095,7 +1095,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Internal helper method to set the internal list of filtered item
      * identifiers. Should not be used outside this class except for
      * implementing clone(), may disappear from future versions.
-     * 
+     *
      * @param filteredItemIds
      */
     @Deprecated
@@ -1108,7 +1108,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * identifiers. Should not be used outside this class except for
      * implementing clone(), may disappear from future versions - use
      * {@link #getVisibleItemIds()} in other contexts.
-     * 
+     *
      * @return List<ITEMIDTYPE>
      */
     protected List<ITEMIDTYPE> getFilteredItemIds() {
@@ -1119,7 +1119,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Internal helper method to set the internal list of all item identifiers.
      * Should not be used outside this class except for implementing clone(),
      * may disappear from future versions.
-     * 
+     *
      * @param allItemIds
      */
     @Deprecated
@@ -1131,7 +1131,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Internal helper method to get the internal list of all item identifiers.
      * Avoid using this method outside this class, may disappear in future
      * versions.
-     * 
+     *
      * @return List<ITEMIDTYPE>
      */
     protected List<ITEMIDTYPE> getAllItemIds() {
@@ -1140,12 +1140,12 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * Set the internal collection of filters without performing filtering.
-     * 
+     *
      * This method is mostly for internal use, use
      * {@link #addFilter(com.vaadin.data.Container.Filter)} and
      * <code>remove*Filter*</code> (which also re-filter the container) instead
      * when possible.
-     * 
+     *
      * @param filters
      */
     protected void setFilters(Set<Filter> filters) {
@@ -1155,7 +1155,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Returns the internal collection of filters. The returned collection
      * should not be modified by callers outside this class.
-     * 
+     *
      * @return Set<Filter>
      */
     protected Set<Filter> getFilters() {
diff --git a/server/src/main/java/com/vaadin/data/util/BeanContainer.java b/server/src/main/java/com/vaadin/data/util/BeanContainer.java
index c1dd3a93cf..a2a07c977c 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanContainer.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
@@ -19,25 +19,25 @@ import java.util.Collection;
 
 /**
  * An in-memory container for JavaBeans.
- * 
+ *
  * <p>
  * The properties of the container are determined automatically by introspecting
  * the used JavaBean class. Only beans of the same type can be added to the
  * container.
  * </p>
- * 
+ *
  * <p>
  * In BeanContainer (unlike {@link BeanItemContainer}), the item IDs do not have
  * to be the beans themselves. The container can be used either with explicit
  * item IDs or the item IDs can be generated when adding beans.
  * </p>
- * 
+ *
  * <p>
  * To use explicit item IDs, use the methods {@link #addItem(Object, Object)},
  * {@link #addItemAfter(Object, Object, Object)} and
  * {@link #addItemAt(int, Object, Object)}.
  * </p>
- * 
+ *
  * <p>
  * If a bean id resolver is set using
  * {@link #setBeanIdResolver(com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver)}
@@ -47,25 +47,25 @@ import java.util.Collection;
  * container. If one of these methods is called, the resolver is used to
  * generate an identifier for the item (must not return null).
  * </p>
- * 
+ *
  * <p>
  * Note that explicit item identifiers can also be used when a resolver has been
  * set by calling the addItem*() methods - the resolver is only used when adding
  * beans using the addBean*() or {@link #addAll(Collection)} methods.
  * </p>
- * 
+ *
  * <p>
  * It is not possible to add additional properties to the container.
  * </p>
- * 
+ *
  * @param <IDTYPE>
  *            The type of the item identifier
  * @param <BEANTYPE>
  *            The type of the Bean
- * 
+ *
  * @see AbstractBeanContainer
  * @see BeanItemContainer
- * 
+ *
  * @since 6.5
  */
 public class BeanContainer<IDTYPE, BEANTYPE>
@@ -77,7 +77,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds the bean to the Container.
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(Object)
      */
     @Override
@@ -91,7 +91,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds the bean after the given item id.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
@@ -106,16 +106,16 @@ public class BeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * Adds a new bean at the given index.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @param index
      *            Index at which the bean should be added.
      * @param newItemId
      *            The item id for the bean to add to the container.
      * @param bean
      *            The bean to add to the container.
-     * 
+     *
      * @return Returns the new BeanItem or null if the operation fails.
      */
     @Override
@@ -133,7 +133,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
     /**
      * Sets the bean id resolver to use a property of the beans as the
      * identifier.
-     * 
+     *
      * @param propertyId
      *            the identifier of the property to use to find item identifiers
      */
diff --git a/server/src/main/java/com/vaadin/data/util/BeanItem.java b/server/src/main/java/com/vaadin/data/util/BeanItem.java
index 2f34350f28..78010a14c0 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanItem.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanItem.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 java.util.Set;
 
 /**
  * A wrapper class for adding the Item interface to any Java Bean.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -46,16 +46,16 @@ public class BeanItem<BT> extends PropertysetItem {
      * of a Java Bean to it. The properties are identified by their respective
      * bean names.
      * </p>
-     * 
+     *
      * <p>
      * Note : This version only supports introspectable bean properties and
      * their getter and setter methods. Stand-alone <code>is</code> and
      * <code>are</code> methods are not supported.
      * </p>
-     * 
+     *
      * @param bean
      *            the Java Bean to copy properties from.
-     * 
+     *
      */
     public BeanItem(BT bean) {
         this(bean, (Class<BT>) bean.getClass());
@@ -67,20 +67,20 @@ public class BeanItem<BT> extends PropertysetItem {
      * of a Java Bean to it. The properties are identified by their respective
      * bean names.
      * </p>
-     * 
+     *
      * <p>
      * Note : This version only supports introspectable bean properties and
      * their getter and setter methods. Stand-alone <code>is</code> and
      * <code>are</code> methods are not supported.
      * </p>
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param bean
      *            the Java Bean to copy properties from.
      * @param beanClass
      *            class of the {@code bean}
-     * 
+     *
      */
     public BeanItem(BT bean, Class<BT> beanClass) {
         this(bean, getPropertyDescriptors(beanClass));
@@ -92,7 +92,7 @@ public class BeanItem<BT> extends PropertysetItem {
      * of properties. The properties are identified by their respective bean
      * names.
      * </p>
-     * 
+     *
      * @param bean
      *            the Java Bean to copy properties from.
      * @param propertyDescriptors
@@ -114,13 +114,13 @@ public class BeanItem<BT> extends PropertysetItem {
      * properties of a Java Bean to it - in specified order. The properties are
      * identified by their respective bean names.
      * </p>
-     * 
+     *
      * <p>
      * Note : This version only supports introspectable bean properties and
      * their getter and setter methods. Stand-alone <code>is</code> and
      * <code>are</code> methods are not supported.
      * </p>
-     * 
+     *
      * @param bean
      *            the Java Bean to copy properties from.
      * @param propertyIds
@@ -150,13 +150,13 @@ public class BeanItem<BT> extends PropertysetItem {
      * properties of a Java Bean to it - in specified order. The properties are
      * identified by their respective bean names.
      * </p>
-     * 
+     *
      * <p>
      * Note : This version only supports introspectable bean properties and
      * their getter and setter methods. Stand-alone <code>is</code> and
      * <code>are</code> methods are not supported.
      * </p>
-     * 
+     *
      * @param bean
      *            the Java Bean to copy properties from.
      * @param propertyIds
@@ -170,13 +170,13 @@ public class BeanItem<BT> extends PropertysetItem {
      * <p>
      * Perform introspection on a Java Bean class to find its properties.
      * </p>
-     * 
+     *
      * <p>
      * Note : This version only supports introspectable bean properties and
      * their getter and setter methods. Stand-alone <code>is</code> and
      * <code>are</code> methods are not supported.
      * </p>
-     * 
+     *
      * @param beanClass
      *            the Java Bean class to get properties for.
      * @return an ordered map from property names to property descriptors
@@ -211,7 +211,7 @@ public class BeanItem<BT> extends PropertysetItem {
     /**
      * Expands nested bean properties by replacing a top-level property with
      * some or all of its sub-properties. The expansion is not recursive.
-     * 
+     *
      * @param propertyId
      *            property id for the property whose sub-properties are to be
      *            expanded,
@@ -243,7 +243,7 @@ public class BeanItem<BT> extends PropertysetItem {
      * item already and must of form "field1.field2" where field2 is a field in
      * the object referenced to by field1. If an intermediate property returns
      * null, the property will return a null value
-     * 
+     *
      * @param nestedPropertyId
      *            property id to add.
      */
@@ -254,7 +254,7 @@ public class BeanItem<BT> extends PropertysetItem {
 
     /**
      * Gets the underlying JavaBean object.
-     * 
+     *
      * @return the bean object.
      */
     public BT getBean() {
diff --git a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
index 542254ca8d..62cb71885c 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.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
@@ -19,13 +19,13 @@ import java.util.Collection;
 
 /**
  * An in-memory container for JavaBeans.
- * 
+ *
  * <p>
  * The properties of the container are determined automatically by introspecting
  * the used JavaBean class. Only beans of the same type can be added to the
  * container.
  * </p>
- * 
+ *
  * <p>
  * BeanItemContainer uses the beans themselves as identifiers. The
  * {@link Object#hashCode()} of a bean is used when storing and looking up beans
@@ -34,21 +34,21 @@ import java.util.Collection;
  * implementation of {@link Object#equals(Object)} as well in order for it to
  * fulfill the contract between {@code equals()} and {@code hashCode()}.
  * </p>
- * 
+ *
  * <p>
  * To add items to the container, use the methods {@link #addBean(Object)},
  * {@link #addBeanAfter(Object, Object)} and {@link #addBeanAt(int, Object)}.
  * Also {@link #addItem(Object)}, {@link #addItemAfter(Object, Object)} and
  * {@link #addItemAt(int, Object)} can be used as synonyms for them.
  * </p>
- * 
+ *
  * <p>
  * It is not possible to add additional properties to the container.
  * </p>
- * 
+ *
  * @param <BEANTYPE>
  *            The type of the Bean
- * 
+ *
  * @since 5.4
  */
 @SuppressWarnings("serial")
@@ -58,13 +58,13 @@ public class BeanItemContainer<BEANTYPE>
     /**
      * Bean identity resolver that returns the bean itself as its item
      * identifier.
-     * 
+     *
      * This corresponds to the old behavior of {@link BeanItemContainer}, and
      * requires suitable (identity-based) equals() and hashCode() methods on the
      * beans.
-     * 
+     *
      * @param <BT>
-     * 
+     *
      * @since 6.5
      */
     private static class IdentityBeanIdResolver<BT>
@@ -79,7 +79,7 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Constructs a {@code BeanItemContainer} for beans of the given type.
-     * 
+     *
      * @param type
      *            the type of the beans that will be added to the container.
      * @throws IllegalArgumentException
@@ -96,19 +96,19 @@ public class BeanItemContainer<BEANTYPE>
      * The collection must not be empty.
      * {@link BeanItemContainer#BeanItemContainer(Class)} can be used for
      * creating an initially empty {@code BeanItemContainer}.
-     * 
+     *
      * Note that when using this constructor, the actual class of the first item
      * in the collection is used to determine the bean properties supported by
      * the container instance, and only beans of that class or its subclasses
      * can be added to the collection. If this is problematic or empty
      * collections need to be supported, use {@link #BeanItemContainer(Class)}
      * and {@link #addAll(Collection)} instead.
-     * 
+     *
      * @param collection
      *            a non empty {@link Collection} of beans.
      * @throws IllegalArgumentException
      *             If the collection is null or empty.
-     * 
+     *
      * @deprecated As of 6.5, use {@link #BeanItemContainer(Class, Collection)}
      *             instead
      */
@@ -125,7 +125,7 @@ public class BeanItemContainer<BEANTYPE>
     /**
      * Internal helper method to support the deprecated {@link Collection}
      * container.
-     * 
+     *
      * @param <BT>
      * @param collection
      * @return
@@ -145,7 +145,7 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Constructs a {@code BeanItemContainer} and adds the given beans to it.
-     * 
+     *
      * @param type
      *            the type of the beans that will be added to the container.
      * @param collection
@@ -167,7 +167,7 @@ public class BeanItemContainer<BEANTYPE>
     /**
      * Adds all the beans from a {@link Collection} in one go. More efficient
      * than adding them one by one.
-     * 
+     *
      * @param collection
      *            The collection of beans to add. Must not be null.
      */
@@ -178,14 +178,14 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Adds the bean after the given bean.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @param previousItemId
      *            the bean (of type BT) after which to add newItemId
      * @param newItemId
      *            the bean (of type BT) to add (not null)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
@@ -198,9 +198,9 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Adds a new bean at the given index.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @param index
      *            Index at which the bean should be added.
      * @param newItemId
@@ -216,9 +216,9 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Adds the bean to the Container.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(Object)
      */
     @Override
@@ -229,9 +229,9 @@ public class BeanItemContainer<BEANTYPE>
 
     /**
      * Adds the bean to the Container.
-     * 
+     *
      * The bean is used both as the item contents and as the item identifier.
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(Object)
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
index 408e014baf..e50ca97d67 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.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,9 +26,9 @@ import java.util.List;
 
 /**
  * Utility class for Java Beans information access.
- * 
+ *
  * @since 7.4
- * 
+ *
  * @author Vaadin Ltd
  */
 public final class BeanUtil implements Serializable {
@@ -38,21 +38,21 @@ public final class BeanUtil implements Serializable {
 
     /**
      * Returns the property descriptors of a class or an interface.
-     * 
+     *
      * For an interface, superinterfaces are also iterated as Introspector does
      * not take them into account (Oracle Java bug 4275879), but in that case,
      * both the setter and the getter for a property must be in the same
      * interface and should not be overridden in subinterfaces for the discovery
      * to work correctly.
-     * 
+     *
      * NOTE : This utility method relies on introspection (and returns
      * PropertyDescriptor) which is a part of java.beans package. The latter
      * package could require bigger JDK in the future (with Java 9+). So it may
      * be changed in the future.
-     * 
+     *
      * For interfaces, the iteration is depth first and the properties of
      * superinterfaces are returned before those of their subinterfaces.
-     * 
+     *
      * @param beanClass
      * @return
      * @throws IntrospectionException
@@ -82,7 +82,7 @@ public final class BeanUtil implements Serializable {
      * Returns {@code propertyId} class for property declared in {@code clazz}.
      * Property could be of form "property.subProperty[.subProperty2]" i.e.
      * refer to some nested property.
-     * 
+     *
      * @param clazz
      *            class where property is declared
      * @param propertyId
diff --git a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 8e39255253..fe768e677b 100644
--- a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.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
@@ -36,14 +36,14 @@ import com.vaadin.data.Property;
  * A wrapper class for adding external hierarchy to containers not implementing
  * the {@link com.vaadin.data.Container.Hierarchical} interface.
  * </p>
- * 
+ *
  * <p>
  * If the wrapped container is changed directly (that is, not through the
  * wrapper), and does not implement Container.ItemSetChangeNotifier and/or
  * Container.PropertySetChangeNotifier the hierarchy information must be updated
  * with the {@link #updateHierarchicalWrapper()} method.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -101,7 +101,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * Constructs a new hierarchical wrapper for an existing Container. Works
      * even if the to-be-wrapped container already implements the
      * <code>Container.Hierarchical</code> interface.
-     * 
+     *
      * @param toBeWrapped
      *            the container that needs to be accessed hierarchically
      * @see #updateHierarchicalWrapper()
@@ -201,7 +201,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * <p>
      * Note : The Item is not removed from the underlying Container.
      * </p>
-     * 
+     *
      * @param itemId
      *            the ID of the item to remove from the hierarchy.
      */
@@ -231,7 +231,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * Adds the specified Item specified to the internal hierarchy structure.
      * The new item is added as a root Item. The underlying container is not
      * modified.
-     * 
+     *
      * @param itemId
      *            the ID of the item to add to the hierarchy.
      */
@@ -358,7 +358,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * {@link #setParent(Object itemId, Object newParentId)} or
      * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
-     * 
+     *
      * @param itemId
      *            the ID of the Item in the container whose child capability is
      *            to be set.
@@ -399,7 +399,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * also possible to detach a node from the hierarchy (and thus make it root)
      * by setting the parent <code>null</code>.
      * </p>
-     * 
+     *
      * @param itemId
      *            the ID of the item to be set as the child of the Item
      *            identified with newParentId.
@@ -511,7 +511,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     /**
      * Creates a new Item into the Container, assigns it an automatic ID, and
      * adds it to the hierarchy.
-     * 
+     *
      * @return the autogenerated ID of the new Item or <code>null</code> if the
      *         operation failed
      * @throws UnsupportedOperationException
@@ -530,7 +530,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     /**
      * Adds a new Item by its ID to the underlying container and to the
      * hierarchy.
-     * 
+     *
      * @param itemId
      *            the ID of the Item to be created.
      * @return the added Item or <code>null</code> if the operation failed.
@@ -553,7 +553,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * Removes all items from the underlying container and from the hierarcy.
-     * 
+     *
      * @return <code>true</code> if the operation succeeded, <code>false</code>
      *         if not
      * @throws UnsupportedOperationException
@@ -576,7 +576,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
     /**
      * Removes an Item specified by the itemId from the underlying container and
      * from the hierarchy.
-     * 
+     *
      * @param itemId
      *            the ID of the Item to be removed.
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -599,7 +599,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * Removes the Item identified by given itemId and all its children.
-     * 
+     *
      * @see #removeItem(Object)
      * @param itemId
      *            the identifier of the Item to be removed
@@ -611,7 +611,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * Adds a new Property to all Items in the Container.
-     * 
+     *
      * @param propertyId
      *            the ID of the new Property.
      * @param type
@@ -636,7 +636,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * <p>
      * Note : The Property will be removed from all Items in the Container.
      * </p>
-     * 
+     *
      * @param propertyId
      *            the ID of the Property to remove.
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -823,7 +823,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * This listener 'piggybacks' on the real listener in order to update the
      * wrapper when needed. It proxies equals() and hashCode() to the real
      * listener so that the correct listener gets removed.
-     * 
+     *
      */
     private class PiggybackListener
             implements Container.PropertySetChangeListener,
diff --git a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java
index f9519c7282..fef43caf17 100644
--- a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.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
@@ -32,14 +32,14 @@ import com.vaadin.data.Property;
  * A wrapper class for adding external ordering to containers not implementing
  * the {@link com.vaadin.data.Container.Ordered} interface.
  * </p>
- * 
+ *
  * <p>
  * If the wrapped container is changed directly (that is, not through the
  * wrapper), and does not implement Container.ItemSetChangeNotifier and/or
  * Container.PropertySetChangeNotifier the hierarchy information must be updated
  * with the {@link #updateOrderWrapper()} method.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -92,7 +92,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * Constructs a new ordered wrapper for an existing Container. Works even if
      * the to-be-wrapped container already implements the Container.Ordered
      * interface.
-     * 
+     *
      * @param toBeWrapped
      *            the container whose contents need to be ordered.
      */
@@ -116,7 +116,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * <p>
      * Note : The Item is not removed from the underlying Container.
      * </p>
-     * 
+     *
      * @param id
      *            the ID of the Item to be removed from the ordering.
      */
@@ -152,7 +152,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /**
      * Registers the specified Item to the last position in the wrapper's
      * internal ordering. The underlying container is not modified.
-     * 
+     *
      * @param id
      *            the ID of the Item to be added to the ordering.
      */
@@ -172,7 +172,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * Registers the specified Item after the specified itemId in the wrapper's
      * internal ordering. The underlying container is not modified. Given item
      * id must be in the container, or must be null.
-     * 
+     *
      * @param id
      *            the ID of the Item to be added to the ordering.
      * @param previousItemId
@@ -324,7 +324,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
 
     /**
      * Registers a new Property to all Items in the Container.
-     * 
+     *
      * @param propertyId
      *            the ID of the new Property.
      * @param type
@@ -344,7 +344,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /**
      * Creates a new Item into the Container, assigns it an automatic ID, and
      * adds it to the ordering.
-     * 
+     *
      * @return the autogenerated ID of the new Item or <code>null</code> if the
      *         operation failed
      * @throws UnsupportedOperationException
@@ -363,7 +363,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /**
      * Registers a new Item by its ID to the underlying container and to the
      * ordering.
-     * 
+     *
      * @param itemId
      *            the ID of the Item to be created.
      * @return the added Item or <code>null</code> if the operation failed
@@ -381,7 +381,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
 
     /**
      * Removes all items from the underlying container and from the ordering.
-     * 
+     *
      * @return <code>true</code> if the operation succeeded, otherwise
      *         <code>false</code>
      * @throws UnsupportedOperationException
@@ -401,7 +401,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
     /**
      * Removes an Item specified by the itemId from the underlying container and
      * from the ordering.
-     * 
+     *
      * @param itemId
      *            the ID of the Item to be removed.
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -426,7 +426,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * <p>
      * Note : The Property will be removed from all the Items in the Container.
      * </p>
-     * 
+     *
      * @param propertyId
      *            the ID of the Property to remove.
      * @return <code>true</code> if the operation succeeded, <code>false</code>
@@ -632,7 +632,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
@@ -658,7 +658,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     @Override
@@ -685,7 +685,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * This listener 'piggybacks' on the real listener in order to update the
      * wrapper when needed. It proxies equals() and hashCode() to the real
      * listener so that the correct listener gets removed.
-     * 
+     *
      */
     private class PiggybackListener
             implements Container.PropertySetChangeListener,
diff --git a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java
index 9bbbdd06e8..c35a3a6325 100644
--- a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java
+++ b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.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
@@ -36,7 +36,7 @@ import com.vaadin.data.Property;
  * A Comparator is used for comparing the individual <code>Property</code>
  * values. The comparator can be set using the constructor. If no comparator is
  * provided a default comparator is used.
- * 
+ *
  */
 public class DefaultItemSorter implements ItemSorter {
 
@@ -48,7 +48,7 @@ public class DefaultItemSorter implements ItemSorter {
     /**
      * Constructs a DefaultItemSorter using the default <code>Comparator</code>
      * for comparing <code>Property</code>values.
-     * 
+     *
      */
     public DefaultItemSorter() {
         this(new DefaultPropertyValueComparator());
@@ -58,7 +58,7 @@ public class DefaultItemSorter implements ItemSorter {
      * Constructs a DefaultItemSorter which uses the <code>Comparator</code>
      * indicated by the <code>propertyValueComparator</code> parameter for
      * comparing <code>Property</code>values.
-     * 
+     *
      * @param propertyValueComparator
      *            The comparator to use when comparing individual
      *            <code>Property</code> values
@@ -69,7 +69,7 @@ public class DefaultItemSorter implements ItemSorter {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.ItemSorter#compare(java.lang.Object,
      * java.lang.Object)
      */
@@ -117,7 +117,7 @@ public class DefaultItemSorter implements ItemSorter {
      * <p>
      * The comparator set for this <code>DefaultItemSorter</code> is used for
      * comparing the two property values.
-     * 
+     *
      * @param propertyId
      *            The property id for the property that is used for comparison.
      * @param sortDirection
@@ -155,7 +155,7 @@ public class DefaultItemSorter implements ItemSorter {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.ItemSorter#setSortProperties(com.vaadin.data.
      * Container .Sortable, java.lang.Object[], boolean[])
      */
@@ -189,7 +189,7 @@ public class DefaultItemSorter implements ItemSorter {
      * Provides a default comparator used for comparing {@link Property} values.
      * The <code>DefaultPropertyValueComparator</code> assumes all objects it
      * compares can be cast to Comparable.
-     * 
+     *
      */
     public static class DefaultPropertyValueComparator
             implements Comparator<Object>, Serializable {
diff --git a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
index ba7fcebb36..d6e24fd02e 100644
--- a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.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
@@ -38,7 +38,7 @@ import com.vaadin.util.FileTypeResolver;
 
 /**
  * A hierarchical container wrapper for a filesystem.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -107,7 +107,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Constructs a new <code>FileSystemContainer</code> with the specified file
      * as the root of the filesystem. The files are included recursively.
-     * 
+     *
      * @param root
      *            the root file for the new file-system container. Null values
      *            are ignored.
@@ -121,7 +121,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Constructs a new <code>FileSystemContainer</code> with the specified file
      * as the root of the filesystem. The files are included recursively.
-     * 
+     *
      * @param root
      *            the root file for the new file-system container.
      * @param recursive
@@ -135,7 +135,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Constructs a new <code>FileSystemContainer</code> with the specified file
      * as the root of the filesystem.
-     * 
+     *
      * @param root
      *            the root file for the new file-system container.
      * @param extension
@@ -153,7 +153,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Constructs a new <code>FileSystemContainer</code> with the specified root
      * and recursivity status.
-     * 
+     *
      * @param root
      *            the root file for the new file-system container.
      * @param filter
@@ -171,7 +171,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Adds new root file directory. Adds a file to be included as root file
      * directory in the <code>FilesystemContainer</code>.
-     * 
+     *
      * @param root
      *            the File to be added as root directory. Null values are
      *            ignored.
@@ -191,7 +191,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * Tests if the specified Item in the container may have children. Since a
      * <code>FileSystemContainer</code> contains files and directories, this
      * method returns <code>true</code> for directory Items only.
-     * 
+     *
      * @param itemId
      *            the id of the item.
      * @return <code>true</code> if the specified Item is a directory,
@@ -316,7 +316,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Returns <code>false</code> when conversion from files to directories is
      * not supported.
-     * 
+     *
      * @param itemId
      *            the ID of the item.
      * @param areChildrenAllowed
@@ -338,7 +338,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Returns <code>false</code> when moving files around in the filesystem is
      * not supported.
-     * 
+     *
      * @param itemId
      *            the ID of the item.
      * @param newParentId
@@ -402,7 +402,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Internal recursive method to add the files under the specified directory
      * to the collection.
-     * 
+     *
      * @param col
      *            the collection where the found items are added
      * @param f
@@ -473,7 +473,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * Gets the specified property of the specified file Item. The available
      * file properties are "Name", "Size" and "Last Modified". If propertyId is
      * not one of those, <code>null</code> is returned.
-     * 
+     *
      * @param itemId
      *            the ID of the file whose property is requested.
      * @param propertyId
@@ -512,7 +512,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * Gets the collection of available file properties.
-     * 
+     *
      * @return Unmodifiable collection containing all available file properties.
      */
     @Override
@@ -524,7 +524,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * Gets the specified property's data type. "Name" is a <code>String</code>,
      * "Size" is a <code>Long</code>, "Last Modified" is a <code>Date</code>. If
      * propertyId is not one of those, <code>null</code> is returned.
-     * 
+     *
      * @param propertyId
      *            the ID of the property whose type is requested.
      * @return data type of the requested property, or <code>null</code>
@@ -550,7 +550,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Internal method to recursively calculate the number of files under a root
      * directory.
-     * 
+     *
      * @param f
      *            the root to start counting from.
      */
@@ -577,7 +577,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Gets the number of Items in the container. In effect, this is the
      * combined amount of files and directories.
-     * 
+     *
      * @return Number of Items in the container.
      */
     @Override
@@ -610,7 +610,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * A Item wrapper for files in a filesystem.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -653,7 +653,7 @@ public class FilesystemContainer implements Container.Hierarchical {
          * same Item contained in the same list always have different
          * hash-codes, though Properties in different Items may have identical
          * hash-codes.
-         * 
+         *
          * @return A locally unique hash-code as integer
          */
         @Override
@@ -664,7 +664,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Tests if the given object is the same as the this object. Two
          * Properties got from an Item with the same ID are equal.
-         * 
+         *
          * @param obj
          *            an object to compare with this object.
          * @return <code>true</code> if the given object is the same as this
@@ -688,7 +688,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Gets the last modified date of this file.
-         * 
+         *
          * @return Date
          */
         public Date lastModified() {
@@ -697,7 +697,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Gets the name of this file.
-         * 
+         *
          * @return file name of this file.
          */
         public String getName() {
@@ -706,7 +706,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Gets the icon of this file.
-         * 
+         *
          * @return the icon of this file.
          */
         public Resource getIcon() {
@@ -715,7 +715,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Gets the size of this file.
-         * 
+         *
          * @return size
          */
         public long getSize() {
@@ -738,7 +738,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Filesystem container does not support adding new properties.
-         * 
+         *
          * @see com.vaadin.data.Item#addItemProperty(Object, Property)
          */
         @Override
@@ -750,7 +750,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Filesystem container does not support removing properties.
-         * 
+         *
          * @see com.vaadin.data.Item#removeItemProperty(Object)
          */
         @Override
@@ -765,7 +765,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /**
      * Generic file extension filter for displaying only files having certain
      * extension.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -775,7 +775,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Constructs a new FileExtensionFilter using given extension.
-         * 
+         *
          * @param fileExtension
          *            the File extension without the separator (dot).
          */
@@ -785,7 +785,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
         /**
          * Allows only files with the extension and directories.
-         * 
+         *
          * @see java.io.FilenameFilter#accept(File, String)
          */
         @Override
@@ -800,7 +800,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * Returns the file filter used to limit the files in this container.
-     * 
+     *
      * @return Used filter instance or null if no filter is assigned.
      */
     public FilenameFilter getFilter() {
@@ -809,7 +809,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * Sets the file filter used to limit the files in this container.
-     * 
+     *
      * @param filter
      *            The filter to set. <code>null</code> disables filtering.
      */
@@ -819,7 +819,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * Sets the file filter used to limit the files in this container.
-     * 
+     *
      * @param extension
      *            the Filename extension (w/o separator) to limit the files in
      *            container.
@@ -830,7 +830,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /**
      * Is this container recursive filesystem.
-     * 
+     *
      * @return <code>true</code> if container is recursive, <code>false</code>
      *         otherwise.
      */
@@ -844,7 +844,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * <p>
      * Note : This is meaningful only if the root really is a directory.
      * </p>
-     * 
+     *
      * @param recursive
      *            the New value for recursive property.
      */
@@ -854,7 +854,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
@@ -867,7 +867,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#addItem()
      */
     @Override
@@ -878,7 +878,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     @Override
@@ -889,7 +889,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeAllItems()
      */
     @Override
@@ -900,7 +900,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     @Override
@@ -912,7 +912,7 @@ public class FilesystemContainer implements Container.Hierarchical {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object )
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
index 13416cb472..3dae54ff27 100644
--- a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.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
@@ -38,24 +38,24 @@ import com.vaadin.shared.data.sort.SortDirection;
  * Container wrapper that adds support for generated properties. This container
  * only supports adding new generated properties. Adding new normal properties
  * should be done for the wrapped container.
- * 
+ *
  * <p>
  * Removing properties from this container does not remove anything from the
  * wrapped container but instead only hides them from the results. These
  * properties can be returned to this container by calling
  * {@link #addContainerProperty(Object, Class, Object)} with same property id
  * which was removed.
- * 
+ *
  * <p>
  * If wrapped container is Filterable and/or Sortable it should only be handled
  * through this container as generated properties need to be handled in a
  * specific way when sorting/filtering.
- * 
+ *
  * <p>
  * Items returned by this container do not support adding or removing
  * properties. Generated properties are always read-only. Trying to make them
  * editable throws an exception.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -171,7 +171,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
         /**
          * Tests if the given object is the same as the this object. Two Items
          * from the same container with the same ID are equal.
-         * 
+         *
          * @param obj
          *            an object to compare with this object
          * @return <code>true</code> if the given object is the same as this
@@ -203,7 +203,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
 
         /**
          * Returns the wrapped Item that belongs to the wrapped container
-         * 
+         *
          * @return wrapped item.
          * @since 7.6.8
          */
@@ -279,7 +279,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
 
     /**
      * Constructor for GeneratedPropertyContainer.
-     * 
+     *
      * @param container
      *            underlying indexed container
      */
@@ -342,7 +342,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
      * Add a new PropertyValueGenerator with given property id. This will
      * override any existing properties with the same property id. Fires a
      * PropertySetChangeEvent.
-     * 
+     *
      * @param propertyId
      *            property id
      * @param generator
@@ -357,7 +357,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
     /**
      * Removes any possible PropertyValueGenerator with given property id. Fires
      * a PropertySetChangeEvent.
-     * 
+     *
      * @param propertyId
      *            property id
      */
@@ -767,7 +767,7 @@ public class GeneratedPropertyContainer extends AbstractContainer
 
     /**
      * Returns the original underlying container.
-     * 
+     *
      * @return the original underlying container
      */
     public Container.Indexed getWrappedContainer() {
diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
index 3dd92db3b6..0615f41b2b 100644
--- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.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
@@ -32,7 +32,7 @@ import com.vaadin.data.Item;
 /**
  * A specialized Container whose contents can be accessed like it was a
  * tree-like structure.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -83,7 +83,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /**
      * Counts how many nested contents change disable calls are in progress.
-     * 
+     *
      * Pending events are only fired when the counter reaches zero again.
      */
     private int contentChangedEventsDisabledCount = 0;
@@ -196,7 +196,7 @@ public class HierarchicalContainer extends IndexedContainer
      * {@link #setParent(Object itemId, Object newParentId)} or
      * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
-     * 
+     *
      * @param itemId
      *            the ID of the Item in the container whose child capability is
      *            to be set.
@@ -231,7 +231,7 @@ public class HierarchicalContainer extends IndexedContainer
      * also possible to detach a node from the hierarchy (and thus make it root)
      * by setting the parent <code>null</code>.
      * </p>
-     * 
+     *
      * @param itemId
      *            the ID of the item to be set as the child of the Item
      *            identified with newParentId.
@@ -361,7 +361,7 @@ public class HierarchicalContainer extends IndexedContainer
     /**
      * Moves a node (an Item) in the container immediately after a sibling node.
      * The two nodes must have the same parent in the container.
-     * 
+     *
      * @param itemId
      *            the identifier of the moved node (Item)
      * @param siblingId
@@ -403,7 +403,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#addItem()
      */
     @Override
@@ -465,7 +465,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#addItem(java.lang.Object)
      */
     @Override
@@ -492,7 +492,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#removeAllItems()
      */
     @Override
@@ -524,7 +524,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#removeItem(java.lang.Object )
      */
     @Override
@@ -599,7 +599,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /**
      * Removes the Item identified by given itemId and all its children.
-     * 
+     *
      * @see #removeItem(Object)
      * @param itemId
      *            the identifier of the Item to be removed
@@ -618,7 +618,7 @@ public class HierarchicalContainer extends IndexedContainer
     /**
      * Removes the Item identified by given itemId and all its children from the
      * given Container.
-     * 
+     *
      * @param container
      *            the container where the item is to be removed
      * @param itemId
@@ -649,7 +649,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#doSort()
      */
     @Override
@@ -665,7 +665,7 @@ public class HierarchicalContainer extends IndexedContainer
     /**
      * Used to control how filtering works. @see
      * {@link #setIncludeParentsWhenFiltering(boolean)} for more information.
-     * 
+     *
      * @return true if all parents for items that match the filter are included
      *         when filtering, false if only the matching items are included
      */
@@ -679,7 +679,7 @@ public class HierarchicalContainer extends IndexedContainer
      * items themselves. Setting this to false causes the filtering to only
      * include the matching items and make items with excluded parents into root
      * items.
-     * 
+     *
      * @param includeParentsWhenFiltering
      *            true to include all parents for items that match the filter,
      *            false to only include the matching items
@@ -695,9 +695,9 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * Overridden to provide filtering for root & children items.
-     * 
+     *
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.IndexedContainer#updateContainerFiltering()
      */
     @Override
@@ -765,7 +765,7 @@ public class HierarchicalContainer extends IndexedContainer
     /**
      * Adds the given childItemId as a filteredChildren for the parentItemId and
      * sets it filteredParent.
-     * 
+     *
      * @param parentItemId
      * @param childItemId
      */
@@ -786,7 +786,7 @@ public class HierarchicalContainer extends IndexedContainer
      * filteredChildren map in the same order as they are in the children map.
      * Starts from parentItemId and recurses down as long as child items that
      * should be included are found.
-     * 
+     *
      * @param parentItemId
      *            The item id to start recurse from. Not added to a
      *            filteredChildren list
@@ -814,7 +814,7 @@ public class HierarchicalContainer extends IndexedContainer
      * when filtering. All items which passes the filters are included.
      * Additionally all items that have a child node that should be included are
      * also themselves included.
-     * 
+     *
      * @param itemId
      * @param includedItems
      * @return true if the itemId should be included in the filtered container.
@@ -841,7 +841,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.IndexedContainer#passesFilters(java.lang.Object)
      */
diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
index 6cfb38087c..d02c7e49c4 100644
--- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.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
@@ -23,7 +23,7 @@ import com.vaadin.data.Container.Hierarchical;
  * A wrapper class for adding external ordering to containers not implementing
  * the {@link com.vaadin.data.Container.Ordered} interface while retaining
  * {@link Hierarchical} features.
- * 
+ *
  * @see ContainerOrderedWrapper
  */
 @SuppressWarnings({ "serial" })
diff --git a/server/src/main/java/com/vaadin/data/util/ItemSorter.java b/server/src/main/java/com/vaadin/data/util/ItemSorter.java
index 0bbc2d324f..b3a1b63417 100644
--- a/server/src/main/java/com/vaadin/data/util/ItemSorter.java
+++ b/server/src/main/java/com/vaadin/data/util/ItemSorter.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
@@ -33,7 +33,7 @@ public interface ItemSorter
      * Sets the parameters for an upcoming sort operation. The parameters
      * determine what container to sort and how the <code>ItemSorter</code>
      * sorts the container.
-     * 
+     *
      * @param container
      *            The container that will be sorted. The container must contain
      *            the propertyIds given in the <code>propertyId</code>
@@ -61,7 +61,7 @@ public interface ItemSorter
      * The parameters for the <code>ItemSorter</code> <code>compare()</code>
      * method must always be item ids which exist in the container set using
      * {@link #setSortProperties(Sortable, Object[], boolean[])}.
-     * 
+     *
      * @see Comparator#compare(Object, Object)
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/ListSet.java b/server/src/main/java/com/vaadin/data/util/ListSet.java
index ccc9e0dbfd..b03a0422f3 100644
--- a/server/src/main/java/com/vaadin/data/util/ListSet.java
+++ b/server/src/main/java/com/vaadin/data/util/ListSet.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
@@ -29,7 +29,7 @@ import java.util.Iterator;
  * specified by {@link #equals(Object)}). The {@link #set(int, Object)} method
  * allows duplicates because of the way {@link Collections#sort(java.util.List)}
  * works.
- * 
+ *
  * This class is subject to change and should not be used outside Vaadin core.
  */
 public class ListSet<E> extends ArrayList<E> {
@@ -220,7 +220,7 @@ public class ListSet<E> extends ArrayList<E> {
 
     /**
      * Removes "e" from the set if it no longer exists in the list.
-     * 
+     *
      * @param e
      */
     private void removeFromSet(E e) {
@@ -245,7 +245,7 @@ public class ListSet<E> extends ArrayList<E> {
     /**
      * Marks the "element" can be found more than once from the list. Allowed in
      * {@link #set(int, Object)} to make sorting work.
-     * 
+     *
      * @param element
      */
     private void addDuplicate(E element) {
diff --git a/server/src/main/java/com/vaadin/data/util/MethodProperty.java b/server/src/main/java/com/vaadin/data/util/MethodProperty.java
index 5f6c970a2f..70ee735d96 100644
--- a/server/src/main/java/com/vaadin/data/util/MethodProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/MethodProperty.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
@@ -36,26 +36,26 @@ import com.vaadin.util.SerializerHelper;
  * attached to a field of an object. Accessing the object through the Property
  * interface directly manipulates the underlying field.
  * </p>
- * 
+ *
  * <p>
  * It's assumed that the return value returned by the getter method is
  * assignable to the type of the property, and the setter method parameter is
  * assignable to that value.
  * </p>
- * 
+ *
  * <p>
  * A valid getter method must always be available, but instance of this class
  * can be constructed with a <code>null</code> setter method in which case the
  * resulting MethodProperty is read-only.
  * </p>
- * 
+ *
  * <p>
  * MethodProperty implements Property.ValueChangeNotifier, but does not
  * automatically know whether or not the getter method will actually return a
  * new value - value change listeners are always notified when setValue is
  * called, without verifying what the getter returns.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -166,19 +166,19 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * constructor will be called with no arguments, and the setter method with
      * only the new value as the sole argument.
      * </p>
-     * 
+     *
      * <p>
      * If the setter method is unavailable, the resulting
      * <code>MethodProperty</code> will be read-only, otherwise it will be
      * read-write.
      * </p>
-     * 
+     *
      * <p>
      * Method names are constructed from the bean property by adding
      * get/is/are/set prefix and capitalising the first character in the name of
      * the given bean property.
      * </p>
-     * 
+     *
      * @param instance
      *            the object that includes the property.
      * @param beanPropertyName
@@ -236,13 +236,13 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * instantiated with this constructor will be called with no arguments, and
      * the setter method with only the new value as the sole argument.
      * </p>
-     * 
+     *
      * <p>
      * If the setter method is <code>null</code>, the resulting
      * <code>MethodProperty</code> will be read-only, otherwise it will be
      * read-write.
      * </p>
-     * 
+     *
      * @param type
      *            the type of the property.
      * @param instance
@@ -251,7 +251,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      *            the name of the getter method.
      * @param setMethodName
      *            the name of the setter method.
-     * 
+     *
      */
     public MethodProperty(Class<? extends T> type, Object instance,
             String getMethodName, String setMethodName) {
@@ -266,13 +266,13 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * instantiated with this constructor will be called with no arguments, and
      * the setter method with only the new value as the sole argument.
      * </p>
-     * 
+     *
      * <p>
      * If the setter method is <code>null</code>, the resulting
      * <code>MethodProperty</code> will be read-only, otherwise it will be
      * read-write.
      * </p>
-     * 
+     *
      * @param type
      *            the type of the property.
      * @param instance
@@ -298,7 +298,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * setArgumentIndex will be replaced with the argument passed to the
      * {@link #setValue(Object newValue)} method.
      * </p>
-     * 
+     *
      * <p>
      * For example, if the <code>setArgs</code> contains <code>A</code>,
      * <code>B</code> and <code>C</code>, and <code>setArgumentIndex =
@@ -306,7 +306,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * in the setter method to be called with the parameter set of
      * <code>{A, X, C}</code>
      * </p>
-     * 
+     *
      * @param type
      *            the type of the property.
      * @param instance
@@ -468,7 +468,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * except that instead of names of the getter and setter methods this
      * constructor is given the actual methods themselves.
      * </p>
-     * 
+     *
      * @param type
      *            the type of the property.
      * @param instance
@@ -522,7 +522,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
     /**
      * Find a getter method for a property (getXyz(), isXyz() or areXyz()).
-     * 
+     *
      * @param propertyName
      *            name of the property
      * @param beanClass
@@ -557,7 +557,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * to safely cast the value returned from <code>getValue</code> to the given
      * type and pass any variable assignable to this type as an argument to
      * <code>setValue</code>.
-     * 
+     *
      * @return type of the Property
      */
     @Override
@@ -569,7 +569,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * Tests if the object is in read-only mode. In read-only mode calls to
      * <code>setValue</code> will throw <code>ReadOnlyException</code> and will
      * not modify the value of the Property.
-     * 
+     *
      * @return <code>true</code> if the object is in read-only mode,
      *         <code>false</code> if it's not
      */
@@ -581,7 +581,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
     /**
      * Gets the value stored in the Property. The value is resolved by calling
      * the specified getter method with the argument specified at instantiation.
-     * 
+     *
      * @return the value of the Property
      */
     @Override
@@ -601,7 +601,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * <p>
      * Sets the setter method and getter method argument lists.
      * </p>
-     * 
+     *
      * @param getArgs
      *            the fixed argument list to be passed to the getter method.
      * @param setArgs
@@ -628,10 +628,10 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
     /**
      * Sets the value of the property.
-     * 
+     *
      * Note that since Vaadin 7, no conversions are performed and the value must
      * be of the correct type.
-     * 
+     *
      * @param newValue
      *            the New value of the property.
      * @throws <code>Property.ReadOnlyException</code>
@@ -653,7 +653,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
     /**
      * Internal method to actually call the setter method of the wrapped
      * property.
-     * 
+     *
      * @param value
      */
     protected void invokeSetMethod(T value) {
@@ -683,7 +683,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
      * <code>Exception</code> object that signals that there were problems
      * calling or finding the specified getter or setter methods of the
      * property.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -704,7 +704,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
         /**
          * Constructs a new <code>MethodException</code> with the specified
          * detail message.
-         * 
+         *
          * @param property
          *            the property.
          * @param msg
@@ -717,7 +717,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
         /**
          * Constructs a new <code>MethodException</code> from another exception.
-         * 
+         *
          * @param property
          *            the property.
          * @param cause
@@ -738,7 +738,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
         /**
          * Gets the method property this exception originates from.
-         * 
+         *
          * @return MethodProperty or null if not a valid MethodProperty
          */
         public MethodProperty getMethodProperty() {
@@ -748,7 +748,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
         /**
          * Gets the method property this exception originates from.
-         * 
+         *
          * @return Property from which the exception originates
          */
         public Property getProperty() {
@@ -758,7 +758,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
 
     /**
      * Sends a value change event to all registered listeners.
-     * 
+     *
      * Public for backwards compatibility, visibility may be reduced in future
      * versions.
      */
diff --git a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java
index b1f4d531c1..8c5c028a86 100644
--- a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.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
@@ -27,10 +27,10 @@ import com.vaadin.util.SerializerHelper;
 /**
  * Property descriptor that is able to create simple {@link MethodProperty}
  * instances for a bean, using given accessors.
- * 
+ *
  * @param <BT>
  *            bean type
- * 
+ *
  * @since 6.6
  */
 public class MethodPropertyDescriptor<BT>
@@ -44,7 +44,7 @@ public class MethodPropertyDescriptor<BT>
     /**
      * Creates a property descriptor that can create MethodProperty instances to
      * access the underlying bean property.
-     * 
+     *
      * @param name
      *            of the property
      * @param propertyType
diff --git a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java
index 7790b8ab45..0b39efef5c 100644
--- a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.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
@@ -30,16 +30,16 @@ import com.vaadin.shared.util.SharedUtil;
 
 /**
  * Nested accessor based property for a bean.
- * 
+ *
  * The property is specified in the dotted notation, e.g. "address.street", and
  * can contain multiple levels of nesting.
- * 
+ *
  * When accessing the property value, all intermediate getters must exist and
  * should return non-null values when the property value is accessed. If an
  * intermediate getter returns null, a null value will be returned.
- * 
+ *
  * @see MethodProperty
- * 
+ *
  * @since 6.6
  */
 public class NestedMethodProperty<T> extends AbstractProperty<T> {
@@ -83,7 +83,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
      * e.g. "manager.address.street".
      * <p>
      * Calling getValue will return null if any intermediate getter returns null
-     * 
+     *
      * @param instance
      *            top-level bean to which the property applies
      * @param propertyName
@@ -100,7 +100,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
      * For internal use to deduce property type etc. without a bean instance.
      * Calling {@link #setValue(Object)} or {@link #getValue()} on properties
      * constructed this way is not supported.
-     * 
+     *
      * @param instanceClass
      *            class of the top-level bean
      * @param propertyName
@@ -113,7 +113,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     /**
      * Initializes most of the internal fields based on the top-level bean
      * instance and property name (dot-separated string).
-     * 
+     *
      * @param beanClass
      *            class of the top-level bean to which the property applies
      * @param propertyName
@@ -193,7 +193,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     /**
      * Gets the value stored in the Property. The value is resolved by calling
      * the specified getter method with the argument specified at instantiation.
-     * 
+     *
      * @return the value of the Property
      */
     @Override
@@ -215,7 +215,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     /**
      * Sets the value of the property. The new value must be assignable to the
      * type of this property.
-     * 
+     *
      * @param newValue
      *            the New value of the property.
      * @throws <code>Property.ReadOnlyException</code>
@@ -236,7 +236,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     /**
      * Internal method to actually call the setter method of the wrapped
      * property.
-     * 
+     *
      * @param value
      */
     protected void invokeSetMethod(T value) {
@@ -256,9 +256,9 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     /**
      * Returns an unmodifiable list of getter methods to call in sequence to get
      * the property value.
-     * 
+     *
      * This API may change in future versions.
-     * 
+     *
      * @return unmodifiable list of getter methods corresponding to each segment
      *         of the property name
      */
diff --git a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java
index 84704568cd..cbe38a922d 100644
--- a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.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
@@ -20,13 +20,13 @@ import com.vaadin.data.Property;
 /**
  * Property descriptor that is able to create nested property instances for a
  * bean.
- * 
+ *
  * The property is specified in the dotted notation, e.g. "address.street", and
  * can contain multiple levels of nesting.
- * 
+ *
  * @param <BT>
  *            bean type
- * 
+ *
  * @since 6.6
  */
 public class NestedPropertyDescriptor<BT>
@@ -38,7 +38,7 @@ public class NestedPropertyDescriptor<BT>
     /**
      * Creates a property descriptor that can create MethodProperty instances to
      * access the underlying bean property.
-     * 
+     *
      * @param name
      *            of the property in a dotted path format, e.g. "address.street"
      * @param beanType
diff --git a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java
index 595bfd51e4..2a87956a97 100644
--- a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/ObjectProperty.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
@@ -22,7 +22,7 @@ import com.vaadin.data.Property;
  * A simple data object containing one typed value. This class is a
  * straightforward implementation of the the {@link com.vaadin.data.Property}
  * interface.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -43,7 +43,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
      * Creates a new instance of ObjectProperty with the given value. The type
      * of the property is automatically initialized to be the type of the given
      * value.
-     * 
+     *
      * @param value
      *            the Initial value of the Property.
      */
@@ -55,10 +55,10 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
 
     /**
      * Creates a new instance of ObjectProperty with the given value and type.
-     * 
+     *
      * Since Vaadin 7, only values of the correct type are accepted, and no
      * automatic conversions are performed.
-     * 
+     *
      * @param value
      *            the Initial value of the Property.
      * @param type
@@ -75,10 +75,10 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
     /**
      * Creates a new instance of ObjectProperty with the given value, type and
      * read-only mode status.
-     * 
+     *
      * Since Vaadin 7, only the correct type of values is accepted, see
      * {@link #ObjectProperty(Object, Class)}.
-     * 
+     *
      * @param value
      *            the Initial value of the property.
      * @param type
@@ -98,7 +98,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
      * able to safely cast the value returned from <code>getValue</code> to the
      * given type and pass any variable assignable to this type as an argument
      * to <code>setValue</code>.
-     * 
+     *
      * @return type of the Property
      */
     @Override
@@ -108,7 +108,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
 
     /**
      * Gets the value stored in the Property.
-     * 
+     *
      * @return the value stored in the Property
      */
     @Override
@@ -118,10 +118,10 @@ public class ObjectProperty<T> extends AbstractProperty<T> {
 
     /**
      * Sets the value of the property.
-     * 
+     *
      * Note that since Vaadin 7, no conversions are performed and the value must
      * be of the correct type.
-     * 
+     *
      * @param newValue
      *            the New value of the property.
      * @throws <code>Property.ReadOnlyException</code>
diff --git a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java
index b3df70534b..622cb65c72 100644
--- a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.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
@@ -20,13 +20,13 @@ import com.vaadin.legacy.data.util.converter.LegacyConverter;
 
 /**
  * Formatting proxy for a {@link Property}.
- * 
+ *
  * <p>
  * This class can be used to implement formatting for any type of Property
  * datasources. The idea is to connect this as proxy between UI component and
  * the original datasource.
  * </p>
- * 
+ *
  * <p>
  * For example <code>
  * <pre>textfield.setPropertyDataSource(new PropertyFormatter(property) {
@@ -41,11 +41,11 @@ import com.vaadin.legacy.data.util.converter.LegacyConverter;
         });</pre></code> adds formatter for Double-typed property that extends
  * standard "1.0" notation with more zeroes.
  * </p>
- * 
+ *
  * @param T
  *            type of the underlying property (a PropertyFormatter is always a
  *            Property&lt;String&gt;)
- * 
+ *
  * @deprecated As of 7.0, replaced by {@link LegacyConverter}
  * @author Vaadin Ltd.
  * @since 5.3.0
@@ -63,7 +63,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
      * Construct a new {@code PropertyFormatter} that is not connected to any
      * data source. Call {@link #setPropertyDataSource(Property)} later on to
      * attach it to a property.
-     * 
+     *
      */
     protected PropertyFormatter() {
     }
@@ -72,7 +72,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
      * Construct a new formatter that is connected to given data source. Calls
      * {@link #format(Object)} which can be a problem if the formatter has not
      * yet been initialized.
-     * 
+     *
      * @param propertyDataSource
      *            to connect this property to.
      */
@@ -83,7 +83,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Gets the current data source of the formatter, if any.
-     * 
+     *
      * @return the current data source as a Property, or <code>null</code> if
      *         none defined.
      */
@@ -94,13 +94,13 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Sets the specified Property as the data source for the formatter.
-     * 
-     * 
+     *
+     *
      * <p>
      * Remember that new data sources getValue() must return objects that are
      * compatible with parse() and format() methods.
      * </p>
-     * 
+     *
      * @param newDataSource
      *            the new data source Property.
      */
@@ -153,7 +153,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Get the formatted value.
-     * 
+     *
      * @return If the datasource returns null, this is null. Otherwise this is
      *         String given by format().
      */
@@ -175,7 +175,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
     /**
      * This method must be implemented to format the values received from
      * DataSource.
-     * 
+     *
      * @param value
      *            Value object got from the datasource. This is guaranteed to be
      *            non-null and of the type compatible with getType() of the
@@ -186,9 +186,9 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Parse string and convert it to format compatible with datasource.
-     * 
+     *
      * The method is required to assure that parse(format(x)) equals x.
-     * 
+     *
      * @param formattedValue
      *            This is guaranteed to be non-null string.
      * @return Non-null value compatible with datasource.
@@ -200,7 +200,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Sets the Property's read-only mode to the specified status.
-     * 
+     *
      * @param newStatus
      *            the new read-only status of the Property.
      */
@@ -235,7 +235,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Listens for changes in the datasource.
-     * 
+     *
      * This should not be called directly.
      */
     @Override
@@ -245,7 +245,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String>
 
     /**
      * Listens for changes in the datasource.
-     * 
+     *
      * This should not be called directly.
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java
index b9f3416c39..e4b678d9a7 100644
--- a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.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
@@ -25,7 +25,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
 
 /**
  * PropertyValueGenerator for GeneratedPropertyContainer.
- * 
+ *
  * @param <T>
  *            Property data type
  * @since 7.4
@@ -36,7 +36,7 @@ public abstract class PropertyValueGenerator<T> implements Serializable {
     /**
      * Returns value for given Item. Used by GeneratedPropertyContainer when
      * generating new properties.
-     * 
+     *
      * @param item
      *            currently handled item
      * @param itemId
@@ -50,7 +50,7 @@ public abstract class PropertyValueGenerator<T> implements Serializable {
     /**
      * Return Property type for this generator. This function is called when
      * {@link Property#getType()} is called for generated property.
-     * 
+     *
      * @return type of generated property
      */
     public abstract Class<T> getType();
@@ -66,9 +66,9 @@ public abstract class PropertyValueGenerator<T> implements Serializable {
      * means that the property will not be included in
      * getSortableContainerPropertyIds(). Attempting to sort by that column
      * throws UnsupportedOperationException.
-     * 
+     *
      * Returning null is not allowed.
-     * 
+     *
      * @param order
      *            a sort order for this property
      * @return an array of sort orders describing how this property is sorted
@@ -86,7 +86,7 @@ public abstract class PropertyValueGenerator<T> implements Serializable {
      * GeneratedPropertyContainer to discard the filter and not use it.
      * <p>
      * By default this function throws UnsupportedFilterException.
-     * 
+     *
      * @param filter
      *            original filter for this property
      * @return modified filter that is compatible with the underlying container
diff --git a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java
index 5a5b7a383f..92b6f5eccd 100644
--- a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertysetItem.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,7 +31,7 @@ import com.vaadin.data.Property;
  * a </code>MapItem</code> can be referenced using locally unique identifiers.
  * The class supports listeners who are interested in changes to the Property
  * set managed by the class.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -62,7 +62,7 @@ public class PropertysetItem
      * Gets the Property corresponding to the given Property ID stored in the
      * Item. If the Item does not contain the Property, <code>null</code> is
      * returned.
-     * 
+     *
      * @param id
      *            the identifier of the Property to get.
      * @return the Property with the given ID or <code>null</code>
@@ -74,7 +74,7 @@ public class PropertysetItem
 
     /**
      * Gets the collection of IDs of all Properties stored in the Item.
-     * 
+     *
      * @return unmodifiable collection containing IDs of the Properties stored
      *         the Item
      */
@@ -89,7 +89,7 @@ public class PropertysetItem
      * Removes the Property identified by ID from the Item. This functionality
      * is optional. If the method is not implemented, the method always returns
      * <code>false</code>.
-     * 
+     *
      * @param id
      *            the ID of the Property to be removed.
      * @return <code>true</code> if the operation succeeded <code>false</code>
@@ -112,7 +112,7 @@ public class PropertysetItem
 
     /**
      * Tries to add a new Property into the Item.
-     * 
+     *
      * @param id
      *            the ID of the new Property.
      * @param property
@@ -148,7 +148,7 @@ public class PropertysetItem
      * The format of the string is a space separated catenation of the
      * <code>String</code> representations of the Properties contained by the
      * Item.
-     * 
+     *
      * @return <code>String</code> representation of the Item contents
      */
     @Override
@@ -172,7 +172,7 @@ public class PropertysetItem
     /**
      * An <code>event</code> object specifying an Item whose Property set has
      * changed.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -185,7 +185,7 @@ public class PropertysetItem
 
         /**
          * Gets the Item whose Property set has changed.
-         * 
+         *
          * @return source object of the event as an <code>Item</code>
          */
         @Override
@@ -196,7 +196,7 @@ public class PropertysetItem
 
     /**
      * Registers a new property set change listener for this Item.
-     * 
+     *
      * @param listener
      *            the new Listener to be registered.
      */
@@ -221,7 +221,7 @@ public class PropertysetItem
 
     /**
      * Removes a previously registered property set change listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -285,11 +285,11 @@ public class PropertysetItem
      * the fields are not themselves cloned. Thus, this method performs a
      * "shallow copy" of this object, not a "deep copy" operation.
      * </p>
-     * 
+     *
      * @throws CloneNotSupportedException
      *             if the object's class does not support the Cloneable
      *             interface.
-     * 
+     *
      * @see java.lang.Object#clone()
      */
     @Override
@@ -309,7 +309,7 @@ public class PropertysetItem
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
@@ -359,7 +359,7 @@ public class PropertysetItem
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#hashCode()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java b/server/src/main/java/com/vaadin/data/util/TextFileProperty.java
index c33b220fe3..1ce1262350 100644
--- a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/TextFileProperty.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
@@ -29,13 +29,13 @@ import java.nio.charset.Charset;
 
 /**
  * Property implementation for wrapping a text file.
- * 
+ *
  * Supports reading and writing of a File from/to String.
- * 
+ *
  * {@link ValueChangeListener}s are supported, but only fire when
  * setValue(Object) is explicitly called. {@link ReadOnlyStatusChangeListener}s
  * are supported but only fire when setReadOnly(boolean) is explicitly called.
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class TextFileProperty extends AbstractProperty<String> {
@@ -45,9 +45,9 @@ public class TextFileProperty extends AbstractProperty<String> {
 
     /**
      * Wrap given file with property interface.
-     * 
+     *
      * Setting the file to null works, but getValue() will return null.
-     * 
+     *
      * @param file
      *            File to be wrapped.
      */
@@ -58,9 +58,9 @@ public class TextFileProperty extends AbstractProperty<String> {
     /**
      * Wrap the given file with the property interface and specify character
      * set.
-     * 
+     *
      * Setting the file to null works, but getValue() will return null.
-     * 
+     *
      * @param file
      *            File to be wrapped.
      * @param charset
@@ -73,7 +73,7 @@ public class TextFileProperty extends AbstractProperty<String> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Property#getType()
      */
     @Override
@@ -83,7 +83,7 @@ public class TextFileProperty extends AbstractProperty<String> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Property#getValue()
      */
     @Override
@@ -115,7 +115,7 @@ public class TextFileProperty extends AbstractProperty<String> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Property#isReadOnly()
      */
     @Override
@@ -125,7 +125,7 @@ public class TextFileProperty extends AbstractProperty<String> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Property#setValue(java.lang.Object)
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java
index c3cef6a0ec..dbfbee5e12 100644
--- a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.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
@@ -22,23 +22,23 @@ import com.vaadin.data.Property.ValueChangeNotifier;
 /**
  * Wrapper class that helps implement two-phase commit for a non-transactional
  * property.
- * 
+ *
  * When accessing the property through the wrapper, getting and setting the
  * property value take place immediately. However, the wrapper keeps track of
  * the old value of the property so that it can be set for the property in case
  * of a roll-back. This can result in the underlying property value changing
  * multiple times (first based on modifications made by the application, then
  * back upon roll-back).
- * 
+ *
  * Value change events on the {@link TransactionalPropertyWrapper} are only
  * fired at the end of a successful transaction, whereas listeners attached to
  * the underlying property may receive multiple value change events.
- * 
+ *
  * @see com.vaadin.data.Property.Transactional
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
- * 
+ *
  * @param <T>
  */
 public class TransactionalPropertyWrapper<T> extends AbstractProperty<T>
@@ -67,7 +67,7 @@ public class TransactionalPropertyWrapper<T> extends AbstractProperty<T>
     /**
      * Removes the ValueChangeListener from wrapped Property that was added by
      * TransactionalPropertyWrapper.
-     * 
+     *
      * @since 7.1.15
      */
     public void detachFromProperty() {
diff --git a/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java
index 51084d9115..e5f1a474eb 100644
--- a/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.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
@@ -21,33 +21,33 @@ import com.vaadin.data.Property;
 
 /**
  * Property descriptor that can create a property instance for a bean.
- * 
+ *
  * Used by {@link BeanItem} and {@link AbstractBeanContainer} to keep track of
  * the set of properties of items.
- * 
+ *
  * @param <BT>
  *            bean type
- * 
+ *
  * @since 6.6
  */
 public interface VaadinPropertyDescriptor<BT> extends Serializable {
     /**
      * Returns the name of the property.
-     * 
+     *
      * @return
      */
     public String getName();
 
     /**
      * Returns the type of the property.
-     * 
+     *
      * @return Class<?>
      */
     public Class<?> getPropertyType();
 
     /**
      * Creates a new {@link Property} instance for this property for a bean.
-     * 
+     *
      * @param bean
      * @return
      */
diff --git a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java
index 8403f2dc74..9c43a3853d 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.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
@@ -23,10 +23,10 @@ import com.vaadin.data.Container.Filter;
 
 /**
  * Abstract base class for filters that are composed of multiple sub-filters.
- * 
+ *
  * The method {@link #appliesToProperty(Object)} is provided to help
  * implementing {@link Filter} for in-memory filters.
- * 
+ *
  * @since 6.6
  */
 public abstract class AbstractJunctionFilter implements Filter {
@@ -41,7 +41,7 @@ public abstract class AbstractJunctionFilter implements Filter {
     /**
      * Returns an unmodifiable collection of the sub-filters of this composite
      * filter.
-     * 
+     *
      * @return
      */
     public Collection<Filter> getFilters() {
@@ -52,7 +52,7 @@ public abstract class AbstractJunctionFilter implements Filter {
      * Returns true if a change in the named property may affect the filtering
      * result. If some of the sub-filters are not in-memory filters, true is
      * returned.
-     * 
+     *
      * By default, all sub-filters are iterated to check if any of them applies.
      * If there are no sub-filters, false is returned - override in subclasses
      * to change this behavior.
diff --git a/server/src/main/java/com/vaadin/data/util/filter/And.java b/server/src/main/java/com/vaadin/data/util/filter/And.java
index 938aedae95..86202db393 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/And.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/And.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
@@ -21,20 +21,20 @@ import com.vaadin.data.Item;
 /**
  * A compound {@link Filter} that accepts an item if all of its filters accept
  * the item.
- * 
+ *
  * If no filters are given, the filter should accept all items.
- * 
+ *
  * This filter also directly supports in-memory filtering when all sub-filters
  * do so.
- * 
+ *
  * @see Or
- * 
+ *
  * @since 6.6
  */
 public final class And extends AbstractJunctionFilter {
 
     /**
-     * 
+     *
      * @param filters
      *            filters of which the And filter will be composed
      */
diff --git a/server/src/main/java/com/vaadin/data/util/filter/Between.java b/server/src/main/java/com/vaadin/data/util/filter/Between.java
index c50488c521..2874026cb7 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/Between.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Between.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/server/src/main/java/com/vaadin/data/util/filter/Compare.java b/server/src/main/java/com/vaadin/data/util/filter/Compare.java
index 3a06ef64df..baab7fb2b8 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/Compare.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Compare.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,13 +24,13 @@ import com.vaadin.data.Property;
  * constant value. Use the nested classes {@link Equal}, {@link Greater},
  * {@link Less}, {@link GreaterOrEqual} and {@link LessOrEqual} instead of this
  * class directly.
- * 
+ *
  * This filter also directly supports in-memory filtering.
- * 
+ *
  * The reference and actual values must implement {@link Comparable} and the
  * class of the actual property value must be assignable from the class of the
  * reference value.
- * 
+ *
  * @since 6.6
  */
 public abstract class Compare implements Filter {
@@ -46,23 +46,23 @@ public abstract class Compare implements Filter {
     /**
      * A {@link Compare} filter that accepts items for which the identified
      * property value is equal to <code>value</code>.
-     * 
+     *
      * For in-memory filters, {@link Comparable#compareTo(Object)} or, if not
      * Comparable, {@link #equals(Object)} is used for the comparison. For other
      * containers, the comparison implementation is container dependent and may
      * use e.g. database comparison operations.
-     * 
+     *
      * @since 6.6
      */
     public static final class Equal extends Compare {
         /**
          * Construct a filter that accepts items for which the identified
          * property value is equal to <code>value</code>.
-         * 
+         *
          * For in-memory filters, equals() is used for the comparison. For other
          * containers, the comparison implementation is container dependent and
          * may use e.g. database comparison operations.
-         * 
+         *
          * @param propertyId
          *            the identifier of the property whose value to compare
          *            against value, not null
@@ -78,24 +78,24 @@ public abstract class Compare implements Filter {
     /**
      * A {@link Compare} filter that accepts items for which the identified
      * property value is greater than <code>value</code>.
-     * 
+     *
      * For in-memory filters, the values must implement {@link Comparable} and
      * {@link Comparable#compareTo(Object)} is used for the comparison. For
      * other containers, the comparison implementation is container dependent
      * and may use e.g. database comparison operations.
-     * 
+     *
      * @since 6.6
      */
     public static final class Greater extends Compare {
         /**
          * Construct a filter that accepts items for which the identified
          * property value is greater than <code>value</code>.
-         * 
+         *
          * For in-memory filters, the values must implement {@link Comparable}
          * and {@link Comparable#compareTo(Object)} is used for the comparison.
          * For other containers, the comparison implementation is container
          * dependent and may use e.g. database comparison operations.
-         * 
+         *
          * @param propertyId
          *            the identifier of the property whose value to compare
          *            against value, not null
@@ -111,24 +111,24 @@ public abstract class Compare implements Filter {
     /**
      * A {@link Compare} filter that accepts items for which the identified
      * property value is less than <code>value</code>.
-     * 
+     *
      * For in-memory filters, the values must implement {@link Comparable} and
      * {@link Comparable#compareTo(Object)} is used for the comparison. For
      * other containers, the comparison implementation is container dependent
      * and may use e.g. database comparison operations.
-     * 
+     *
      * @since 6.6
      */
     public static final class Less extends Compare {
         /**
          * Construct a filter that accepts items for which the identified
          * property value is less than <code>value</code>.
-         * 
+         *
          * For in-memory filters, the values must implement {@link Comparable}
          * and {@link Comparable#compareTo(Object)} is used for the comparison.
          * For other containers, the comparison implementation is container
          * dependent and may use e.g. database comparison operations.
-         * 
+         *
          * @param propertyId
          *            the identifier of the property whose value to compare
          *            against value, not null
@@ -144,24 +144,24 @@ public abstract class Compare implements Filter {
     /**
      * A {@link Compare} filter that accepts items for which the identified
      * property value is greater than or equal to <code>value</code>.
-     * 
+     *
      * For in-memory filters, the values must implement {@link Comparable} and
      * {@link Comparable#compareTo(Object)} is used for the comparison. For
      * other containers, the comparison implementation is container dependent
      * and may use e.g. database comparison operations.
-     * 
+     *
      * @since 6.6
      */
     public static final class GreaterOrEqual extends Compare {
         /**
          * Construct a filter that accepts items for which the identified
          * property value is greater than or equal to <code>value</code>.
-         * 
+         *
          * For in-memory filters, the values must implement {@link Comparable}
          * and {@link Comparable#compareTo(Object)} is used for the comparison.
          * For other containers, the comparison implementation is container
          * dependent and may use e.g. database comparison operations.
-         * 
+         *
          * @param propertyId
          *            the identifier of the property whose value to compare
          *            against value, not null
@@ -177,24 +177,24 @@ public abstract class Compare implements Filter {
     /**
      * A {@link Compare} filter that accepts items for which the identified
      * property value is less than or equal to <code>value</code>.
-     * 
+     *
      * For in-memory filters, the values must implement {@link Comparable} and
      * {@link Comparable#compareTo(Object)} is used for the comparison. For
      * other containers, the comparison implementation is container dependent
      * and may use e.g. database comparison operations.
-     * 
+     *
      * @since 6.6
      */
     public static final class LessOrEqual extends Compare {
         /**
          * Construct a filter that accepts items for which the identified
          * property value is less than or equal to <code>value</code>.
-         * 
+         *
          * For in-memory filters, the values must implement {@link Comparable}
          * and {@link Comparable#compareTo(Object)} is used for the comparison.
          * For other containers, the comparison implementation is container
          * dependent and may use e.g. database comparison operations.
-         * 
+         *
          * @param propertyId
          *            the identifier of the property whose value to compare
          *            against value, not null
@@ -210,21 +210,21 @@ public abstract class Compare implements Filter {
     /**
      * Constructor for a {@link Compare} filter that compares the value of an
      * item property with the given constant <code>value</code>.
-     * 
+     *
      * This constructor is intended to be used by the nested static classes only
      * ({@link Equal}, {@link Greater}, {@link Less}, {@link GreaterOrEqual},
      * {@link LessOrEqual}).
-     * 
+     *
      * For in-memory filtering, comparisons except EQUAL require that the values
      * implement {@link Comparable} and {@link Comparable#compareTo(Object)} is
      * used for the comparison. The equality comparison is performed using
      * {@link Object#equals(Object)}.
-     * 
+     *
      * For other containers, the comparison implementation is container
      * dependent and may use e.g. database comparison operations. Therefore, the
      * behavior of comparisons might differ in some cases between in-memory and
      * other containers.
-     * 
+     *
      * @param propertyId
      *            the identifier of the property whose value to compare against
      *            value, not null
@@ -267,7 +267,7 @@ public abstract class Compare implements Filter {
      * Checks if the this value equals the given value. Favors Comparable over
      * equals to better support e.g. BigDecimal where equals is stricter than
      * compareTo.
-     * 
+     *
      * @param otherValue
      *            The value to compare to
      * @return true if the values are equal, false otherwise
@@ -343,7 +343,7 @@ public abstract class Compare implements Filter {
     /**
      * Returns the property id of the property to compare against the fixed
      * value.
-     * 
+     *
      * @return property id (not null)
      */
     public Object getPropertyId() {
@@ -352,7 +352,7 @@ public abstract class Compare implements Filter {
 
     /**
      * Returns the comparison operation.
-     * 
+     *
      * @return {@link Operation}
      */
     public Operation getOperation() {
@@ -361,7 +361,7 @@ public abstract class Compare implements Filter {
 
     /**
      * Returns the value to compare the property against.
-     * 
+     *
      * @return comparison reference value
      */
     public Object getValue() {
diff --git a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java b/server/src/main/java/com/vaadin/data/util/filter/IsNull.java
index cd89800ec4..39e15536c1 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/IsNull.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
@@ -21,9 +21,9 @@ import com.vaadin.data.Property;
 
 /**
  * Simple container filter checking whether an item property value is null.
- * 
+ *
  * This filter also directly supports in-memory filtering.
- * 
+ *
  * @since 6.6
  */
 public final class IsNull implements Filter {
@@ -33,11 +33,11 @@ public final class IsNull implements Filter {
     /**
      * Constructor for a filter that compares the value of an item property with
      * null.
-     * 
+     *
      * For in-memory filtering, a simple == check is performed. For other
      * containers, the comparison implementation is container dependent but
      * should correspond to the in-memory null check.
-     * 
+     *
      * @param propertyId
      *            the identifier (not null) of the property whose value to check
      */
@@ -86,7 +86,7 @@ public final class IsNull implements Filter {
     /**
      * Returns the property id of the property tested by the filter, not null
      * for valid filters.
-     * 
+     *
      * @return property id (not null)
      */
     public Object getPropertyId() {
diff --git a/server/src/main/java/com/vaadin/data/util/filter/Like.java b/server/src/main/java/com/vaadin/data/util/filter/Like.java
index ec771ea9ab..81bdf74e04 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/Like.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Like.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/server/src/main/java/com/vaadin/data/util/filter/Not.java b/server/src/main/java/com/vaadin/data/util/filter/Not.java
index a677e7f752..eba7a6c417 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/Not.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Not.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
@@ -20,10 +20,10 @@ import com.vaadin.data.Item;
 
 /**
  * Negating filter that accepts the items rejected by another filter.
- * 
+ *
  * This filter directly supports in-memory filtering when the negated filter
  * does so.
- * 
+ *
  * @since 6.6
  */
 public final class Not implements Filter {
@@ -31,7 +31,7 @@ public final class Not implements Filter {
 
     /**
      * Constructs a filter that negates a filter.
-     * 
+     *
      * @param filter
      *            {@link Filter} to negate, not-null
      */
@@ -41,7 +41,7 @@ public final class Not implements Filter {
 
     /**
      * Returns the negated filter.
-     * 
+     *
      * @return Filter
      */
     public Filter getFilter() {
@@ -58,7 +58,7 @@ public final class Not implements Filter {
      * Returns true if a change in the named property may affect the filtering
      * result. Return value is the same as {@link #appliesToProperty(Object)}
      * for the negated filter.
-     * 
+     *
      * @return boolean
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/data/util/filter/Or.java b/server/src/main/java/com/vaadin/data/util/filter/Or.java
index 69d20513a2..df5b89e991 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/Or.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Or.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
@@ -21,20 +21,20 @@ import com.vaadin.data.Item;
 /**
  * A compound {@link Filter} that accepts an item if any of its filters accept
  * the item.
- * 
+ *
  * If no filters are given, the filter should reject all items.
- * 
+ *
  * This filter also directly supports in-memory filtering when all sub-filters
  * do so.
- * 
+ *
  * @see And
- * 
+ *
  * @since 6.6
  */
 public final class Or extends AbstractJunctionFilter {
 
     /**
-     * 
+     *
      * @param filters
      *            filters of which the Or filter will be composed
      */
@@ -57,7 +57,7 @@ public final class Or extends AbstractJunctionFilter {
      * Returns true if a change in the named property may affect the filtering
      * result. If some of the sub-filters are not in-memory filters, true is
      * returned.
-     * 
+     *
      * By default, all sub-filters are iterated to check if any of them applies.
      * If there are no sub-filters, true is returned as an empty Or rejects all
      * items.
diff --git a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java
index 2ae51bbbfb..d7be64f9a6 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.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
@@ -22,17 +22,17 @@ import com.vaadin.data.Property;
 /**
  * Simple string filter for matching items that start with or contain a
  * specified string. The matching can be case-sensitive or case-insensitive.
- * 
+ *
  * This filter also directly supports in-memory filtering. When performing
  * in-memory filtering, values of other types are converted using toString(),
  * but other (lazy container) implementations do not need to perform such
  * conversions and might not support values of different types.
- * 
+ *
  * Note that this filter is modeled after the pre-6.6 filtering mechanisms, and
  * might not be very efficient e.g. for database filtering.
- * 
+ *
  * TODO this might still change
- * 
+ *
  * @since 6.6
  */
 public final class SimpleStringFilter implements Filter {
@@ -119,7 +119,7 @@ public final class SimpleStringFilter implements Filter {
 
     /**
      * Returns the property identifier to which this filter applies.
-     * 
+     *
      * @return property id
      */
     public Object getPropertyId() {
@@ -128,10 +128,10 @@ public final class SimpleStringFilter implements Filter {
 
     /**
      * Returns the filter string.
-     * 
+     *
      * Note: this method is intended only for implementations of lazy string
      * filters and may change in the future.
-     * 
+     *
      * @return filter string given to the constructor
      */
     public String getFilterString() {
@@ -140,10 +140,10 @@ public final class SimpleStringFilter implements Filter {
 
     /**
      * Returns whether the filter is case-insensitive or case-sensitive.
-     * 
+     *
      * Note: this method is intended only for implementations of lazy string
      * filters and may change in the future.
-     * 
+     *
      * @return true if performing case-insensitive filtering, false for
      *         case-sensitive
      */
@@ -154,10 +154,10 @@ public final class SimpleStringFilter implements Filter {
     /**
      * Returns true if the filter only applies to the beginning of the value
      * string, false for any location in the value.
-     * 
+     *
      * Note: this method is intended only for implementations of lazy string
      * filters and may change in the future.
-     * 
+     *
      * @return true if checking for matches at the beginning of the value only,
      *         false if matching any part of value
      */
diff --git a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java
index a3f617c45e..1257977136 100644
--- a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.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
@@ -20,12 +20,12 @@ import java.io.Serializable;
 /**
  * Exception for cases where a container does not support a specific type of
  * filters.
- * 
+ *
  * If possible, this should be thrown already when adding a filter to a
  * container. If a problem is not detected at that point, an
  * {@link UnsupportedOperationException} can be throws when attempting to
  * perform filtering.
- * 
+ *
  * @since 6.6
  */
 public class UnsupportedFilterException extends RuntimeException
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
index 454f2746ba..f0a41ed288 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.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
@@ -39,7 +39,7 @@ class CacheFlushNotifier implements Serializable {
 
     /**
      * Adds the given SQLContainer to the cache flush notification receiver list
-     * 
+     *
      * @param c
      *            Container to add
      */
@@ -65,7 +65,7 @@ class CacheFlushNotifier implements Serializable {
     /**
      * Iterates through the instances and notifies containers which are
      * connected to the same table or are using the same query string.
-     * 
+     *
      * @param c
      *            SQLContainer that issued the cache flush notification
      */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
index cdeff873d0..846abf68b0 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
index ed8eb3c0ff..3c918a2e7b 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.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
@@ -20,14 +20,14 @@ import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 /**
  * An OptimisticLockException is thrown when trying to update or delete a row
  * that has been changed since last read from the database.
- * 
+ *
  * OptimisticLockException is a runtime exception because optimistic locking is
  * turned off by default, and as such will never be thrown in a default
  * configuration. In order to turn on optimistic locking, you need to specify
  * the version column in your TableQuery instance.
- * 
+ *
  * @see TableQuery#setVersionColumn(String)
- * 
+ *
  * @author Jonatan Kronqvist / Vaadin Ltd
  */
 public class OptimisticLockException extends RuntimeException {
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
index c845cadc7a..4f3ec470de 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
index e82f63ad2f..933f70fbe7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
index 5bb8b01d07..571bb48711 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.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
@@ -20,7 +20,7 @@ import java.util.Arrays;
 
 /**
  * RowId represents identifiers of a single database result set row.
- * 
+ *
  * The data structure of a RowId is an Object array which contains the values of
  * the primary key columns of the identified row. This allows easy equals()
  * -comparison of RowItems.
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
index ddb5de1d31..e0d07f2ab1 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.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.data.Property;
 
 /**
  * RowItem represents one row of a result set obtained from a QueryDelegate.
- * 
+ *
  * Note that depending on the QueryDelegate in use this does not necessarily map
  * into an actual row in a database table.
  */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index c620d9eb5e..189e77abb5 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.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
@@ -122,7 +122,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Creates and initializes SQLContainer using the given QueryDelegate
-     * 
+     *
      * @param delegate
      *            QueryDelegate implementation
      * @throws SQLException
@@ -146,7 +146,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * temporary row ID assigned for the item. Implement
      * QueryDelegate.RowIdChangeListener to receive the actual Row ID value
      * after the addition has been committed.
-     * 
+     *
      * {@inheritDoc}
      */
 
@@ -207,7 +207,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#containsId(java.lang.Object)
      */
 
@@ -249,7 +249,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object,
      * java.lang.Object)
      */
@@ -265,7 +265,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getContainerPropertyIds()
      */
 
@@ -276,7 +276,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getItem(java.lang.Object)
      */
 
@@ -304,7 +304,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Bypasses in-memory filtering to return items that are cached in memory.
      * <em>NOTE</em>: This does not bypass database-level filtering.
-     * 
+     *
      * @param itemId
      *            the id of the item to retrieve.
      * @return the item represented by itemId.
@@ -324,7 +324,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * NOTE! Do not use this method if in any way avoidable. This method doesn't
      * (and cannot) use lazy loading, which means that all rows in the database
      * will be loaded into memory.
-     * 
+     *
      * {@inheritDoc}
      */
 
@@ -382,7 +382,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#getType(java.lang.Object)
      */
 
@@ -396,7 +396,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#size()
      */
 
@@ -408,7 +408,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
 
@@ -477,7 +477,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeAllItems()
      */
 
@@ -605,7 +605,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Returns true if any filters have been applied to the container.
-     * 
+     *
      * @return true if the container has filters applied, false otherwise
      * @since 7.1
      */
@@ -615,7 +615,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Filterable#getContainerFilters()
      */
     @Override
@@ -629,7 +629,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Indexed#indexOfId(java.lang.Object)
      */
 
@@ -688,7 +688,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Indexed#getIdByIndex(int)
      */
 
@@ -728,7 +728,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
 
@@ -744,7 +744,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
 
@@ -760,7 +760,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
 
@@ -789,7 +789,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
 
@@ -816,7 +816,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
 
@@ -827,7 +827,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
 
@@ -842,7 +842,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      * boolean[])
      */
@@ -873,7 +873,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
 
@@ -899,7 +899,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * <code>false</code>, assumes that the current size is up to date. This is
      * used in {@link #updateCount()} to refresh the contents when we know the
      * size was just updated.
-     * 
+     *
      * @param setSizeDirty
      */
     private void refresh(boolean setSizeDirty) {
@@ -914,7 +914,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Returns modify state of the container.
-     * 
+     *
      * @return true if contents of this container have been modified
      */
     public boolean isModified() {
@@ -926,7 +926,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * Set auto commit mode enabled or disabled. Auto commit mode means that all
      * changes made to items of this container will be immediately written to
      * the underlying data source.
-     * 
+     *
      * @param autoCommitEnabled
      *            true to enable auto commit mode
      */
@@ -936,7 +936,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Returns status of the auto commit mode.
-     * 
+     *
      * @return true if auto commit mode is enabled
      */
     public boolean isAutoCommit() {
@@ -945,7 +945,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Returns the currently set page length.
-     * 
+     *
      * @return current page length
      */
     public int getPageLength() {
@@ -955,9 +955,9 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Sets the page length used in lazy fetching of items from the data source.
      * Also resets the cache size to match the new page length.
-     * 
+     *
      * As a side effect the container will be refreshed.
-     * 
+     *
      * @param pageLength
      *            new page length
      */
@@ -968,7 +968,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Sets the page length internally, without refreshing the container.
-     * 
+     *
      * @param pageLength
      *            the new page length
      */
@@ -981,10 +981,10 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Adds the given OrderBy to this container and refreshes the container
      * contents with the new sorting rules.
-     * 
+     *
      * Note that orderBy.getColumn() must return a column name that exists in
      * this container.
-     * 
+     *
      * @param orderBy
      *            OrderBy to be added to the container sorting rules
      */
@@ -1003,7 +1003,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Commits all the changes, additions and removals made to the items of this
      * container.
-     * 
+     *
      * @throws UnsupportedOperationException
      * @throws SQLException
      */
@@ -1068,7 +1068,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Rolls back all the changes, additions and removals made to the items of
      * this container.
-     * 
+     *
      * @throws UnsupportedOperationException
      * @throws SQLException
      */
@@ -1084,7 +1084,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * Notifies this container that a property in the given item has been
      * modified. The change will be buffered or made instantaneously depending
      * on auto commit mode.
-     * 
+     *
      * @param changedItem
      *            item that has a modified property
      */
@@ -1127,7 +1127,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * Determines a new offset for updating the row cache. The offset is
      * calculated from the given index, and will be fixed to match the start of
      * a page, based on the value of pageLength.
-     * 
+     *
      * @param index
      *            Index of the item that was requested, but not found in cache
      */
@@ -1187,7 +1187,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Fetches property id's (column names and their types) from the data
      * source.
-     * 
+     *
      * @throws SQLException
      */
     private void getPropertyIds() throws SQLException {
@@ -1410,7 +1410,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Returns the index of the item with the given itemId for the modified
      * cache.
-     * 
+     *
      * @param itemId
      * @return the index of the item with the itemId in the modified cache. Or
      *         -1 if not found.
@@ -1455,7 +1455,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * Currently the only non-valid identifier is "rownum" when MSSQL or Oracle
      * is used. This is due to the way the SELECT queries are constructed in
      * order to implement paging in these databases.
-     * 
+     *
      * @param identifier
      *            Column identifier
      * @return true if the identifier is valid
@@ -1474,7 +1474,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Returns the QueryDelegate set for this SQLContainer.
-     * 
+     *
      * @return current querydelegate
      */
     protected QueryDelegate getQueryDelegate() {
@@ -1487,7 +1487,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
@@ -1500,7 +1500,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object)
      */
 
@@ -1512,7 +1512,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
 
@@ -1523,7 +1523,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
@@ -1536,7 +1536,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Indexed#addItemAt(int, java.lang.Object)
      */
 
@@ -1548,7 +1548,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Indexed#addItemAt(int)
      */
 
@@ -1559,7 +1559,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
 
@@ -1575,7 +1575,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin
      * .data.Container.ItemSetChangeListener)
@@ -1602,7 +1602,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin
      * .data.Container.ItemSetChangeListener)
@@ -1661,7 +1661,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Adds a RowIdChangeListener to the QueryDelegate
-     * 
+     *
      * @param listener
      */
     public void addRowIdChangeListener(RowIdChangeListener listener) {
@@ -1682,7 +1682,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Removes a RowIdChangeListener from the QueryDelegate
-     * 
+     *
      * @param listener
      */
     public void removeRowIdChangeListener(RowIdChangeListener listener) {
@@ -1720,10 +1720,10 @@ public class SQLContainer implements Container, Container.Filterable,
      * Adds a new reference to the given SQLContainer. In addition to the
      * container you must provide the column (property) names used for the
      * reference in both this and the referenced SQLContainer.
-     * 
+     *
      * Note that multiple references pointing to the same SQLContainer are not
      * supported.
-     * 
+     *
      * @param refdCont
      *            Target SQLContainer of the new reference
      * @param refingCol
@@ -1760,7 +1760,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Removes the reference pointing to the given SQLContainer.
-     * 
+     *
      * @param refdCont
      *            Target SQLContainer of the reference
      * @return true if successful, false if the reference did not exist
@@ -1776,7 +1776,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * Sets the referenced item. The referencing column of the item in this
      * container is updated accordingly.
-     * 
+     *
      * @param itemId
      *            Item Id of the reference source (from this container)
      * @param refdItemId
@@ -1811,7 +1811,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Fetches the Item Id of the referenced item from the target SQLContainer.
-     * 
+     *
      * @param itemId
      *            Item Id of the reference source (from this container)
      * @param refdCont
@@ -1840,7 +1840,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * Fetches the referenced item from the target SQLContainer.
-     * 
+     *
      * @param itemId
      *            Item Id of the reference source (from this container)
      * @param refdCont
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
index 83c3bd0f03..1058828002 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.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
@@ -21,18 +21,18 @@ public class SQLUtil implements Serializable {
     /**
      * Escapes different special characters in strings that are passed to SQL.
      * Replaces the following:
-     * 
+     *
      * <list>
      * <li>' is replaced with ''</li>
      * <li>\x00 is removed</li>
      * <li>\ is replaced with \\</li>
      * <li>" is replaced with \"</li>
      * <li>\x1a is removed</li> </list>
-     * 
+     *
      * Also note! The escaping done here may or may not be enough to prevent any
      * and all SQL injections so it is recommended to check user input before
      * giving it to the SQLContainer/TableQuery.
-     * 
+     *
      * @param constant
      * @return \\\'\'
      */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
index ca2f25963e..3781451b9f 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index 0cb367a92b..b4c63cabc0 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 11669075a3..969aa35eca 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.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
@@ -25,7 +25,7 @@ import java.sql.SQLException;
 public interface JDBCConnectionPool extends Serializable {
     /**
      * Retrieves a connection.
-     * 
+     *
      * @return a usable connection to the database
      * @throws SQLException
      */
@@ -33,10 +33,10 @@ public interface JDBCConnectionPool extends Serializable {
 
     /**
      * Releases a connection that was retrieved earlier.
-     * 
+     *
      * Note that depending on implementation, the transaction possibly open in
      * the connection may or may not be rolled back.
-     * 
+     *
      * @param conn
      *            Connection to be released
      */
@@ -45,7 +45,7 @@ public interface JDBCConnectionPool extends Serializable {
     /**
      * Destroys the connection pool: close() is called an all the connections in
      * the pool, whether available or reserved.
-     * 
+     *
      * This method was added to fix PostgreSQL -related issues with connections
      * that were left hanging 'idle'.
      */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 551468efd3..da797f98ef 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index d20d873012..9094feec4f 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.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
@@ -27,7 +27,7 @@ import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 /**
  * Common base class for database query classes that handle connections and
  * transactions.
- * 
+ *
  * @author Vaadin Ltd
  * @since 6.8.9
  */
@@ -46,7 +46,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
     /**
      * Reserves a connection with auto-commit off if no transaction is in
      * progress.
-     * 
+     *
      * @throws IllegalStateException
      *             if a transaction is already open
      * @throws SQLException
@@ -63,7 +63,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
 
     /**
      * Commits (if not in auto-commit mode) and releases the active connection.
-     * 
+     *
      * @throws SQLException
      *             if not in a transaction managed by this query
      */
@@ -80,7 +80,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
 
     /**
      * Rolls back and releases the active connection.
-     * 
+     *
      * @throws SQLException
      *             if not in a transaction managed by this query
      */
@@ -95,7 +95,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
 
     /**
      * Check that a transaction is active.
-     * 
+     *
      * @throws SQLException
      *             if no active transaction
      */
@@ -109,17 +109,17 @@ public abstract class AbstractTransactionalQuery implements Serializable {
      * Closes a statement and a resultset, then releases the connection if it is
      * not part of an active transaction. A failure in closing one of the
      * parameters does not prevent closing the rest.
-     * 
+     *
      * If the statement is a {@link PreparedStatement}, its parameters are
      * cleared prior to closing the statement.
-     * 
+     *
      * Although JDBC specification does state that closing a statement closes
      * its result set and closing a connection closes statements and result
      * sets, this method does try to close the result set and statement
      * explicitly whenever not null. This can guard against bugs in certain JDBC
      * drivers and reduce leaks in case e.g. closing the result set succeeds but
      * closing the statement or connection fails.
-     * 
+     *
      * @param conn
      *            the connection to release
      * @param statement
@@ -156,7 +156,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
     /**
      * Returns the currently active connection, reserves and returns a new
      * connection if no active connection.
-     * 
+     *
      * @return previously active or newly reserved connection
      * @throws SQLException
      */
@@ -173,7 +173,7 @@ public abstract class AbstractTransactionalQuery implements Serializable {
 
     /**
      * Releases the connection if it is not part of an active transaction.
-     * 
+     *
      * @param conn
      *            the connection to release
      */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index 89d6e3fa73..a86aacaee7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.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
@@ -51,7 +51,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
     /**
      * Creates a new freeform query delegate to be used with the
      * {@link SQLContainer}.
-     * 
+     *
      * @param queryString
      *            The actual query to perform.
      * @param primaryKeyColumns
@@ -88,7 +88,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
     /**
      * Creates a new freeform query delegate to be used with the
      * {@link SQLContainer}.
-     * 
+     *
      * @param queryString
      *            The actual query to perform.
      * @param connectionPool
@@ -107,7 +107,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
      * This implementation of getCount() actually fetches all records from the
      * database, which might be a performance issue. Override this method with a
      * SELECT COUNT(*) ... query if this is too slow for your needs.
-     * 
+     *
      * {@inheritDoc}
      */
     @Override
@@ -204,9 +204,9 @@ public class FreeformQuery extends AbstractTransactionalQuery
      * order to support lazy loading of records, you must supply a
      * FreeformQueryDelegate that implements the
      * FreeformQueryDelegate.getQueryString(int,int) method.
-     * 
+     *
      * @throws SQLException
-     * 
+     *
      * @see FreeformQueryDelegate#getQueryString(int, int)
      */
     @Override
@@ -280,7 +280,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#setFilters(java
      * .util.List)
@@ -298,7 +298,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#setOrderBy(java
      * .util.List)
@@ -316,7 +316,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#storeRow(com.vaadin
      * .data.util.sqlcontainer.RowItem)
@@ -339,7 +339,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate#removeRow(com.
      * vaadin .data.util.sqlcontainer.RowItem)
      */
@@ -379,7 +379,7 @@ public class FreeformQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate#
      * getPrimaryKeyColumns ()
      */
@@ -407,9 +407,9 @@ public class FreeformQuery extends AbstractTransactionalQuery
      * situations where this logic is not enough, you can implement the
      * getContainsRowQueryString method in FreeformQueryDelegate and this will
      * be used instead of the logic.
-     * 
+     *
      * @see FreeformQueryDelegate#getContainsRowQueryString(Object...)
-     * 
+     *
      */
     @Override
     @SuppressWarnings("deprecation")
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index b6fa56055d..3830170eba 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.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 @@ public interface FreeformQueryDelegate extends Serializable {
      * Should return the SQL query string to be performed. This method is
      * responsible for gluing together the select query from the filters and the
      * order by conditions if these are supported.
-     * 
+     *
      * @param offset
      *            the first record (row) to fetch.
      * @param pagelength
@@ -45,7 +45,7 @@ public interface FreeformQueryDelegate extends Serializable {
      * Generates and executes a query to determine the current row count from
      * the DB. Row count will be fetched using filters that are currently set to
      * the QueryDelegate.
-     * 
+     *
      * @return row count
      * @throws SQLException
      * @deprecated As of 6.7. Implement {@link FreeformStatementDelegate}
@@ -57,7 +57,7 @@ public interface FreeformQueryDelegate extends Serializable {
     /**
      * Sets the filters to apply when performing the SQL query. These are
      * translated into a WHERE clause. Default filtering mode will be used.
-     * 
+     *
      * @param filters
      *            The filters to apply.
      * @throws UnsupportedOperationException
@@ -71,7 +71,7 @@ public interface FreeformQueryDelegate extends Serializable {
      * can be ordered by zero or more columns and each column can be in
      * ascending or descending order. These are translated into an ORDER BY
      * clause in the SQL query.
-     * 
+     *
      * @param orderBys
      *            A list of the OrderBy conditions.
      * @throws UnsupportedOperationException
@@ -84,7 +84,7 @@ public interface FreeformQueryDelegate extends Serializable {
      * Stores a row in the database. The implementation of this interface
      * decides how to identify whether to store a new row or update an existing
      * one.
-     * 
+     *
      * @param conn
      *            the JDBC connection to use
      * @param row
@@ -98,7 +98,7 @@ public interface FreeformQueryDelegate extends Serializable {
 
     /**
      * Removes the given RowItem from the database.
-     * 
+     *
      * @param conn
      *            the JDBC connection to use
      * @param row
@@ -116,7 +116,7 @@ public interface FreeformQueryDelegate extends Serializable {
      * FreeformQuery.containsRowWithKeys() method. This is useful for cases when
      * the logic in the containsRowWithKeys method is not enough to support more
      * complex free form queries.
-     * 
+     *
      * @param keys
      *            the values of the primary keys
      * @throws UnsupportedOperationException
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 9df72f5b98..1c666dd259 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.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
@@ -22,7 +22,7 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
  * provides definitions for methods that produce StatementHelper objects instead
  * of basic query strings. This allows the FreeformQuery query delegate to use
  * PreparedStatements instead of regular Statement when accessing the database.
- * 
+ *
  * Due to the injection protection and other benefits of prepared statements, it
  * is advisable to implement this interface instead of the FreeformQueryDelegate
  * whenever possible.
@@ -33,7 +33,7 @@ public interface FreeformStatementDelegate extends FreeformQueryDelegate {
      * string and parameter values required to create a PreparedStatement. This
      * method is responsible for gluing together the select query from the
      * filters and the order by conditions if these are supported.
-     * 
+     *
      * @param offset
      *            the first record (row) to fetch.
      * @param pagelength
@@ -58,7 +58,7 @@ public interface FreeformStatementDelegate extends FreeformQueryDelegate {
      * by the FreeformQuery.containsRowWithKeys() method. This is useful for
      * cases when the default logic in said method is not enough to support more
      * complex free form queries.
-     * 
+     *
      * @param keys
      *            the values of the primary keys
      * @throws UnsupportedOperationException
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
index 2bafa5dc0c..1b014bdda1 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.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
@@ -20,7 +20,7 @@ import java.io.Serializable;
 /**
  * OrderBy represents a sorting rule to be applied to a query made by the
  * SQLContainer's QueryDelegate.
- * 
+ *
  * The sorting rule is simple and contains only the affected column's name and
  * the direction of the sort.
  */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index d58146c75f..ab4cf0cd90 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.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
@@ -29,7 +29,7 @@ public interface QueryDelegate extends Serializable {
      * Generates and executes a query to determine the current row count from
      * the DB. Row count will be fetched using filters that are currently set to
      * the QueryDelegate.
-     * 
+     *
      * @return row count
      * @throws SQLException
      */
@@ -38,7 +38,7 @@ public interface QueryDelegate extends Serializable {
     /**
      * Executes a paged SQL query and returns the ResultSet. The query is
      * defined through implementations of this QueryDelegate interface.
-     * 
+     *
      * @param offset
      *            the first item of the page to load
      * @param pagelength
@@ -52,9 +52,9 @@ public interface QueryDelegate extends Serializable {
     /**
      * Allows the SQLContainer implementation to check whether the QueryDelegate
      * implementation implements paging in the getResults method.
-     * 
+     *
      * @see QueryDelegate#getResults(int, int)
-     * 
+     *
      * @return true if the delegate implements paging
      */
     public boolean implementationRespectsPagingLimits();
@@ -62,7 +62,7 @@ public interface QueryDelegate extends Serializable {
     /**
      * Sets the filters to apply when performing the SQL query. These are
      * translated into a WHERE clause. Default filtering mode will be used.
-     * 
+     *
      * @param filters
      *            The filters to apply.
      * @throws UnsupportedOperationException
@@ -76,7 +76,7 @@ public interface QueryDelegate extends Serializable {
      * can be ordered by zero or more columns and each column can be in
      * ascending or descending order. These are translated into an ORDER BY
      * clause in the SQL query.
-     * 
+     *
      * @param orderBys
      *            A list of the OrderBy conditions.
      * @throws UnsupportedOperationException
@@ -89,7 +89,7 @@ public interface QueryDelegate extends Serializable {
      * Stores a row in the database. The implementation of this interface
      * decides how to identify whether to store a new row or update an existing
      * one.
-     * 
+     *
      * @param columnToValueMap
      *            A map containing the values for all columns to be stored or
      *            updated.
@@ -102,7 +102,7 @@ public interface QueryDelegate extends Serializable {
 
     /**
      * Removes the given RowItem from the database.
-     * 
+     *
      * @param row
      *            RowItem to be removed
      * @return true on success
@@ -114,10 +114,10 @@ public interface QueryDelegate extends Serializable {
 
     /**
      * Starts a new database transaction. Used when storing multiple changes.
-     * 
+     *
      * Note that if a transaction is already open, it will be rolled back when a
      * new transaction is started.
-     * 
+     *
      * @throws SQLException
      *             if the database access fails.
      */
@@ -126,7 +126,7 @@ public interface QueryDelegate extends Serializable {
     /**
      * Commits a transaction. If a transaction is not open nothing should
      * happen.
-     * 
+     *
      * @throws SQLException
      *             if the database access fails.
      */
@@ -135,7 +135,7 @@ public interface QueryDelegate extends Serializable {
     /**
      * Rolls a transaction back. If a transaction is not open nothing should
      * happen.
-     * 
+     *
      * @throws SQLException
      *             if the database access fails.
      */
@@ -145,7 +145,7 @@ public interface QueryDelegate extends Serializable {
      * Returns a list of primary key column names. The list is either fetched
      * from the database (TableQuery) or given as an argument depending on
      * implementation.
-     * 
+     *
      * @return
      */
     public List<String> getPrimaryKeyColumns();
@@ -153,7 +153,7 @@ public interface QueryDelegate extends Serializable {
     /**
      * Performs a query to find out whether the SQL table contains a row with
      * the given set of primary keys.
-     * 
+     *
      * @param keys
      *            the primary keys
      * @return true if the SQL table contains a row with the provided keys
@@ -173,7 +173,7 @@ public interface QueryDelegate extends Serializable {
         /**
          * Gets the old (temporary) RowId of the added row that raised this
          * event.
-         * 
+         *
          * @return old RowId
          */
         public RowId getOldRowId();
@@ -181,7 +181,7 @@ public interface QueryDelegate extends Serializable {
         /**
          * Gets the new, possibly database assigned RowId of the added row that
          * raised this event.
-         * 
+         *
          * @return new RowId
          */
         public RowId getNewRowId();
@@ -191,7 +191,7 @@ public interface QueryDelegate extends Serializable {
     public interface RowIdChangeListener extends Serializable {
         /**
          * Lets the listener know that a RowId has been changed.
-         * 
+         *
          * @param event
          */
         public void rowIdChange(QueryDelegate.RowIdChangeEvent event);
@@ -206,7 +206,7 @@ public interface QueryDelegate extends Serializable {
     public interface RowIdChangeNotifier extends Serializable {
         /**
          * Adds a RowIdChangeListener for the object.
-         * 
+         *
          * @param listener
          *            listener to be added
          */
@@ -222,7 +222,7 @@ public interface QueryDelegate extends Serializable {
 
         /**
          * Removes the specified RowIdChangeListener from the object.
-         * 
+         *
          * @param listener
          *            listener to be removed
          */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 13a9511165..4e28b5d4e4 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.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
@@ -87,12 +87,12 @@ public class TableQuery extends AbstractTransactionalQuery
     /**
      * Creates a new TableQuery using the given connection pool, SQL generator
      * and table name to fetch the data from. All parameters must be non-null.
-     * 
+     *
      * The table name must be a simple name with no catalog or schema
      * information. If those are needed, use
      * {@link #TableQuery(String, String, String, JDBCConnectionPool, SQLGenerator)}
      * .
-     * 
+     *
      * @param tableName
      *            Name of the database table to connect to
      * @param connectionPool
@@ -109,7 +109,7 @@ public class TableQuery extends AbstractTransactionalQuery
      * Creates a new TableQuery using the given connection pool, SQL generator
      * and table name to fetch the data from. Catalog and schema names can be
      * null, all other parameters must be non-null.
-     * 
+     *
      * @param catalogName
      *            Name of the database catalog (can be null)
      * @param schemaName
@@ -132,12 +132,12 @@ public class TableQuery extends AbstractTransactionalQuery
      * Creates a new TableQuery using the given connection pool and table name
      * to fetch the data from. All parameters must be non-null. The default SQL
      * generator will be used for queries.
-     * 
+     *
      * The table name must be a simple name with no catalog or schema
      * information. If those are needed, use
      * {@link #TableQuery(String, String, String, JDBCConnectionPool, SQLGenerator)}
      * .
-     * 
+     *
      * @param tableName
      *            Name of the database table to connect to
      * @param connectionPool
@@ -151,7 +151,7 @@ public class TableQuery extends AbstractTransactionalQuery
      * Creates a new TableQuery using the given connection pool, SQL generator
      * and table name to fetch the data from. Catalog and schema names can be
      * null, all other parameters must be non-null.
-     * 
+     *
      * @param catalogName
      *            Name of the database catalog (can be null)
      * @param schemaName
@@ -191,7 +191,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getCount()
      */
     @Override
@@ -227,7 +227,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getResults(int,
      * int)
      */
@@ -255,7 +255,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#
      * implementationRespectsPagingLimits()
      */
@@ -266,7 +266,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#storeRow(com.vaadin
      * .addon.sqlcontainer.RowItem)
@@ -311,7 +311,7 @@ public class TableQuery extends AbstractTransactionalQuery
      * solve the problem of returning the final RowId immediately on the
      * SQLContainer.addItem() call when auto commit mode is enabled in the
      * SQLContainer.
-     * 
+     *
      * @param row
      *            RowItem to add to the database
      * @return Final RowId of the added row
@@ -353,7 +353,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setFilters(java.util
      * .List)
@@ -370,7 +370,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setOrderBy(java.util
      * .List)
@@ -387,7 +387,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#beginTransaction()
      */
     @Override
@@ -399,7 +399,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#commit()
      */
     @Override
@@ -422,7 +422,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#rollback()
      */
     @Override
@@ -433,7 +433,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#getPrimaryKeyColumns()
      */
@@ -453,7 +453,7 @@ public class TableQuery extends AbstractTransactionalQuery
     /**
      * Returns the table name for the query without catalog and schema
      * information.
-     * 
+     *
      * @return table name, not null
      */
     public String getTableName() {
@@ -462,7 +462,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * Returns the catalog name for the query.
-     * 
+     *
      * @return catalog name, can be null
      * @since 7.1
      */
@@ -472,7 +472,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * Returns the catalog name for the query.
-     * 
+     *
      * @return catalog name, can be null
      * @since 7.1
      */
@@ -483,9 +483,9 @@ public class TableQuery extends AbstractTransactionalQuery
     /**
      * Returns the complete table name obtained by concatenation of the catalog
      * and schema names (if any) and the table name.
-     * 
+     *
      * This method can be overridden if customization is needed.
-     * 
+     *
      * @return table name in the form it should be used in query and update
      *         statements
      * @since 7.1
@@ -513,7 +513,7 @@ public class TableQuery extends AbstractTransactionalQuery
      * Executes the given query string using either the active connection if a
      * transaction is already open, or a new connection from this query's
      * connection pool.
-     * 
+     *
      * @param sh
      *            an instance of StatementHelper, containing the query string
      *            and parameter values.
@@ -539,7 +539,7 @@ public class TableQuery extends AbstractTransactionalQuery
      * Executes the given update query string using either the active connection
      * if a transaction is already open, or a new connection from this query's
      * connection pool.
-     * 
+     *
      * @param sh
      *            an instance of StatementHelper, containing the query string
      *            and parameter values.
@@ -565,9 +565,9 @@ public class TableQuery extends AbstractTransactionalQuery
      * Executes the given update query string using either the active connection
      * if a transaction is already open, or a new connection from this query's
      * connection pool.
-     * 
+     *
      * Additionally adds a new RowIdChangeEvent to the event buffer.
-     * 
+     *
      * @param sh
      *            an instance of StatementHelper, containing the query string
      *            and parameter values.
@@ -599,7 +599,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * Fetches name(s) of primary key column(s) from DB metadata.
-     * 
+     *
      * Also tries to get the escape string to be used in search strings.
      */
     private void fetchMetaData() {
@@ -716,7 +716,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#removeRow(com.vaadin
      * .addon.sqlcontainer.RowItem)
@@ -742,7 +742,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.sqlcontainer.query.QueryDelegate#containsRowWithKey(
      * java.lang.Object[])
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 843dae1b74..95e772b2f2 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.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
@@ -30,7 +30,7 @@ import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 /**
  * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL.
- * 
+ *
  * @author Jonatan Kronqvist / Vaadin Ltd
  */
 @SuppressWarnings("serial")
@@ -45,7 +45,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
     /**
      * Create a new DefaultSqlGenerator instance that uses the given
      * implementation of {@link StatementHelper}
-     * 
+     *
      * @param statementHelper
      */
     public DefaultSQLGenerator(
@@ -58,7 +58,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
      * Construct a DefaultSQLGenerator with the specified identifiers for start
      * and end of quoted strings. The identifiers may be different depending on
      * the database engine and it's settings.
-     * 
+     *
      * @param quoteStart
      *            the identifier (character) denoting the start of a quoted
      *            string
@@ -73,7 +73,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
     /**
      * Same as {@link #DefaultSQLGenerator(String, String)} but with support for
      * custom {@link StatementHelper} implementation.
-     * 
+     *
      * @param quoteStart
      * @param quoteEnd
      * @param statementHelperClazz
@@ -86,7 +86,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.SQLGenerator#
      * generateSelectQuery(java.lang.String, java.util.List, java.util.List,
      * int, int, java.lang.String)
@@ -120,7 +120,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.SQLGenerator#
      * generateUpdateQuery(java.lang.String,
      * com.vaadin.addon.sqlcontainer.RowItem)
@@ -170,7 +170,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.SQLGenerator#
      * generateInsertQuery(java.lang.String,
      * com.vaadin.addon.sqlcontainer.RowItem)
@@ -222,7 +222,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.SQLGenerator#
      * generateDeleteQuery(java.lang.String,
      * com.vaadin.addon.sqlcontainer.RowItem)
@@ -283,7 +283,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /**
      * Generates sorting rules as an ORDER BY -clause
-     * 
+     *
      * @param sb
      *            StringBuffer to which the clause is appended.
      * @param o
@@ -310,7 +310,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
 
     /**
      * Generates the LIMIT and OFFSET clause.
-     * 
+     *
      * @param sb
      *            StringBuffer to which the clause is appended.
      * @param offset
@@ -372,7 +372,7 @@ public class DefaultSQLGenerator implements SQLGenerator {
     /**
      * Returns the statement helper for the generator. Override this to handle
      * platform specific data types.
-     * 
+     *
      * @see http://dev.vaadin.com/ticket/9148
      * @return a new instance of the statement helper
      */
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index 00266de380..754aa08689 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.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
@@ -32,7 +32,7 @@ public class MSSQLGenerator extends DefaultSQLGenerator {
      * Construct a MSSQLGenerator with the specified identifiers for start and
      * end of quoted strings. The identifiers may be different depending on the
      * database engine and it's settings.
-     * 
+     *
      * @param quoteStart
      *            the identifier (character) denoting the start of a quoted
      *            string
@@ -45,7 +45,7 @@ public class MSSQLGenerator extends DefaultSQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.DefaultSQLGenerator#
      * generateSelectQuery(java.lang.String, java.util.List,
      * com.vaadin.addon.sqlcontainer.query.FilteringMode, java.util.List, int,
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
index cdf7628984..a9a98d98a7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.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
@@ -37,7 +37,7 @@ public class OracleGenerator extends DefaultSQLGenerator {
      * Construct an OracleSQLGenerator with the specified identifiers for start
      * and end of quoted strings. The identifiers may be different depending on
      * the database engine and it's settings.
-     * 
+     *
      * @param quoteStart
      *            the identifier (character) denoting the start of a quoted
      *            string
@@ -55,7 +55,7 @@ public class OracleGenerator extends DefaultSQLGenerator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.sqlcontainer.query.generator.DefaultSQLGenerator#
      * generateSelectQuery(java.lang.String, java.util.List,
      * com.vaadin.addon.sqlcontainer.query.FilteringMode, java.util.List, int,
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
index 53ff924a36..bdc3d1fdf1 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.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,14 +26,14 @@ import com.vaadin.data.util.sqlcontainer.query.OrderBy;
  * The SQLGenerator interface is meant to be implemented for each different SQL
  * syntax that is to be supported. By default there are implementations for
  * HSQLDB, MySQL, PostgreSQL, MSSQL and Oracle syntaxes.
- * 
+ *
  * @author Jonatan Kronqvist / Vaadin Ltd
  */
 public interface SQLGenerator extends Serializable {
     /**
      * Generates a SELECT query with the provided parameters. Uses default
      * filtering mode (INCLUSIVE).
-     * 
+     *
      * @param tableName
      *            Name of the table queried
      * @param filters
@@ -55,7 +55,7 @@ public interface SQLGenerator extends Serializable {
 
     /**
      * Generates an UPDATE query with the provided parameters.
-     * 
+     *
      * @param tableName
      *            Name of the table queried
      * @param item
@@ -68,7 +68,7 @@ public interface SQLGenerator extends Serializable {
     /**
      * Generates an INSERT query for inserting a new row with the provided
      * values.
-     * 
+     *
      * @param tableName
      *            Name of the table queried
      * @param item
@@ -81,7 +81,7 @@ public interface SQLGenerator extends Serializable {
     /**
      * Generates a DELETE query for deleting data related to the given RowItem
      * from the database.
-     * 
+     *
      * @param tableName
      *            Name of the table queried
      * @param primaryKeyColumns
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
index 5a9fcb17c0..78371f31ce 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.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
@@ -33,7 +33,7 @@ import java.util.Map;
  * query generators in filling a PreparedStatement. The actual statement is
  * generated by the query generator methods, but the resulting statement and all
  * the parameter values are stored in an instance of StatementHelper.
- * 
+ *
  * This class will also fill the values with correct setters into the
  * PreparedStatement on request.
  */
@@ -84,35 +84,35 @@ public class StatementHelper implements Serializable {
         /*
          * The following list contains the data types supported by
          * PreparedStatement but not supported by SQLContainer:
-         * 
+         *
          * [The list is provided as PreparedStatement method signatures]
-         * 
+         *
          * setNCharacterStream(int parameterIndex, Reader value)
-         * 
+         *
          * setNClob(int parameterIndex, NClob value)
-         * 
+         *
          * setNString(int parameterIndex, String value)
-         * 
+         *
          * setRef(int parameterIndex, Ref x)
-         * 
+         *
          * setRowId(int parameterIndex, RowId x)
-         * 
+         *
          * setSQLXML(int parameterIndex, SQLXML xmlObject)
-         * 
+         *
          * setBytes(int parameterIndex, byte[] x)
-         * 
+         *
          * setCharacterStream(int parameterIndex, Reader reader)
-         * 
+         *
          * setClob(int parameterIndex, Clob x)
-         * 
+         *
          * setURL(int parameterIndex, URL x)
-         * 
+         *
          * setArray(int parameterIndex, Array x)
-         * 
+         *
          * setAsciiStream(int parameterIndex, InputStream x)
-         * 
+         *
          * setBinaryStream(int parameterIndex, InputStream x)
-         * 
+         *
          * setBlob(int parameterIndex, Blob x)
          */
     }
@@ -162,13 +162,13 @@ public class StatementHelper implements Serializable {
      * Handle unrecognized null values. Override this to handle null values for
      * platform specific data types that are not handled by the default
      * implementation of the {@link StatementHelper}.
-     * 
+     *
      * @param i
      * @param pstmt
      * @param dataTypes2
-     * 
+     *
      * @return true if handled, false otherwise
-     * 
+     *
      * @see {@link http://dev.vaadin.com/ticket/9148}
      */
     protected boolean handleUnrecognizedTypeNullValue(int i,
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index 761d5d33b5..325764f563 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 13d3553742..40c04e60d7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index d8d5cc61fb..d3e408f938 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index 0ece263ef4..3dda38a8a4 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index 764a04eece..a371be454e 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index 07e544d40b..0250589621 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index 1bbc2a8e7e..cf50618bf4 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 9834f24ad4..17d27f7dbe 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index b277551209..38843e9497 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.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
@@ -49,7 +49,7 @@ public class QueryBuilder implements Serializable {
     /**
      * Allows specification of a custom ColumnQuoter instance that handles
      * quoting of column names for the current DB dialect.
-     * 
+     *
      * @param decorator
      *            the ColumnQuoter instance to use.
      */
@@ -68,7 +68,7 @@ public class QueryBuilder implements Serializable {
     /**
      * Constructs and returns a string representing the filter that can be used
      * in a WHERE clause.
-     * 
+     *
      * @param filter
      *            the filter to translate
      * @param sh
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 9bfda5fb34..7084c82bbd 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.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/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index 0132260a0c..210bcffa29 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.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
@@ -21,10 +21,10 @@ import java.io.Serializable;
  * The StringDecorator knows how to produce a quoted string using the specified
  * quote start and quote end characters. It also handles grouping of a string
  * (surrounding it in parenthesis).
- * 
+ *
  * Extend this class if you need to support special characters for grouping
  * (parenthesis).
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StringDecorator implements Serializable {
@@ -35,7 +35,7 @@ public class StringDecorator implements Serializable {
     /**
      * Constructs a StringDecorator that uses the quoteStart and quoteEnd
      * characters to create quoted strings.
-     * 
+     *
      * @param quoteStart
      *            the character denoting the start of a quote.
      * @param quoteEnd
@@ -48,7 +48,7 @@ public class StringDecorator implements Serializable {
 
     /**
      * Surround a string with quote characters.
-     * 
+     *
      * @param str
      *            the string to quote
      * @return the quoted string
@@ -59,7 +59,7 @@ public class StringDecorator implements Serializable {
 
     /**
      * Groups a string by surrounding it in parenthesis
-     * 
+     *
      * @param str
      *            the string to group
      * @return the grouped string
diff --git a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
index 276a991b62..9efae2ebf9 100644
--- a/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.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
@@ -23,7 +23,7 @@ import com.vaadin.data.Validator;
 
 /**
  * An abstract base class for typed validators.
- * 
+ *
  * @param <T>
  *            The value type
  * @author Vaadin Ltd.
@@ -36,7 +36,7 @@ public abstract class AbstractValidator<T> implements Validator<T> {
     /**
      * Constructs a validator with the given error message. The substring "{0}"
      * is replaced by the value that failed validation.
-     * 
+     *
      * @param errorMessage
      *            the message to be included in a failed result, not null
      */
@@ -48,7 +48,7 @@ public abstract class AbstractValidator<T> implements Validator<T> {
 
     /**
      * Returns the error message for the given value.
-     * 
+     *
      * @param value
      *            an invalid value
      * @return the formatted error message
@@ -65,14 +65,14 @@ public abstract class AbstractValidator<T> implements Validator<T> {
      * <p>
      * For instance, the following {@code apply} method only accepts even
      * numbers:
-     * 
+     *
      * <pre>
      * &#64;Override
      * public Result&lt;T&gt; apply(Integer value) {
      *     return toResult(value, value % 2 == 0);
      * }
      * </pre>
-     * 
+     *
      * @param value
      *            the validated value
      * @param isValid
diff --git a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
index 0c09c89371..362ea05944 100644
--- a/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BeanValidator.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
@@ -39,10 +39,10 @@ import com.vaadin.data.Validator;
  * Note that a JSR-303 implementation (e.g. Hibernate Validator or Apache Bean
  * Validation - formerly agimatec validation) must be present on the project
  * classpath when using bean validation.
- * 
+ *
  * @author Petri Hakala
  * @author Vaadin Ltd.
- * 
+ *
  * @since 8.0
  */
 public class BeanValidator implements Validator<Object> {
@@ -58,7 +58,7 @@ public class BeanValidator implements Validator<Object> {
      * Creates a new JSR-303 {@code BeanValidator} that validates values of the
      * specified property. Localizes validation messages using the
      * {@linkplain Locale#getDefault() default locale}.
-     * 
+     *
      * @param beanType
      *            the bean type declaring the property, not null
      * @param propertyName
@@ -71,7 +71,7 @@ public class BeanValidator implements Validator<Object> {
     /**
      * Creates a new JSR-303 {@code BeanValidator} that validates values of the
      * specified property. Localizes validation messages using the given locale.
-     * 
+     *
      * @param beanType
      *            the bean class declaring the property, not null
      * @param propertyName
@@ -111,7 +111,7 @@ public class BeanValidator implements Validator<Object> {
 
     /**
      * Returns the locale used for validation error messages.
-     * 
+     *
      * @return the locale used for error messages
      */
     public Locale getLocale() {
@@ -127,7 +127,7 @@ public class BeanValidator implements Validator<Object> {
     /**
      * Returns the underlying JSR-303 bean validator factory used. A factory is
      * created using {@link Validation} if necessary.
-     * 
+     *
      * @return the validator factory to use
      */
     protected static ValidatorFactory getJavaxBeanValidatorFactory() {
@@ -139,7 +139,7 @@ public class BeanValidator implements Validator<Object> {
 
     /**
      * Returns a shared JSR-303 validator instance to use.
-     * 
+     *
      * @return the validator to use
      */
     protected javax.validation.Validator getJavaxBeanValidator() {
@@ -149,7 +149,7 @@ public class BeanValidator implements Validator<Object> {
     /**
      * Returns the interpolated error message for the given constraint violation
      * using the locale specified for this validator.
-     * 
+     *
      * @param v
      *            the constraint violation
      * @return the localized error message
@@ -162,7 +162,7 @@ public class BeanValidator implements Validator<Object> {
     /**
      * Creates a simple message interpolation context based on the given
      * constraint violation.
-     * 
+     *
      * @param v
      *            the constraint violation
      * @return the message interpolation context
@@ -184,7 +184,7 @@ public class BeanValidator implements Validator<Object> {
     /**
      * Sets the locale used for validation error messages. Revalidation is not
      * automatically triggered by setting the locale.
-     * 
+     *
      * @param locale
      *            the locale to use for error messages, not null
      */
diff --git a/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java
index 0bdbd70356..1dd0a4693a 100644
--- a/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.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
@@ -20,7 +20,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link BigDecimal} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -30,12 +30,12 @@ public class BigDecimalRangeValidator extends RangeValidator<BigDecimal> {
     /**
      * Creates a validator for checking that an BigDecimal is within a given
      * range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java
index 87ab5605a7..3c1b9a4a10 100644
--- a/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.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
@@ -20,7 +20,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link BigInteger} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -30,12 +30,12 @@ public class BigIntegerRangeValidator extends RangeValidator<BigInteger> {
     /**
      * Creates a validator for checking that an BigInteger is within a given
      * range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java
index fd11fc6aa4..33babe90a3 100644
--- a/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link Byte} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class ByteRangeValidator extends RangeValidator<Byte> {
 
     /**
      * Creates a validator for checking that an Byte is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java
index 43164d0fe2..8fe0107d7f 100644
--- a/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.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
@@ -22,13 +22,13 @@ import com.vaadin.shared.ui.datefield.Resolution;
 
 /**
  * Validator for validating that a Date is inside a given range.
- * 
+ *
  * <p>
  * Note that the comparison is done directly on the Date object so take care
  * that the hours/minutes/seconds/milliseconds of the min/max values are
  * properly set.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -46,7 +46,7 @@ public class DateRangeValidator extends RangeValidator<Date> {
      * that the hours/minutes/seconds/milliseconds of the min/max values are
      * properly set.
      * </p>
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java
index aa02ba9fe4..bdb5736406 100644
--- a/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that a {@link Double} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class DoubleRangeValidator extends RangeValidator<Double> {
 
     /**
      * Creates a validator for checking that an Double is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java b/server/src/main/java/com/vaadin/data/validator/EmailValidator.java
index 44243b0712..09cbc31fb7 100644
--- a/server/src/main/java/com/vaadin/data/validator/EmailValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/EmailValidator.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
@@ -19,7 +19,7 @@ package com.vaadin.data.validator;
  * A string validator for e-mail addresses. The e-mail address syntax is not
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -34,7 +34,7 @@ public class EmailValidator extends RegexpValidator {
     /**
      * Creates a validator for checking that a string is a syntactically valid
      * e-mail address.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
diff --git a/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java
index ef57900f2f..e348c90b34 100644
--- a/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that a {@link Float} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class FloatRangeValidator extends RangeValidator<Float> {
 
     /**
      * Creates a validator for checking that an Float is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java
index c7dc7cbee9..268551855c 100644
--- a/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link Integer} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class IntegerRangeValidator extends RangeValidator<Integer> {
 
     /**
      * Creates a validator for checking that an Integer is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java
index 85cdb907ac..5f2f5ca06c 100644
--- a/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link Long} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class LongRangeValidator extends RangeValidator<Long> {
 
     /**
      * Creates a validator for checking that an Long is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/NotEmptyValidator.java b/server/src/main/java/com/vaadin/data/validator/NotEmptyValidator.java
index ac827c45b6..2a11caf773 100644
--- a/server/src/main/java/com/vaadin/data/validator/NotEmptyValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/NotEmptyValidator.java
@@ -35,7 +35,7 @@ import com.vaadin.data.Validator;
  * Furthermore, required fields requires "non-empty" validator. So in addition
  * to call {@link HasRequired#setRequired(boolean)} method one should add an
  * instance of this validator explicitly so the code looks like this:
- * 
+ *
  * <pre>
  * <code>
  * Binder<Bean,String, String> binder = new Binder<>();
@@ -46,7 +46,7 @@ import com.vaadin.data.Validator;
  *              .bind(Bean::getName, Bean::setName);
  * </code>
  * </pre>
- * 
+ *
  * @see HasRequired
  * @author Vaadin Ltd
  * @since 8.0
diff --git a/server/src/main/java/com/vaadin/data/validator/NotNullValidator.java b/server/src/main/java/com/vaadin/data/validator/NotNullValidator.java
index e44e086c0f..5590708918 100644
--- a/server/src/main/java/com/vaadin/data/validator/NotNullValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/NotNullValidator.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
@@ -23,7 +23,7 @@ import com.vaadin.data.Result;
 /**
  * This validator is used for validating properties that do not allow null
  * values.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -32,7 +32,7 @@ public class NotNullValidator extends AbstractValidator<String> {
 
     /**
      * Creates a new NullValidator.
-     * 
+     *
      * @param errorMessage
      *            the error message to display on invalidation.
      */
diff --git a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java b/server/src/main/java/com/vaadin/data/validator/RangeValidator.java
index eed79d0b8b..f5bdf48bcc 100644
--- a/server/src/main/java/com/vaadin/data/validator/RangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/RangeValidator.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
@@ -22,7 +22,7 @@ import com.vaadin.data.Result;
 
 /**
  * Verifies that a value is within the given range.
- * 
+ *
  * @param <T>
  *            the type to validate
  * @author Vaadin Ltd.
@@ -42,7 +42,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
      * direction. Both limits may be null; this can be useful if the limits are
      * resolved programmatically. The result of passing null to {@code apply}
      * depends on the given comparator.
-     * 
+     *
      * @param errorMessage
      *            the error message to return if validation fails, not null
      * @param comparator
@@ -73,7 +73,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
      * <p>
      * Null is considered to be less than any non-null value. This means null
      * never passes validation if a minimum value is specified.
-     * 
+     *
      * @param <C>
      *            the {@code Comparable} value type
      * @param errorMessage
@@ -103,7 +103,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Returns whether the minimum value is part of the accepted range.
-     * 
+     *
      * @return true if the minimum value is part of the range, false otherwise
      */
     public boolean isMinValueIncluded() {
@@ -112,7 +112,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Sets whether the minimum value is part of the accepted range.
-     * 
+     *
      * @param minValueIncluded
      *            true if the minimum value should be part of the range, false
      *            otherwise
@@ -123,7 +123,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Returns whether the maximum value is part of the accepted range.
-     * 
+     *
      * @return true if the maximum value is part of the range, false otherwise
      */
     public boolean isMaxValueIncluded() {
@@ -132,7 +132,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Sets whether the maximum value is part of the accepted range.
-     * 
+     *
      * @param maxValueIncluded
      *            true if the maximum value should be part of the range, false
      *            otherwise
@@ -143,7 +143,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Returns the minimum value of the range.
-     * 
+     *
      * @return the minimum value
      */
     public T getMinValue() {
@@ -154,7 +154,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
      * Sets the minimum value of the range. Use
      * {@link #setMinValueIncluded(boolean)} to control whether this value is
      * part of the range or not.
-     * 
+     *
      * @param minValue
      *            the minimum value
      */
@@ -164,7 +164,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Gets the maximum value of the range.
-     * 
+     *
      * @return the maximum value
      */
     public T getMaxValue() {
@@ -175,7 +175,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
      * Sets the maximum value of the range. Use
      * {@link #setMaxValueIncluded(boolean)} to control whether this value is
      * part of the range or not.
-     * 
+     *
      * @param maxValue
      *            the maximum value
      */
@@ -194,7 +194,7 @@ public class RangeValidator<T> extends AbstractValidator<T> {
 
     /**
      * Returns whether the given value lies in the valid range.
-     * 
+     *
      * @param value
      *            the value to validate
      * @return true if the value is valid, false otherwise
diff --git a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java
index ce72d79e74..d798b3748e 100644
--- a/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.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
@@ -25,7 +25,7 @@ import com.vaadin.data.Result;
  * Both complete matches and substring matches are supported.
  * <p>
  * For the Java regular expression syntax, see {@link java.util.regex.Pattern}.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -39,7 +39,7 @@ public class RegexpValidator extends AbstractValidator<String> {
     /**
      * Creates a validator for checking that the regular expression matches the
      * complete string to validate.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param regexp
@@ -52,7 +52,7 @@ public class RegexpValidator extends AbstractValidator<String> {
     /**
      * Creates a validator for checking that the regular expression matches the
      * string to validate.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param regexp
@@ -60,7 +60,7 @@ public class RegexpValidator extends AbstractValidator<String> {
      * @param complete
      *            true to use check for a complete match, false to look for a
      *            matching substring
-     * 
+     *
      */
     public RegexpValidator(String errorMessage, String regexp,
             boolean complete) {
@@ -81,7 +81,7 @@ public class RegexpValidator extends AbstractValidator<String> {
 
     /**
      * Returns whether the given string matches the regular expression.
-     * 
+     *
      * @param value
      *            the string to match
      * @return true if the string matched, false otherwise
@@ -99,7 +99,7 @@ public class RegexpValidator extends AbstractValidator<String> {
 
     /**
      * Returns a new or reused matcher for the pattern.
-     * 
+     *
      * @param value
      *            the string to find matches in
      * @return a matcher for the string
diff --git a/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java
index 4fee15bca0..d96142d5d7 100644
--- a/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.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
@@ -19,7 +19,7 @@ import java.util.Comparator;
 
 /**
  * Validator for validating that an {@link Short} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -28,12 +28,12 @@ public class ShortRangeValidator extends RangeValidator<Short> {
 
     /**
      * Creates a validator for checking that an Short is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java
index 2e796cfdb2..b0836585e4 100644
--- a/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.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
@@ -20,7 +20,7 @@ import com.vaadin.data.Result;
 
 /**
  * Verifies that the length of a string is within the given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -32,7 +32,7 @@ public class StringLengthValidator extends AbstractValidator<String> {
     /**
      * Creates a new StringLengthValidator with a given error message and
      * minimum and maximum length limits.
-     * 
+     *
      * @param errorMessage
      *            the error message to return if validation fails
      * @param minLength
@@ -59,7 +59,7 @@ public class StringLengthValidator extends AbstractValidator<String> {
 
     /**
      * Gets the maximum permissible length of the string.
-     * 
+     *
      * @return the maximum length of the string or null if there is no limit
      */
     public Integer getMaxLength() {
@@ -68,7 +68,7 @@ public class StringLengthValidator extends AbstractValidator<String> {
 
     /**
      * Gets the minimum permissible length of the string.
-     * 
+     *
      * @return the minimum length of the string or null if there is no limit
      */
     public Integer getMinLength() {
@@ -77,7 +77,7 @@ public class StringLengthValidator extends AbstractValidator<String> {
 
     /**
      * Sets the maximum permissible length of the string.
-     * 
+     *
      * @param maxLength
      *            the maximum length to accept or null for no limit
      */
@@ -87,7 +87,7 @@ public class StringLengthValidator extends AbstractValidator<String> {
 
     /**
      * Sets the minimum permissible length.
-     * 
+     *
      * @param minLength
      *            the minimum length to accept or null for no limit
      */
diff --git a/server/src/main/java/com/vaadin/event/Action.java b/server/src/main/java/com/vaadin/event/Action.java
index 1af1de6e6d..95b2a896f1 100644
--- a/server/src/main/java/com/vaadin/event/Action.java
+++ b/server/src/main/java/com/vaadin/event/Action.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.server.Resource;
  * Implements the action framework. This class contains subinterfaces for action
  * handling and listing, and for action handler registrations and
  * unregistration.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -43,7 +43,7 @@ public class Action implements Serializable {
 
     /**
      * Constructs a new action with the given caption.
-     * 
+     *
      * @param caption
      *            the caption for the new action.
      */
@@ -53,7 +53,7 @@ public class Action implements Serializable {
 
     /**
      * Constructs a new action with the given caption string and icon.
-     * 
+     *
      * @param caption
      *            the caption for the new action.
      * @param icon
@@ -66,7 +66,7 @@ public class Action implements Serializable {
 
     /**
      * Returns the action's caption.
-     * 
+     *
      * @return the action's caption as a <code>String</code>.
      */
     public String getCaption() {
@@ -75,7 +75,7 @@ public class Action implements Serializable {
 
     /**
      * Returns the action's icon.
-     * 
+     *
      * @return the action's Icon.
      */
     public Resource getIcon() {
@@ -87,7 +87,7 @@ public class Action implements Serializable {
      * Action.Notifier (or NotifierProxy) via the <code>addAction()</code>
      * -method, which in many cases is easier than implementing the
      * Action.Handler interface.<br/>
-     * 
+     *
      */
     public interface Listener extends Serializable {
         public void handleAction(Object sender, Object target);
@@ -97,7 +97,7 @@ public class Action implements Serializable {
      * Action.Containers implementing this support an easier way of adding
      * single Actions than the more involved Action.Handler. The added actions
      * must be Action.Listeners, thus handling the action themselves.
-     * 
+     *
      */
     public interface Notifier extends Container {
         public <T extends Action & Action.Listener> void addAction(T action);
@@ -113,7 +113,7 @@ public class Action implements Serializable {
 
     /**
      * Interface implemented by classes who wish to handle actions.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -121,7 +121,7 @@ public class Action implements Serializable {
 
         /**
          * Gets the list of actions applicable to this handler.
-         * 
+         *
          * @param target
          *            the target handler to list actions for. For item
          *            containers this is the item id.
@@ -135,7 +135,7 @@ public class Action implements Serializable {
         /**
          * Handles an action for the given target. The handler method may just
          * discard the action if it's not suitable.
-         * 
+         *
          * @param action
          *            the action to be handled.
          * @param sender
@@ -154,7 +154,7 @@ public class Action implements Serializable {
      * to it. When the component receives an action targeting its contents it
      * should loop all action handlers registered to it and let them handle the
      * action.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -162,7 +162,7 @@ public class Action implements Serializable {
 
         /**
          * Registers a new action handler for this container
-         * 
+         *
          * @param actionHandler
          *            the new handler to be added.
          */
@@ -171,7 +171,7 @@ public class Action implements Serializable {
         /**
          * Removes a previously registered action handler for the contents of
          * this container.
-         * 
+         *
          * @param actionHandler
          *            the handler to be removed.
          */
@@ -180,7 +180,7 @@ public class Action implements Serializable {
 
     /**
      * Sets the caption.
-     * 
+     *
      * @param caption
      *            the caption to set.
      */
@@ -190,7 +190,7 @@ public class Action implements Serializable {
 
     /**
      * Sets the icon.
-     * 
+     *
      * @param icon
      *            the icon to set.
      */
diff --git a/server/src/main/java/com/vaadin/event/ActionManager.java b/server/src/main/java/com/vaadin/event/ActionManager.java
index e4b0b98a4a..85355cb653 100644
--- a/server/src/main/java/com/vaadin/event/ActionManager.java
+++ b/server/src/main/java/com/vaadin/event/ActionManager.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
@@ -29,15 +29,15 @@ import com.vaadin.ui.Component;
 
 /**
  * Javadoc TODO
- * 
+ *
  * Notes:
  * <p>
  * Empties the keymapper for each repaint to avoid leaks; can cause problems in
  * the future if the client assumes key don't change. (if lazyloading, one must
  * not cache results)
  * </p>
- * 
- * 
+ *
+ *
  */
 public class ActionManager
         implements Action.Container, Action.Handler, Action.Notifier {
diff --git a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
index 15fa0e8132..8bed286d24 100644
--- a/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorActionManager.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.Component;
  * <p>
  * This is mostly a workaround until shortcut actions are re-implemented in a
  * more sensible way.
- * 
+ *
  * @since 7.1.8
  * @author Vaadin Ltd
  */
@@ -39,7 +39,7 @@ public class ConnectorActionManager extends ActionManager {
 
     /**
      * Initialize an action manager for the given connector.
-     * 
+     *
      * @param connector
      *            the owner of this action manager
      */
@@ -51,7 +51,7 @@ public class ConnectorActionManager extends ActionManager {
     /**
      * Initialize an action manager for the given connector using the given
      * viewer.
-     * 
+     *
      * @param connector
      *            the owner of this action manager
      * @param viewer
@@ -65,7 +65,7 @@ public class ConnectorActionManager extends ActionManager {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.event.ActionManager#handleAction(com.vaadin.event.Action,
      * java.lang.Object, java.lang.Object)
      */
diff --git a/server/src/main/java/com/vaadin/event/ConnectorEvent.java b/server/src/main/java/com/vaadin/event/ConnectorEvent.java
index 9e9d3b00a6..b5bf3af738 100644
--- a/server/src/main/java/com/vaadin/event/ConnectorEvent.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorEvent.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
@@ -22,7 +22,7 @@ import com.vaadin.server.ClientConnector;
 
 /**
  * A base class for user interface events fired by connectors.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
  */
@@ -30,7 +30,7 @@ public abstract class ConnectorEvent extends EventObject {
 
     /**
      * Creates a new event fired by the given source.
-     * 
+     *
      * @param source
      *            the source connector
      */
@@ -40,7 +40,7 @@ public abstract class ConnectorEvent extends EventObject {
 
     /**
      * Returns the connector that fired the event.
-     * 
+     *
      * @return the source connector
      */
     public ClientConnector getConnector() {
diff --git a/server/src/main/java/com/vaadin/event/ConnectorEventListener.java b/server/src/main/java/com/vaadin/event/ConnectorEventListener.java
index e3cb9c283b..06e99fc204 100644
--- a/server/src/main/java/com/vaadin/event/ConnectorEventListener.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorEventListener.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/server/src/main/java/com/vaadin/event/ContextClickEvent.java b/server/src/main/java/com/vaadin/event/ContextClickEvent.java
index 56a9be1c7b..4b88aad50e 100644
--- a/server/src/main/java/com/vaadin/event/ContextClickEvent.java
+++ b/server/src/main/java/com/vaadin/event/ContextClickEvent.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.util.ReflectTools;
 /**
  * Context click event fired by a {@link Component}. ContextClickEvent happens
  * when context click happens on the client-side inside the Component.
- * 
+ *
  * @since 7.6
  * @author Vaadin Ltd
  */
@@ -48,7 +48,7 @@ public class ContextClickEvent extends ClickEvent {
 
         /**
          * Called when the context click happens.
-         * 
+         *
          * @param event
          *            the context click event
          */
@@ -63,7 +63,7 @@ public class ContextClickEvent extends ClickEvent {
         /**
          * Adds a context click listener that gets notified when a context click
          * happens.
-         * 
+         *
          * @param listener
          *            the context click listener to add
          */
@@ -72,7 +72,7 @@ public class ContextClickEvent extends ClickEvent {
         /**
          * Removes a context click listener that was previously added with
          * {@link #addContextClickListener(ContextClickListener)}.
-         * 
+         *
          * @param listener
          *            the context click listener to remove
          */
diff --git a/server/src/main/java/com/vaadin/event/DataBoundTransferable.java b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java
index d461692b2e..c11c38a381 100644
--- a/server/src/main/java/com/vaadin/event/DataBoundTransferable.java
+++ b/server/src/main/java/com/vaadin/event/DataBoundTransferable.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
@@ -25,13 +25,13 @@ import com.vaadin.ui.Component;
  * container as a data source. The transfer is associated with an item
  * (identified by its Id) and optionally also a property identifier (e.g. a
  * table column identifier when transferring a single table cell).
- * 
+ *
  * The component must implement the interface
  * {@link com.vaadin.data.Container.Viewer}.
- * 
+ *
  * In most cases, receivers of data transfers should depend on this class
  * instead of its concrete subclasses.
- * 
+ *
  * @since 6.3
  */
 public abstract class DataBoundTransferable extends TransferableImpl {
@@ -43,26 +43,26 @@ public abstract class DataBoundTransferable extends TransferableImpl {
 
     /**
      * Returns the identifier of the item being transferred.
-     * 
+     *
      * @return item identifier
      */
     public abstract Object getItemId();
 
     /**
      * Returns the optional property identifier that the transfer concerns.
-     * 
+     *
      * This can be e.g. the table column from which a drag operation originated.
-     * 
+     *
      * @return property identifier
      */
     public abstract Object getPropertyId();
 
     /**
      * Returns the container data source from which the transfer occurs.
-     * 
+     *
      * {@link com.vaadin.data.Container.Viewer#getContainerDataSource()} is used
      * to obtain the underlying container of the source component.
-     * 
+     *
      * @return Container
      */
     public Container getSourceContainer() {
diff --git a/server/src/main/java/com/vaadin/event/EventRouter.java b/server/src/main/java/com/vaadin/event/EventRouter.java
index 7d83574bbe..2ca65a61ec 100644
--- a/server/src/main/java/com/vaadin/event/EventRouter.java
+++ b/server/src/main/java/com/vaadin/event/EventRouter.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
@@ -32,7 +32,7 @@ import com.vaadin.server.ErrorHandler;
  * <code>EventRouter</code> class implementing the inheritable event listening
  * model. For more information on the event model see the
  * {@link com.vaadin.event package documentation}.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -155,7 +155,7 @@ public class EventRouter implements MethodEventSource {
     /**
      * Sends an event to all registered listeners. The listeners will decide if
      * the activation method should be called or not.
-     * 
+     *
      * @param event
      *            the Event to be sent to all listeners.
      */
@@ -170,7 +170,7 @@ public class EventRouter implements MethodEventSource {
      * If an error handler is set, the processing of other listeners will
      * continue after the error handler method call unless the error handler
      * itself throws an exception.
-     * 
+     *
      * @param event
      *            the Event to be sent to all listeners.
      * @param errorHandler
@@ -207,7 +207,7 @@ public class EventRouter implements MethodEventSource {
     /**
      * Checks if the given Event type is listened by a listener registered to
      * this router.
-     * 
+     *
      * @param eventType
      *            the event type to be checked
      * @return true if a listener is registered for the given event type
@@ -225,7 +225,7 @@ public class EventRouter implements MethodEventSource {
 
     /**
      * Returns all listeners that match or extend the given event type.
-     * 
+     *
      * @param eventType
      *            The type of event to return listeners for.
      * @return A collection with all registered listeners. Empty if no listeners
diff --git a/server/src/main/java/com/vaadin/event/ItemClickEvent.java b/server/src/main/java/com/vaadin/event/ItemClickEvent.java
index 1280c16872..ebcae610f3 100644
--- a/server/src/main/java/com/vaadin/event/ItemClickEvent.java
+++ b/server/src/main/java/com/vaadin/event/ItemClickEvent.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
@@ -25,14 +25,14 @@ import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.ui.Component;
 
 /**
- * 
+ *
  * Click event fired by a {@link Component} implementing
  * {@link com.vaadin.data.Container} interface. ItemClickEvents happens on an
  * {@link Item} rendered somehow on terminal. Event may also contain a specific
  * {@link Property} on which the click event happened.
- * 
+ *
  * @since 5.3
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class ItemClickEvent extends ClickEvent implements Serializable {
@@ -50,7 +50,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
 
     /**
      * Gets the item on which the click event occurred.
-     * 
+     *
      * @return item which was clicked
      */
     public Item getItem() {
@@ -59,7 +59,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
 
     /**
      * Gets a possible identifier in source for clicked Item
-     * 
+     *
      * @return
      */
     public Object getItemId() {
@@ -70,7 +70,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
      * Returns property on which click event occurred. Returns null if source
      * cannot be resolved at property level. For example if clicked a cell in
      * table, the "column id" is returned.
-     * 
+     *
      * @return a property id of clicked property or null if click didn't occur
      *         on any distinct property.
      */
@@ -107,7 +107,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
      * class really will send the events, or if it just defines the methods to
      * be able to implement an interface.
      * </p>
-     * 
+     *
      * @since 6.5
      * @see ItemClickListener
      * @see ItemClickEvent
@@ -115,7 +115,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
     public interface ItemClickNotifier extends Serializable {
         /**
          * Register a listener to handle {@link ItemClickEvent}s.
-         * 
+         *
          * @param listener
          *            ItemClickListener to be registered
          */
@@ -130,7 +130,7 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
 
         /**
          * Removes an ItemClickListener.
-         * 
+         *
          * @param listener
          *            ItemClickListener to be removed
          */
diff --git a/server/src/main/java/com/vaadin/event/LayoutEvents.java b/server/src/main/java/com/vaadin/event/LayoutEvents.java
index 5b7cb4372d..d3894ad617 100644
--- a/server/src/main/java/com/vaadin/event/LayoutEvents.java
+++ b/server/src/main/java/com/vaadin/event/LayoutEvents.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
@@ -35,7 +35,7 @@ public interface LayoutEvents {
 
         /**
          * Layout has been clicked
-         * 
+         *
          * @param event
          *            Component click event.
          */
@@ -56,7 +56,7 @@ public interface LayoutEvents {
      * class really will send the events, or if it just defines the methods to
      * be able to implement an interface.
      * </p>
-     * 
+     *
      * @since 6.5.2
      * @see LayoutClickListener
      * @see LayoutClickEvent
@@ -68,13 +68,13 @@ public interface LayoutEvents {
          * the click targets a component inside a nested layout or Panel,
          * provided the targeted component does not prevent the click event from
          * propagating. A caption is not considered part of a component.
-         * 
+         *
          * The child component that was clicked is included in the
          * {@link LayoutClickEvent}.
-         * 
+         *
          * Use {@link #removeListener(LayoutClickListener)} to remove the
          * listener.
-         * 
+         *
          * @param listener
          *            The listener to add
          */
@@ -89,7 +89,7 @@ public interface LayoutEvents {
 
         /**
          * Removes an LayoutClickListener.
-         * 
+         *
          * @param listener
          *            LayoutClickListener to be removed
          */
@@ -124,10 +124,10 @@ public interface LayoutEvents {
         /**
          * Returns the component that was clicked, which is somewhere inside the
          * parent layout on which the listener was registered.
-         * 
+         *
          * For the direct child component of the layout, see
          * {@link #getChildComponent()}.
-         * 
+         *
          * @return clicked {@link Component}, null if none found
          */
         public Component getClickedComponent() {
@@ -137,10 +137,10 @@ public interface LayoutEvents {
         /**
          * Returns the direct child component of the layout which contains the
          * clicked component.
-         * 
+         *
          * For the clicked component inside that child component of the layout,
          * see {@link #getClickedComponent()}.
-         * 
+         *
          * @return direct child {@link Component} of the layout which contains
          *         the clicked Component, null if none found
          */
diff --git a/server/src/main/java/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java
index 979da5a06b..478690b652 100644
--- a/server/src/main/java/com/vaadin/event/ListenerMethod.java
+++ b/server/src/main/java/com/vaadin/event/ListenerMethod.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
@@ -33,20 +33,20 @@ import java.util.logging.Logger;
  * fires, and the optional argument list to pass to the method and the index of
  * the argument to replace with the event object.
  * </p>
- * 
+ *
  * <p>
  * This Class provides several constructors that allow omission of the optional
  * arguments, and giving the listener method directly, or having the constructor
  * to reflect it using merely the name of the method.
  * </p>
- * 
+ *
  * <p>
  * It should be pointed out that the method
  * {@link #receiveEvent(EventObject event)} is the one that filters out the
  * events that do not match with the given event type and thus do not result in
  * calling of the trigger method.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -148,12 +148,12 @@ public class ListenerMethod implements EventListener, Serializable {
      * the argument index specifying which one is replaced with the event object
      * when the trigger method is called.
      * </p>
-     * 
+     *
      * <p>
      * This constructor gets the trigger method as a parameter so it does not
      * need to reflect to find it out.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -217,7 +217,7 @@ public class ListenerMethod implements EventListener, Serializable {
      * <code>object</code>, and <code>java.lang.IllegalArgumentException</code>
      * is thrown unless exactly one match is found.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -287,12 +287,12 @@ public class ListenerMethod implements EventListener, Serializable {
      * the event triggering this listener will not be passed to the trigger
      * method.
      * </p>
-     * 
+     *
      * <p>
      * This constructor gets the trigger method as a parameter so it does not
      * need to reflect to find it out.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -331,13 +331,13 @@ public class ListenerMethod implements EventListener, Serializable {
      * the event triggering this listener will not be passed to the trigger
      * method.
      * </p>
-     * 
+     *
      * <p>
      * The actual trigger method is reflected from <code>target</code>, and
      * <code>java.lang.IllegalArgumentException</code> is thrown unless exactly
      * one match is found.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -382,12 +382,12 @@ public class ListenerMethod implements EventListener, Serializable {
      * list is unspecified no parameters are passed to the trigger method when
      * the listener is triggered.
      * </p>
-     * 
+     *
      * <p>
      * This constructor gets the trigger method as a parameter so it does not
      * need to reflect to find it out.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -435,13 +435,13 @@ public class ListenerMethod implements EventListener, Serializable {
      * argument list is unspecified no parameters are passed to the trigger
      * method when the listener is triggered.
      * </p>
-     * 
+     *
      * <p>
      * The actual trigger method is reflected from <code>object</code>, and
      * <code>java.lang.IllegalArgumentException</code> is thrown unless exactly
      * one match is found.
      * </p>
-     * 
+     *
      * @param eventType
      *            the event type that is listener listens to. All events of this
      *            kind (or its subclasses) result in calling the trigger method.
@@ -495,7 +495,7 @@ public class ListenerMethod implements EventListener, Serializable {
      * trigger method if it matches with the criteria defined for the listener.
      * Only the events of the same or subclass of the specified event class
      * result in the trigger method to be called.
-     * 
+     *
      * @param event
      *            the fired event. Unless the trigger method's argument list and
      *            the index to the to be replaced argument is specified, this
@@ -538,7 +538,7 @@ public class ListenerMethod implements EventListener, Serializable {
     /**
      * Checks if the given object and event match with the ones stored in this
      * listener.
-     * 
+     *
      * @param target
      *            the object to be matched against the object stored by this
      *            listener.
@@ -556,7 +556,7 @@ public class ListenerMethod implements EventListener, Serializable {
     /**
      * Checks if the given object, event and method match with the ones stored
      * in this listener.
-     * 
+     *
      * @param target
      *            the object to be matched against the object stored by this
      *            listener.
@@ -619,7 +619,7 @@ public class ListenerMethod implements EventListener, Serializable {
      * <code>ListenerMethod</code> invokes the target method, it may throw
      * arbitrary exception. The original exception is wrapped into
      * MethodException instance and rethrown by the <code>ListenerMethod</code>.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -634,7 +634,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
     /**
      * Compares the type of this ListenerMethod to the given type
-     * 
+     *
      * @param eventType
      *            The type to compare with
      * @return true if this type of this ListenerMethod matches the given type,
@@ -646,7 +646,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
     /**
      * Compares the type of this ListenerMethod to the given type
-     * 
+     *
      * @param eventType
      *            The type to compare with
      * @return true if this event type can be assigned to the given type, false
@@ -658,7 +658,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
     /**
      * Returns the target object which contains the trigger method.
-     * 
+     *
      * @return The target object
      */
     public Object getTarget() {
diff --git a/server/src/main/java/com/vaadin/event/MethodEventSource.java b/server/src/main/java/com/vaadin/event/MethodEventSource.java
index 43fcb901e1..b1aaa29670 100644
--- a/server/src/main/java/com/vaadin/event/MethodEventSource.java
+++ b/server/src/main/java/com/vaadin/event/MethodEventSource.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
@@ -23,12 +23,12 @@ import java.lang.reflect.Method;
  * <p>
  * Interface for classes supporting registration of methods as event receivers.
  * </p>
- * 
+ *
  * <p>
  * For more information on the inheritable event mechanism see the
  * {@link com.vaadin.event com.vaadin.event package documentation}.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -41,12 +41,12 @@ public interface MethodEventSource extends Serializable {
      * not have any arguments the event object will not be passed to it when
      * it's called.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the type of the listened event. Events of this type or its
      *            subclasses activate the listener.
@@ -67,19 +67,19 @@ public interface MethodEventSource extends Serializable {
      * have any arguments the event object will not be passed to it when it's
      * called.
      * </p>
-     * 
+     *
      * <p>
      * This version of <code>addListener</code> gets the name of the activation
      * method as a parameter. The actual method is reflected from
      * <code>object</code>, and unless exactly one match is found,
      * <code>java.lang.IllegalArgumentException</code> is thrown.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the type of the listened event. Events of this type or its
      *            subclasses activate the listener.
@@ -100,12 +100,12 @@ public interface MethodEventSource extends Serializable {
      * parameters, it will unregister all <code>object</code>'s methods that are
      * registered to listen to events of type <code>eventType</code> generated
      * by this component.
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
@@ -118,12 +118,12 @@ public interface MethodEventSource extends Serializable {
      * Removes one registered listener method. The given method owned by the
      * given object will no longer be called when the specified events are
      * generated by this component.
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
@@ -142,19 +142,19 @@ public interface MethodEventSource extends Serializable {
      * given object will no longer be called when the specified events are
      * generated by this component.
      * </p>
-     * 
+     *
      * <p>
      * This version of <code>removeListener</code> gets the name of the
      * activation method as a parameter. The actual method is reflected from the
      * target, and unless exactly one match is found,
      * <code>java.lang.IllegalArgumentException</code> is thrown.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
diff --git a/server/src/main/java/com/vaadin/event/MouseEvents.java b/server/src/main/java/com/vaadin/event/MouseEvents.java
index 855c073125..49bbc0d9d8 100644
--- a/server/src/main/java/com/vaadin/event/MouseEvents.java
+++ b/server/src/main/java/com/vaadin/event/MouseEvents.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
@@ -25,7 +25,7 @@ import com.vaadin.util.ReflectTools;
 
 /**
  * Interface that serves as a wrapper for mouse related events.
- * 
+ *
  * @author Vaadin Ltd.
  * @see ClickListener
  * @since 6.2
@@ -36,10 +36,10 @@ public interface MouseEvents {
      * Class for holding information about a mouse click event. A
      * {@link ClickEvent} is fired when the user clicks on a
      * <code>Component</code>.
-     * 
+     *
      * The information available for click events are terminal dependent.
      * Correct values for all event details cannot be guaranteed.
-     * 
+     *
      * @author Vaadin Ltd.
      * @see ClickListener
      * @since 6.2
@@ -72,7 +72,7 @@ public interface MouseEvents {
          * Returns an identifier describing which mouse button the user pushed.
          * Compare with {@link MouseButton#LEFT},{@link MouseButton#MIDDLE},
          * {@link Button#RIGHT} to find out which button it is.
-         * 
+         *
          * @return one of {@link MouseButton#LEFT}, {@link MouseButton#MIDDLE},
          *         {@link MouseButton#RIGHT}.
          */
@@ -83,7 +83,7 @@ public interface MouseEvents {
         /**
          * Returns the mouse position (x coordinate) when the click took place.
          * The position is relative to the browser client area.
-         * 
+         *
          * @return The mouse cursor x position
          */
         public int getClientX() {
@@ -93,7 +93,7 @@ public interface MouseEvents {
         /**
          * Returns the mouse position (y coordinate) when the click took place.
          * The position is relative to the browser client area.
-         * 
+         *
          * @return The mouse cursor y position
          */
         public int getClientY() {
@@ -103,7 +103,7 @@ public interface MouseEvents {
         /**
          * Returns the relative mouse position (x coordinate) when the click
          * took place. The position is relative to the clicked component.
-         * 
+         *
          * @return The mouse cursor x position relative to the clicked layout
          *         component or -1 if no x coordinate available
          */
@@ -114,7 +114,7 @@ public interface MouseEvents {
         /**
          * Returns the relative mouse position (y coordinate) when the click
          * took place. The position is relative to the clicked component.
-         * 
+         *
          * @return The mouse cursor y position relative to the clicked layout
          *         component or -1 if no y coordinate available
          */
@@ -124,7 +124,7 @@ public interface MouseEvents {
 
         /**
          * Checks if the event is a double click event.
-         * 
+         *
          * @return true if the event is a double click event, false otherwise
          */
         public boolean isDoubleClick() {
@@ -133,7 +133,7 @@ public interface MouseEvents {
 
         /**
          * Checks if the Alt key was down when the mouse event took place.
-         * 
+         *
          * @return true if Alt was down when the event occured, false otherwise
          */
         public boolean isAltKey() {
@@ -142,7 +142,7 @@ public interface MouseEvents {
 
         /**
          * Checks if the Ctrl key was down when the mouse event took place.
-         * 
+         *
          * @return true if Ctrl was pressed when the event occured, false
          *         otherwise
          */
@@ -152,7 +152,7 @@ public interface MouseEvents {
 
         /**
          * Checks if the Meta key was down when the mouse event took place.
-         * 
+         *
          * @return true if Meta was pressed when the event occured, false
          *         otherwise
          */
@@ -162,7 +162,7 @@ public interface MouseEvents {
 
         /**
          * Checks if the Shift key was down when the mouse event took place.
-         * 
+         *
          * @return true if Shift was pressed when the event occured, false
          *         otherwise
          */
@@ -175,7 +175,7 @@ public interface MouseEvents {
          * pushed. This is meant for debug purposes only and the string returned
          * could change. Use {@link #getButton()} to check which button was
          * pressed.
-         * 
+         *
          * @since 6.3
          * @return A string representation of which button was pushed.
          */
@@ -187,7 +187,7 @@ public interface MouseEvents {
     /**
      * Interface for listening for a {@link ClickEvent} fired by a
      * {@link Component}.
-     * 
+     *
      * @see ClickEvent
      * @author Vaadin Ltd.
      * @since 6.2
@@ -200,7 +200,7 @@ public interface MouseEvents {
         /**
          * Called when a {@link Component} has been clicked. A reference to the
          * component is given by {@link ClickEvent#getComponent()}.
-         * 
+         *
          * @param event
          *            An event containing information about the click.
          */
@@ -210,7 +210,7 @@ public interface MouseEvents {
     /**
      * Class for holding additional event information for DoubleClick events.
      * Fired when the user double-clicks on a <code>Component</code>.
-     * 
+     *
      * @see ClickEvent
      * @author Vaadin Ltd.
      * @since 6.2
@@ -225,7 +225,7 @@ public interface MouseEvents {
     /**
      * Interface for listening for a {@link DoubleClickEvent} fired by a
      * {@link Component}.
-     * 
+     *
      * @see DoubleClickEvent
      * @author Vaadin Ltd.
      * @since 6.2
@@ -239,7 +239,7 @@ public interface MouseEvents {
         /**
          * Called when a {@link Component} has been double clicked. A reference
          * to the component is given by {@link DoubleClickEvent#getComponent()}.
-         * 
+         *
          * @param event
          *            An event containing information about the double click.
          */
diff --git a/server/src/main/java/com/vaadin/event/Registration.java b/server/src/main/java/com/vaadin/event/Registration.java
index ab393e4750..94286629ee 100644
--- a/server/src/main/java/com/vaadin/event/Registration.java
+++ b/server/src/main/java/com/vaadin/event/Registration.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
@@ -19,7 +19,7 @@ import java.io.Serializable;
 
 /**
  * A registration object for removing an event listener added to a source.
- * 
+ *
  * @author Vaadin Ltd.
  * @since
  */
diff --git a/server/src/main/java/com/vaadin/event/SelectionEvent.java b/server/src/main/java/com/vaadin/event/SelectionEvent.java
index 5f11818af9..b8fdbeec14 100644
--- a/server/src/main/java/com/vaadin/event/SelectionEvent.java
+++ b/server/src/main/java/com/vaadin/event/SelectionEvent.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
@@ -25,7 +25,7 @@ import java.util.Set;
 /**
  * An event that specifies what in a selection has changed, and where the
  * selection took place.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -46,7 +46,7 @@ public class SelectionEvent extends EventObject {
      * <p>
      * <em>Note:</em> this excludes all itemIds that might have been previously
      * selected.
-     * 
+     *
      * @return a Collection of the itemIds that became selected
      */
     public Set<Object> getAdded() {
@@ -58,7 +58,7 @@ public class SelectionEvent extends EventObject {
      * <p>
      * <em>Note:</em> this excludes all itemIds that might have been previously
      * deselected.
-     * 
+     *
      * @return a Collection of the itemIds that became deselected
      */
     public Set<Object> getRemoved() {
@@ -87,7 +87,7 @@ public class SelectionEvent extends EventObject {
 
     /**
      * A {@link Collection} of all the itemIds that are currently selected.
-     * 
+     *
      * @return a Collection of the itemIds that are currently selected
      */
     public Set<Object> getSelected() {
@@ -101,7 +101,7 @@ public class SelectionEvent extends EventObject {
     public interface SelectionListener extends Serializable {
         /**
          * Notifies the listener that the selection state has changed.
-         * 
+         *
          * @param event
          *            the selection change event
          */
@@ -115,7 +115,7 @@ public class SelectionEvent extends EventObject {
     public interface SelectionNotifier extends Serializable {
         /**
          * Registers a new selection listener
-         * 
+         *
          * @param listener
          *            the listener to register
          */
@@ -123,7 +123,7 @@ public class SelectionEvent extends EventObject {
 
         /**
          * Removes a previously registered selection change listener
-         * 
+         *
          * @param listener
          *            the listener to remove
          */
diff --git a/server/src/main/java/com/vaadin/event/ShortcutAction.java b/server/src/main/java/com/vaadin/event/ShortcutAction.java
index 2d719cd8e1..15b5056f9a 100644
--- a/server/src/main/java/com/vaadin/event/ShortcutAction.java
+++ b/server/src/main/java/com/vaadin/event/ShortcutAction.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
@@ -47,7 +47,7 @@ import com.vaadin.ui.Window;
  * very well supported yet, but it might still be a good idea to give a caption
  * to the shortcut.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 4.0.1
  */
@@ -63,7 +63,7 @@ public class ShortcutAction extends Action {
      * (optionally) {@link ModifierKey}s. <br/>
      * The shortcut might be shown in the UI (e.g context menu), in which case
      * the caption will be used.
-     * 
+     *
      * @param caption
      *            used when displaying the shortcut visually
      * @param kc
@@ -82,7 +82,7 @@ public class ShortcutAction extends Action {
      * (optionally) {@link ModifierKey}s. <br/>
      * The shortcut might be shown in the UI (e.g context menu), in which case
      * the caption and icon will be used.
-     * 
+     *
      * @param caption
      *            used when displaying the shortcut visually
      * @param icon
@@ -151,7 +151,7 @@ public class ShortcutAction extends Action {
      * <code>"Save&&&close"</code> will respond to ALT-C, and the caption will
      * say "Save&close".
      * </p>
-     * 
+     *
      * @param shorthandCaption
      *            the caption in modifier shorthand
      */
@@ -171,7 +171,7 @@ public class ShortcutAction extends Action {
      * <code>new ShortcutAction("Do &stuff", new int[]{ShortcutAction.ModifierKey.CTRL}));</code>
      * will respond to CTRL-S.
      * </p>
-     * 
+     *
      * @param shorthandCaption
      * @param modifierKeys
      */
@@ -222,7 +222,7 @@ public class ShortcutAction extends Action {
     /**
      * When setting modifiers, make sure that modifiers is a valid array AND
      * that it's sorted.
-     * 
+     *
      * @param modifiers
      *            the modifier keys for this shortcut
      */
@@ -238,7 +238,7 @@ public class ShortcutAction extends Action {
     /**
      * Get the {@link KeyCode} that this shortcut reacts to (in combination with
      * the {@link ModifierKey}s).
-     * 
+     *
      * @return keycode for this shortcut
      */
     public int getKeyCode() {
@@ -247,7 +247,7 @@ public class ShortcutAction extends Action {
 
     /**
      * Get the {@link ModifierKey}s required for the shortcut to react.
-     * 
+     *
      * @return modifier keys for this shortcut
      */
     public int[] getModifiers() {
@@ -256,7 +256,7 @@ public class ShortcutAction extends Action {
 
     /**
      * Key codes that can be used for shortcuts
-     * 
+     *
      */
     public interface KeyCode extends Serializable {
         public static final int ENTER = 13;
@@ -388,7 +388,7 @@ public class ShortcutAction extends Action {
 
     /**
      * Modifier key constants
-     * 
+     *
      */
     public interface ModifierKey extends Serializable {
         public static final int SHIFT = 16;
diff --git a/server/src/main/java/com/vaadin/event/ShortcutListener.java b/server/src/main/java/com/vaadin/event/ShortcutListener.java
index 850791f176..2c9fb97d9e 100644
--- a/server/src/main/java/com/vaadin/event/ShortcutListener.java
+++ b/server/src/main/java/com/vaadin/event/ShortcutListener.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/server/src/main/java/com/vaadin/event/SortEvent.java b/server/src/main/java/com/vaadin/event/SortEvent.java
index f303e47781..645ae18c17 100644
--- a/server/src/main/java/com/vaadin/event/SortEvent.java
+++ b/server/src/main/java/com/vaadin/event/SortEvent.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,9 +24,9 @@ import com.vaadin.ui.Component;
 /**
  * Event describing a change in sorting of a {@link Container}. Fired by
  * {@link SortNotifier SortNotifiers}.
- * 
+ *
  * @see SortListener
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -37,7 +37,7 @@ public class SortEvent extends Component.Event {
 
     /**
      * Creates a new sort order change event with a sort order list.
-     * 
+     *
      * @param source
      *            the component from which the event originates
      * @param sortOrder
@@ -55,7 +55,7 @@ public class SortEvent extends Component.Event {
 
     /**
      * Gets the sort order list.
-     * 
+     *
      * @return the sort order list
      */
     public List<SortOrder> getSortOrder() {
@@ -64,7 +64,7 @@ public class SortEvent extends Component.Event {
 
     /**
      * Returns whether this event originated from actions done by the user.
-     * 
+     *
      * @return true if sort event originated from user interaction
      */
     public boolean isUserOriginated() {
@@ -77,7 +77,7 @@ public class SortEvent extends Component.Event {
     public interface SortListener extends Serializable {
         /**
          * Called when the sort order has changed.
-         * 
+         *
          * @param event
          *            the sort order change event
          */
@@ -92,7 +92,7 @@ public class SortEvent extends Component.Event {
         /**
          * Adds a sort order change listener that gets notified when the sort
          * order changes.
-         * 
+         *
          * @param listener
          *            the sort order change listener to add
          */
@@ -101,7 +101,7 @@ public class SortEvent extends Component.Event {
         /**
          * Removes a sort order change listener previously added using
          * {@link #addSortListener(SortListener)}.
-         * 
+         *
          * @param listener
          *            the sort order change listener to remove
          */
diff --git a/server/src/main/java/com/vaadin/event/Transferable.java b/server/src/main/java/com/vaadin/event/Transferable.java
index 9cfbba5161..a0361e0bbb 100644
--- a/server/src/main/java/com/vaadin/event/Transferable.java
+++ b/server/src/main/java/com/vaadin/event/Transferable.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
 /**
  * Transferable wraps the data that is to be imported into another component.
  * Currently Transferable is only used for drag and drop.
- * 
+ *
  * @since 6.3
  */
 public interface Transferable extends Serializable {
@@ -35,7 +35,7 @@ public interface Transferable extends Serializable {
      * <p>
      * Note, implementations of {@link Transferable} often provide a better
      * typed API for accessing data.
-     * 
+     *
      * @param dataFlavor
      *            the data flavor to be returned from Transferable
      * @return the data stored in the Transferable or null if Transferable
@@ -46,7 +46,7 @@ public interface Transferable extends Serializable {
     /**
      * Stores data of given data flavor to Transferable. Possibly existing value
      * of the same data flavor will be replaced.
-     * 
+     *
      * @param dataFlavor
      *            the data flavor
      * @param value
diff --git a/server/src/main/java/com/vaadin/event/TransferableImpl.java b/server/src/main/java/com/vaadin/event/TransferableImpl.java
index 9c8e79f1bf..6ec867daf0 100644
--- a/server/src/main/java/com/vaadin/event/TransferableImpl.java
+++ b/server/src/main/java/com/vaadin/event/TransferableImpl.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
 
 /**
  * TODO Javadoc!
- * 
+ *
  * @since 6.3
  */
 public class TransferableImpl implements Transferable {
diff --git a/server/src/main/java/com/vaadin/event/UIEvents.java b/server/src/main/java/com/vaadin/event/UIEvents.java
index 9e051e6682..83e24887f7 100644
--- a/server/src/main/java/com/vaadin/event/UIEvents.java
+++ b/server/src/main/java/com/vaadin/event/UIEvents.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
@@ -25,7 +25,7 @@ import com.vaadin.util.ReflectTools;
 /**
  * A class that contains events, listeners and handlers specific to the
  * {@link UI} class.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -34,7 +34,7 @@ public interface UIEvents {
     /**
      * A {@link PollListener} receives and handles {@link PollEvent PollEvents}
      * fired by {@link PollNotifier PollNotifiers}.
-     * 
+     *
      * @since 7.2
      * @author Vaadin Ltd
      */
@@ -44,7 +44,7 @@ public interface UIEvents {
 
         /**
          * A poll request has been received by the server.
-         * 
+         *
          * @param event
          *            poll event
          */
@@ -54,7 +54,7 @@ public interface UIEvents {
     /**
      * An event that is fired whenever a client polls the server for
      * asynchronous UI updates.
-     * 
+     *
      * @since 7.2
      * @author Vaadin Ltd
      */
@@ -65,7 +65,7 @@ public interface UIEvents {
 
         /**
          * Get the {@link UI} instance that received the poll request.
-         * 
+         *
          * @return the {@link UI} that received the poll request. Never
          *         <code>null</code>.
          */
@@ -85,7 +85,7 @@ public interface UIEvents {
      * able to send {@link PollEvent PollEvents} whenever the client sends a
      * periodic poll message to the client, to check for asynchronous
      * server-side modifications.
-     * 
+     *
      * @since 7.2
      * @see UI#setPollInterval(int)
      */
@@ -95,7 +95,7 @@ public interface UIEvents {
          * <p>
          * The listener is called whenever the client polls the server for
          * asynchronous UI updates.
-         * 
+         *
          * @see UI#setPollInterval(int)
          * @see #removePollListener(PollListener)
          * @param listener
@@ -105,7 +105,7 @@ public interface UIEvents {
 
         /**
          * Remove a poll listener.
-         * 
+         *
          * @see #addPollListener(PollListener)
          * @param listener
          *            the listener to be removed
diff --git a/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.java b/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.java
index 661c7ed1cc..a2668b67b6 100644
--- a/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.java
+++ b/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.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
@@ -29,9 +29,9 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
  * DragAndDropEvent instances contains both the dragged data in
  * {@link Transferable} (generated by {@link DragSource} and details about the
  * current drop event in {@link TargetDetails} (generated by {@link DropTarget}.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public class DragAndDropEvent implements Serializable {
     private Transferable transferable;
diff --git a/server/src/main/java/com/vaadin/event/dd/DragSource.java b/server/src/main/java/com/vaadin/event/dd/DragSource.java
index 8e4d43bfc4..db576906e7 100644
--- a/server/src/main/java/com/vaadin/event/dd/DragSource.java
+++ b/server/src/main/java/com/vaadin/event/dd/DragSource.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
@@ -33,16 +33,16 @@ import com.vaadin.ui.Tree;
  * implementation lets it create the {@link Transferable} instance from the raw
  * client side "seed data". This way server side implementation may translate or
  * extend the data that will be available for {@link DropHandler}.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public interface DragSource extends Component {
 
     /**
      * DragSource may convert data added by client side component to meaningful
      * values for server side developer or add other data based on it.
-     * 
+     *
      * <p>
      * For example Tree converts item identifiers to generated string keys for
      * the client side. Vaadin developer don't and can't know anything about
@@ -51,7 +51,7 @@ public interface DragSource extends Component {
      * counterpart. In {@link Tree#getTransferable(Map)} the key is converted
      * back to item identifier that the server side developer can use.
      * <p>
-     * 
+     *
      * @since 6.3
      * @param rawVariables
      *            the data that client side initially included in
diff --git a/server/src/main/java/com/vaadin/event/dd/DropHandler.java b/server/src/main/java/com/vaadin/event/dd/DropHandler.java
index c45ae7e7d3..0e0387741a 100644
--- a/server/src/main/java/com/vaadin/event/dd/DropHandler.java
+++ b/server/src/main/java/com/vaadin/event/dd/DropHandler.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
@@ -29,9 +29,9 @@ import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
  * data and the {@link #getAcceptCriterion()} method contains the (possibly
  * client side verifiable) criterion whether the dragged data will be handled at
  * all.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public interface DropHandler extends Serializable {
 
@@ -41,7 +41,7 @@ public interface DropHandler extends Serializable {
      * {@link AcceptCriterion} defined by {@link #getAcceptCriterion()} method.
      * The actual business logic of drag and drop operation is implemented into
      * this method.
-     * 
+     *
      * @param event
      *            the event related to this drop
      */
@@ -65,7 +65,7 @@ public interface DropHandler extends Serializable {
      * If developer wants to handle everything in the
      * {@link #drop(DragAndDropEvent)} method, {@link AcceptAll} instance can be
      * returned.
-     * 
+     *
      * @return the {@link AcceptCriterion}
      */
     public AcceptCriterion getAcceptCriterion();
diff --git a/server/src/main/java/com/vaadin/event/dd/DropTarget.java b/server/src/main/java/com/vaadin/event/dd/DropTarget.java
index f96170cf98..41e2c10b99 100644
--- a/server/src/main/java/com/vaadin/event/dd/DropTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/DropTarget.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
  * DropTarget is an interface for components supporting drop operations. A
  * component that wants to receive drop events should implement this interface
  * and provide a {@link DropHandler} which will handle the actual drop event.
- * 
+ *
  * @since 6.3
  */
 public interface DropTarget extends Component {
@@ -40,9 +40,9 @@ public interface DropTarget extends Component {
      * target details provided by the client side (drop target) to meaningful
      * server side values. If null is returned the terminal implementation will
      * automatically create a {@link TargetDetails} with raw client side data.
-     * 
+     *
      * @see DragSource#getTransferable(Map)
-     * 
+     *
      * @param clientVariables
      *            data passed from the DropTargets client side counterpart.
      * @return A DropTargetDetails object with the translated data or null to
diff --git a/server/src/main/java/com/vaadin/event/dd/TargetDetails.java b/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
index b5635bc2a8..0e1b07b7c9 100644
--- a/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
+++ b/server/src/main/java/com/vaadin/event/dd/TargetDetails.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
@@ -27,15 +27,15 @@ import com.vaadin.ui.Tree.TreeTargetDetails;
  * preferable to cast the TargetDetails to an implementation provided by
  * DropTarget like {@link TreeTargetDetails}. They often provide a better typed,
  * drop target specific API.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public interface TargetDetails extends Serializable {
 
     /**
      * Gets target data associated with the given string key
-     * 
+     *
      * @param key
      * @return The data associated with the key
      */
diff --git a/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.java b/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.java
index 8a6ec506ba..26ca938cac 100644
--- a/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.java
+++ b/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.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
@@ -23,9 +23,9 @@ import com.vaadin.shared.MouseEventDetails;
 /**
  * A HashMap backed implementation of {@link TargetDetails} for terminal
  * implementation and for extension.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class TargetDetailsImpl implements TargetDetails {
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
index fa6a4c2b9a..f698a64652 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -24,10 +24,10 @@ import com.vaadin.event.dd.DragAndDropEvent;
  * Criterion that accepts all drops anywhere on the component.
  * <p>
  * Note! Class is singleton, use {@link #get()} method to get the instance.
- * 
- * 
+ *
+ *
  * @since 6.3
- * 
+ *
  */
 public final class AcceptAll extends ClientSideCriterion {
 
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
index a968cd8741..a5ef7fc896 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -29,23 +29,23 @@ import com.vaadin.server.PaintTarget;
 /**
  * Criterion that can be used create policy to accept/discard dragged content
  * (presented by {@link Transferable}).
- * 
+ *
  * The drag and drop mechanism will verify the criteria returned by
  * {@link DropHandler#getAcceptCriterion()} before calling
  * {@link DropHandler#drop(DragAndDropEvent)}.
- * 
+ *
  * The criteria can be evaluated either on the client (browser - see
  * {@link ClientSideCriterion}) or on the server (see
  * {@link ServerSideCriterion}). If no constraints are needed, an
  * {@link AcceptAll} can be used.
- * 
+ *
  * In addition to accepting or rejecting a possible drop, criteria can provide
  * additional hints for client side painting.
- * 
+ *
  * @see DropHandler
  * @see ClientSideCriterion
  * @see ServerSideCriterion
- * 
+ *
  * @since 6.3
  */
 public interface AcceptCriterion extends Serializable {
@@ -53,7 +53,7 @@ public interface AcceptCriterion extends Serializable {
     /**
      * Returns whether the criteria can be checked on the client or whether a
      * server request is needed to check the criteria.
-     * 
+     *
      * This requirement may depend on the state of the criterion (e.g. logical
      * operations between criteria), so this cannot be based on a marker
      * interface.
@@ -67,7 +67,7 @@ public interface AcceptCriterion extends Serializable {
      * initialization. The UIDL painted in this method will be passed to client
      * side drop handler implementation. Implementation can assume that
      * {@link #accept(DragAndDropEvent)} is called before this method.
-     * 
+     *
      * @param target
      * @throws PaintException
      */
@@ -79,7 +79,7 @@ public interface AcceptCriterion extends Serializable {
      * <p>
      * Note that even if your criterion is validated on client side, you should
      * always validate the data on server side too.
-     * 
+     *
      * @param dragEvent
      * @return
      */
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.java
index b2fc1b1b94..01bc354ae8 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -25,11 +25,11 @@ import com.vaadin.server.PaintTarget;
 /**
  * A compound criterion that accepts the drag if all of its criteria accepts the
  * drag.
- * 
+ *
  * @see Or
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public class And extends ClientSideCriterion {
 
@@ -37,7 +37,7 @@ public class And extends ClientSideCriterion {
     protected ClientSideCriterion[] criteria;
 
     /**
-     * 
+     *
      * @param criteria
      *            criteria of which the And criterion will be composed
      */
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
index 7fae2ee87b..8ce8f04773 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.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,12 +24,12 @@ import com.vaadin.server.PaintTarget;
  * Parent class for criteria that can be completely validated on client side.
  * All classes that provide criteria that can be completely validated on client
  * side should extend this class.
- * 
+ *
  * It is recommended that subclasses of ClientSideCriterion re-validate the
  * condition on the server side in
  * {@link AcceptCriterion#accept(com.vaadin.event.dd.DragAndDropEvent)} after
  * the client side validation has accepted a transfer.
- * 
+ *
  * @since 6.3
  */
 public abstract class ClientSideCriterion
@@ -38,9 +38,9 @@ public abstract class ClientSideCriterion
     /*
      * All criteria that extend this must be completely validatable on client
      * side.
-     * 
+     *
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#isClientSideVerifiable
      * ()
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
index 57f4d8253b..28285647ca 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -27,7 +27,7 @@ import com.vaadin.server.PaintTarget;
  * A Criterion that checks whether {@link Transferable} contains given data
  * flavor. The developer might for example accept the incoming data only if it
  * contains "Url" or "Text".
- * 
+ *
  * @since 6.3
  */
 public class ContainsDataFlavor extends ClientSideCriterion {
@@ -36,7 +36,7 @@ public class ContainsDataFlavor extends ClientSideCriterion {
 
     /**
      * Constructs a new instance of {@link ContainsDataFlavor}.
-     * 
+     *
      * @param dataFlawor
      *            the type of data that will be checked from
      *            {@link Transferable}
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.java
index 95f96bbf08..da50d7f3e3 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -24,9 +24,9 @@ import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion that wraps another criterion and inverts its return value.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public class Not extends ClientSideCriterion {
 
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java
index e300606464..842df2ca20 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -25,11 +25,11 @@ import com.vaadin.server.PaintTarget;
 /**
  * A compound criterion that accepts the drag if any of its criterion accepts
  * it.
- * 
+ *
  * @see And
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public class Or extends ClientSideCriterion {
     private static final long serialVersionUID = 1L;
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
index 4449ec22c4..dc54231f87 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.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
@@ -32,10 +32,10 @@ import com.vaadin.server.PaintTarget;
  * As all server side state can be used to make a decision, this is more
  * flexible than {@link ClientSideCriterion}. However, this does require
  * additional requests from the browser to the server during a drag operation.
- * 
+ *
  * @see AcceptCriterion
  * @see ClientSideCriterion
- * 
+ *
  * @since 6.3
  */
 public abstract class ServerSideCriterion
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 2b2be484b3..c7da61739b 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
@@ -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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -30,7 +30,7 @@ import com.vaadin.ui.Component;
 /**
  * Client side criteria that checks if the drag source is one of the given
  * components.
- * 
+ *
  * @since 6.3
  */
 @SuppressWarnings("serial")
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 c49f126941..07199ab7d5 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
@@ -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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -27,15 +27,15 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
 
 /**
- * 
+ *
  * A criterion that ensures the drag source is the same as drop target. Eg.
  * {@link Tree} or {@link Table} could support only re-ordering of items, but no
  * {@link Transferable}s coming outside.
  * <p>
  * Note! Class is singleton, use {@link #get()} method to get the instance.
- * 
+ *
  * @since 6.3
- * 
+ *
  */
 public class SourceIsTarget extends ClientSideCriterion {
 
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
index 42fb5dfa11..289db3f1e3 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.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
@@ -14,7 +14,7 @@
  * the License.
  */
 /**
- * 
+ *
  */
 package com.vaadin.event.dd.acceptcriteria;
 
@@ -26,11 +26,11 @@ import com.vaadin.server.PaintTarget;
 /**
  * Criterion for checking if drop target details contains the specific property
  * with the specific value. Currently only String values are supported.
- * 
+ *
  * @since 6.3
- * 
+ *
  *        TODO add support for other basic data types that we support in UIDL.
- * 
+ *
  */
 public class TargetDetailIs extends ClientSideCriterion {
 
@@ -41,7 +41,7 @@ public class TargetDetailIs extends ClientSideCriterion {
     /**
      * Constructs a criterion which ensures that the value there is a value in
      * {@link TargetDetails} that equals the reference value.
-     * 
+     *
      * @param dataFlavor
      *            the type of data to be checked
      * @param value
diff --git a/server/src/main/java/com/vaadin/legacy/data/Validatable.java b/server/src/main/java/com/vaadin/legacy/data/Validatable.java
index ede34d9190..ac291b5739 100644
--- a/server/src/main/java/com/vaadin/legacy/data/Validatable.java
+++ b/server/src/main/java/com/vaadin/legacy/data/Validatable.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
@@ -25,7 +25,7 @@ import java.util.Collection;
  * value is valid or not, and to add, remove and list registered validators of
  * the object.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  * @see com.vaadin.legacy.data.Validator
@@ -39,7 +39,7 @@ public interface Validatable extends Serializable {
      * object's value needs to be verified, that is, when the {@link #isValid()}
      * method is called. This usually happens when the object's value changes.
      * </p>
-     * 
+     *
      * @param validator
      *            the new validator
      */
@@ -51,7 +51,7 @@ public interface Validatable extends Serializable {
      * validator is removed from the object and its <code>validate</code> method
      * is no longer called in {@link #isValid()}.
      * </p>
-     * 
+     *
      * @param validator
      *            the validator to remove
      */
@@ -72,7 +72,7 @@ public interface Validatable extends Serializable {
      * the collection may be unsafe (e.g. may throw
      * <code>ConcurrentModificationException</code>.)
      * </p>
-     * 
+     *
      * @return A collection of validators
      */
     public Collection<Validator> getValidators();
@@ -85,7 +85,7 @@ public interface Validatable extends Serializable {
      * throws the {@link Validator.InvalidValueException} this method returns
      * <code>false</code>.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the registered validators concur that the
      *         value is valid, <code>false</code> otherwise
      */
@@ -97,7 +97,7 @@ public interface Validatable extends Serializable {
      * method should do nothing, and if it's not valid, it should throw
      * <code>Validator.InvalidValueException</code>
      * </p>
-     * 
+     *
      * @throws Validator.InvalidValueException
      *             if the value is not valid
      */
@@ -108,7 +108,7 @@ public interface Validatable extends Serializable {
      * Checks the validabtable object accept invalid values.The default value is
      * <code>true</code>.
      * </p>
-     * 
+     *
      */
     public boolean isInvalidAllowed();
 
@@ -118,9 +118,9 @@ public interface Validatable extends Serializable {
      * configuration possibility is optional. By default invalid values are
      * allowed.
      * </p>
-     * 
+     *
      * @param invalidValueAllowed
-     * 
+     *
      * @throws UnsupportedOperationException
      *             if the setInvalidAllowed is not supported.
      */
diff --git a/server/src/main/java/com/vaadin/legacy/data/Validator.java b/server/src/main/java/com/vaadin/legacy/data/Validator.java
index 3d4052329a..7e0437cc68 100644
--- a/server/src/main/java/com/vaadin/legacy/data/Validator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/Validator.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
@@ -43,7 +43,7 @@ import com.vaadin.server.VaadinServlet;
  * internally implement and use isValid(Object) for convenience or to ease
  * migration from earlier Vaadin versions.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -53,7 +53,7 @@ public interface Validator extends Serializable {
      * Checks the given value against this validator. If the value is valid the
      * method does nothing. If the value is invalid, an
      * {@link InvalidValueException} is thrown.
-     * 
+     *
      * @param value
      *            the value to check
      * @throws Validator.InvalidValueException
@@ -63,13 +63,13 @@ public interface Validator extends Serializable {
 
     /**
      * Exception that is thrown by a {@link Validator} when a value is invalid.
-     * 
+     *
      * <p>
      * The default implementation of InvalidValueException does not support HTML
      * in error messages. To enable HTML support, override
      * {@link #getHtmlMessage()} and use the subclass in validators.
      * </p>
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -85,7 +85,7 @@ public interface Validator extends Serializable {
         /**
          * Constructs a new {@code InvalidValueException} with the specified
          * message.
-         * 
+         *
          * @param message
          *            The detail message of the problem.
          */
@@ -97,7 +97,7 @@ public interface Validator extends Serializable {
          * Constructs a new {@code InvalidValueException} with a set of causing
          * validation exceptions. The causing validation exceptions are included
          * when the exception is painted to the client.
-         * 
+         *
          * @param message
          *            The detail message of the problem.
          * @param causes
@@ -117,10 +117,10 @@ public interface Validator extends Serializable {
 
         /**
          * Check if the error message should be hidden.
-         * 
+         *
          * An empty (null or "") message is invisible unless it contains nested
          * exceptions that are visible.
-         * 
+         *
          * @return true if the error message should be hidden, false otherwise
          */
         public boolean isInvisible() {
@@ -140,7 +140,7 @@ public interface Validator extends Serializable {
 
         /**
          * Returns the message of the error in HTML.
-         * 
+         *
          * Note that this API may change in future versions.
          */
         public String getHtmlMessage() {
@@ -150,7 +150,7 @@ public interface Validator extends Serializable {
         /**
          * Returns the {@code InvalidValueExceptions} that caused this
          * exception.
-         * 
+         *
          * @return An array containing the {@code InvalidValueExceptions} that
          *         caused this exception. Returns an empty array if this
          *         exception was not caused by other exceptions.
@@ -165,7 +165,7 @@ public interface Validator extends Serializable {
      * A specific type of {@link InvalidValueException} that indicates that
      * validation failed because the value was empty. What empty means is up to
      * the thrower.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 5.3.0
      */
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java
index 1191c5cd29..ebf8471e4f 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyAbstractStringToNumberConverter.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 java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -38,7 +38,7 @@ public abstract class LegacyAbstractStringToNumberConverter<T>
     /**
      * Returns the format used by {@link #convertToPresentation(Object, Locale)}
      * and {@link #convertToModel(Object, Locale)}.
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A NumberFormat instance
@@ -55,7 +55,7 @@ public abstract class LegacyAbstractStringToNumberConverter<T>
     /**
      * Convert the value to a Number using the given locale and
      * {@link #getFormat(Locale)}.
-     * 
+     *
      * @param value
      *            The value to convert
      * @param locale
@@ -94,7 +94,7 @@ public abstract class LegacyAbstractStringToNumberConverter<T>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang
      * .Object, java.util.Locale)
@@ -112,7 +112,7 @@ public abstract class LegacyAbstractStringToNumberConverter<T>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getPresentationType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java
index d9e9c8d35a..4c7639cdef 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverter.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
@@ -37,7 +37,7 @@ import java.util.Locale;
  * <p>
  * If conversion of a value fails, a {@link ConversionException} is thrown.
  * </p>
- * 
+ *
  * @param <PRESENTATION>
  *            The presentation type. Must be compatible with what
  *            {@link #getPresentationType()} returns.
@@ -58,7 +58,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
      * {@link #convertToPresentation(Object, Class, Locale)} and
      * {@link #convertToModel(Object, Class, Locale)} should return the original
      * value.
-     * 
+     *
      * @param value
      *            The value to convert, compatible with the target type. Can be
      *            null
@@ -83,7 +83,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
      * {@link #convertToPresentation(Object, Class, Locale)} and
      * {@link #convertToModel(Object, Class, Locale)} should return the original
      * value.
-     * 
+     *
      * @param value
      *            The value to convert, compatible with the target type. Can be
      *            null
@@ -101,20 +101,20 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
 
     /**
      * The source type of the converter.
-     * 
+     *
      * Values of this type can be passed to
      * {@link #convertToPresentation(Object, Class, Locale)}.
-     * 
+     *
      * @return The source type
      */
     public Class<MODEL> getModelType();
 
     /**
      * The target type of the converter.
-     * 
+     *
      * Values of this type can be passed to
      * {@link #convertToModel(Object, Class, Locale)}.
-     * 
+     *
      * @return The target type
      */
     public Class<PRESENTATION> getPresentationType();
@@ -124,7 +124,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
      * {@link LegacyConverter#convertToPresentation(Object, Class, Locale)} or
      * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not
      * be converted.
-     * 
+     *
      * @author Vaadin Ltd
      * @since 7.0
      */
@@ -140,7 +140,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
         /**
          * Constructs a new <code>ConversionException</code> with the specified
          * detail message.
-         * 
+         *
          * @param msg
          *            the detail message
          */
@@ -151,7 +151,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
         /**
          * Constructs a new {@code ConversionException} with the specified
          * cause.
-         * 
+         *
          * @param cause
          *            The cause of the the exception
          */
@@ -162,7 +162,7 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable {
         /**
          * Constructs a new <code>ConversionException</code> with the specified
          * detail message and cause.
-         * 
+         *
          * @param message
          *            the detail message
          * @param cause
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java
index 8c5cbacf04..a39aabfe31 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterFactory.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
@@ -21,10 +21,10 @@ import java.io.Serializable;
 /**
  * Factory interface for providing Converters based on a presentation type and a
  * model type.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
- * 
+ *
  */
 public interface LegacyConverterFactory extends Serializable {
     public <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> createConverter(
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java
index 3afd4e288e..9ed6502172 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyConverterUtil.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
@@ -27,7 +27,7 @@ public class LegacyConverterUtil implements Serializable {
      * the given model type and back. Uses the given application to find a
      * {@link LegacyConverterFactory} or, if application is null, uses the
      * {@link VaadinSession#getCurrent()}.
-     * 
+     *
      * @param <PRESENTATIONTYPE>
      *            the presentation type
      * @param <MODELTYPE>
@@ -60,7 +60,7 @@ public class LegacyConverterUtil implements Serializable {
 
     /**
      * Convert the given value from the data source type to the UI type.
-     * 
+     *
      * @param modelValue
      *            the model value to convert
      * @param presentationType
@@ -73,7 +73,7 @@ public class LegacyConverterUtil implements Serializable {
      *            the presentation type
      * @param <MODELTYPE>
      *            the model type
-     * 
+     *
      * @return the converted value, compatible with the presentation type, or
      *         the original value if its type is compatible and no converter is
      *         set.
@@ -124,7 +124,7 @@ public class LegacyConverterUtil implements Serializable {
     /**
      * Convert the given value from the presentation (UI) type to model (data
      * source) type.
-     * 
+     *
      * @param presentationValue
      *            the presentation value to convert
      * @param modelType
@@ -137,7 +137,7 @@ public class LegacyConverterUtil implements Serializable {
      *            the presentation type
      * @param <MODELTYPE>
      *            the model type
-     * 
+     *
      * @return the converted value, compatible with the model type, or the
      *         original value if its type is compatible and no converter is set.
      * @throws LegacyConverter.ConversionException
@@ -190,9 +190,9 @@ public class LegacyConverterUtil implements Serializable {
      * Checks if the given converter can handle conversion between the given
      * presentation and model type. Does strict type checking and only returns
      * true if the converter claims it can handle exactly the given types.
-     * 
+     *
      * @see #canConverterPossiblyHandle(LegacyConverter, Class, Class)
-     * 
+     *
      * @param converter
      *            The converter to check. If this is null the result is always
      *            false.
@@ -222,7 +222,7 @@ public class LegacyConverterUtil implements Serializable {
     /**
      * Checks if it possible that the given converter can handle conversion
      * between the given presentation and model type somehow.
-     * 
+     *
      * @param converter
      *            The converter to check. If this is null the result is always
      *            false.
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java
index b4e5801db2..c5e267276c 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToLongConverter.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
@@ -21,7 +21,7 @@ import java.util.Locale;
 
 /**
  * A converter that converts from {@link Long} to {@link Date} and back.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -29,7 +29,7 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -46,7 +46,7 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang
      * .Object, java.lang.Class, java.util.Locale)
@@ -68,7 +68,7 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
@@ -78,7 +78,7 @@ public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getPresentationType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java
index e6ac11e020..6b0c63abf7 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDateToSqlDateConverter.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
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.legacy.data.util.converter;
 
@@ -28,7 +28,7 @@ import java.util.Locale;
  * is connected to a java.sql.Date property, typically through a JPAContainer or
  * SQLContainer. Note that information (time information) is lost when
  * converting from {@link java.util.Date} to {@link java.sql.Date}.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java
index f578ad6a2d..251df81b03 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyDefaultConverterFactory.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,7 +31,7 @@ import com.vaadin.server.VaadinSession;
  * Custom converters can be provided by extending this class and using
  * {@link VaadinSession#setConverterFactory(LegacyConverterFactory)}.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java
index 4750b3358f..bb22ae8a98 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyReverseConverter.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
@@ -21,12 +21,12 @@ import java.util.Locale;
 /**
  * A converter that wraps another {@link LegacyConverter} and reverses source
  * and target types.
- * 
+ *
  * @param <MODEL>
  *            The source type
  * @param <PRESENTATION>
  *            The target type
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -38,7 +38,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL>
     /**
      * Creates a converter from source to target based on a converter that
      * converts from target to source.
-     * 
+     *
      * @param converter
      *            The converter to use in a reverse fashion
      */
@@ -49,7 +49,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#convertToModel(java
      * .lang.Object, java.util.Locale)
      */
@@ -62,7 +62,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang
      * .Object, java.util.Locale)
@@ -76,7 +76,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getSourceType()
      */
     @Override
@@ -86,7 +86,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getTargetType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java
index 0a3b40389f..a8f1231815 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigDecimalConverter.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
@@ -30,7 +30,7 @@ import java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.2
  */
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java
index 0ff70a4788..3e39683271 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBigIntegerConverter.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,7 +31,7 @@ import java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.4
  */
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java
index 11f96d3e6d..080caed347 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToBooleanConverter.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/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java
index dd0d2e4b05..ca708f9250 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToByteConverter.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 java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.4
  */
@@ -37,7 +37,7 @@ public class LegacyStringToByteConverter
      * Returns the format used by
      * {@link #convertToPresentation(Byte, Class, Locale)} and
      * {@link #convertToModel(String, Class, Locale)}
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A NumberFormat instance
@@ -52,7 +52,7 @@ public class LegacyStringToByteConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -78,7 +78,7 @@ public class LegacyStringToByteConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java
index aa057630ca..05da78de83 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToCollectionConverter.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
@@ -33,9 +33,9 @@ import java.util.Locale;
  * Default constructor uses <code>", "</code> as delimiter string and
  * {@link String} for token types. Other constructors allow to configure
  * delimiter and token types.
- * 
+ *
  * @since 7.5.0
- * 
+ *
  * @author Vaadin Ltd
  */
 public class LegacyStringToCollectionConverter
@@ -57,7 +57,7 @@ public class LegacyStringToCollectionConverter
     /**
      * Creates converter with given {@code delimiter} and {@link String} as
      * token model type in collection.
-     * 
+     *
      * @param delimiter
      *            custom delimiter
      */
@@ -71,7 +71,7 @@ public class LegacyStringToCollectionConverter
      * <p>
      * If {@code tokenConverter} is null then no conversation is done and
      * {@link String} is used as token type in resulting model collection.
-     * 
+     *
      * @param tokenConverter
      *            converter for token
      * @param tokenType
@@ -88,7 +88,7 @@ public class LegacyStringToCollectionConverter
      * <p>
      * If {@code tokenConverter} is null then no conversation is done and
      * {@link String} is used as token type in resulting model collection.
-     * 
+     *
      * @param tokenConverter
      *            converter for token
      * @param tokenType
@@ -108,7 +108,7 @@ public class LegacyStringToCollectionConverter
      * <p>
      * If {@code tokenConverter} is null then no conversation is done and
      * {@link String} is used as token type in resulting model collection.
-     * 
+     *
      * @param tokenConverter
      *            converter for token
      * @param tokenType
@@ -199,7 +199,7 @@ public class LegacyStringToCollectionConverter
 
     /**
      * Default collection factory implementation.
-     * 
+     *
      * @author Vaadin Ltd
      */
     public static class DefaultCollectionFactory implements CollectionFactory {
@@ -227,14 +227,14 @@ public class LegacyStringToCollectionConverter
     /**
      * Collection factory. Defines a strategy to create collection by collection
      * class.
-     * 
+     *
      * @author Vaadin Ltd
      */
     public interface CollectionFactory extends Serializable {
 
         /**
          * Create collection by its {@code type}.
-         * 
+         *
          * @param type
          *            collection type
          * @return instantiated collection with given {@code type}
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java
index 035410dd5a..d69be1257a 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDateConverter.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
@@ -30,7 +30,7 @@ import java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -41,7 +41,7 @@ public class LegacyStringToDateConverter
      * Returns the format used by
      * {@link #convertToPresentation(Date, Class,Locale)} and
      * {@link #convertToModel(String, Class, Locale)}.
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A DateFormat instance
@@ -59,7 +59,7 @@ public class LegacyStringToDateConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -93,7 +93,7 @@ public class LegacyStringToDateConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang
      * .Object, java.lang.Class, java.util.Locale)
@@ -111,7 +111,7 @@ public class LegacyStringToDateConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
@@ -121,7 +121,7 @@ public class LegacyStringToDateConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getPresentationType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java
index 9232c37c7e..bca06820cd 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToDoubleConverter.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
@@ -29,7 +29,7 @@ import java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -38,7 +38,7 @@ public class LegacyStringToDoubleConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.util.Locale)
@@ -53,7 +53,7 @@ public class LegacyStringToDoubleConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java
index 19c9ce2cd5..aeb9c28f78 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToEnumConverter.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
@@ -32,7 +32,7 @@ import java.util.Locale;
  * </ul>
  * Will not necessarily work correctly for other cases.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.4
  */
@@ -53,7 +53,7 @@ public class LegacyStringToEnumConverter
      * Converts the given string to the given enum type using the given locale
      * <p>
      * Compatible with {@link #enumToString(Enum, Locale)}
-     * 
+     *
      * @param value
      *            The string value to convert
      * @param enumType
@@ -108,7 +108,7 @@ public class LegacyStringToEnumConverter
      * Converts the given enum to a human readable string using the given locale
      * <p>
      * Compatible with {@link #stringToEnum(String, Class, Locale)}
-     * 
+     *
      * @param value
      *            The enum value to convert
      * @param locale
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java
index 5a4eb3ca1c..35434f3ca7 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToFloatConverter.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
@@ -29,7 +29,7 @@ import java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -38,7 +38,7 @@ public class LegacyStringToFloatConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.util.Locale)
@@ -52,7 +52,7 @@ public class LegacyStringToFloatConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java
index b481dc23ae..69a8ccd964 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToIntegerConverter.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 java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -37,7 +37,7 @@ public class LegacyStringToIntegerConverter
      * Returns the format used by
      * {@link #convertToPresentation(Integer, Class, Locale)} and
      * {@link #convertToModel(String, Class, Locale)}
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A NumberFormat instance
@@ -52,7 +52,7 @@ public class LegacyStringToIntegerConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -83,7 +83,7 @@ public class LegacyStringToIntegerConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java
index 481a3892b4..1e0d4b360d 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToLongConverter.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 java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.2
  */
@@ -37,7 +37,7 @@ public class LegacyStringToLongConverter
      * Returns the format used by
      * {@link #convertToPresentation(Long, Class, Locale)} and
      * {@link #convertToModel(String, Class, Locale)}
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A NumberFormat instance
@@ -52,7 +52,7 @@ public class LegacyStringToLongConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -67,7 +67,7 @@ public class LegacyStringToLongConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java
index aad0eba9f7..496a68a475 100644
--- a/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.java
+++ b/server/src/main/java/com/vaadin/legacy/data/util/converter/LegacyStringToShortConverter.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 java.util.Locale;
  * <p>
  * Override and overwrite {@link #getFormat(Locale)} to use a different format.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.4
  */
@@ -37,7 +37,7 @@ public class LegacyStringToShortConverter
      * Returns the format used by
      * {@link #convertToPresentation(Short, Class, Locale)} and
      * {@link #convertToModel(String, Class, Locale)}
-     * 
+     *
      * @param locale
      *            The locale to use
      * @return A NumberFormat instance
@@ -52,7 +52,7 @@ public class LegacyStringToShortConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object,
      * java.lang.Class, java.util.Locale)
@@ -78,7 +78,7 @@ public class LegacyStringToShortConverter
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.util.converter.Converter#getModelType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java
index c8a01ff021..6055855d9b 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractStringValidator.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
@@ -23,7 +23,7 @@ package com.vaadin.legacy.data.validator;
  * (converted to string using {@link #toString()}) or "null" if the value is
  * null.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  */
@@ -33,12 +33,12 @@ public abstract class LegacyAbstractStringValidator
 
     /**
      * Constructs a validator for strings.
-     * 
+     *
      * <p>
      * Null and empty string values are always accepted. To reject empty values,
      * set the field being validated as required.
      * </p>
-     * 
+     *
      * @param errorMessage
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java
index 035f0c822d..4712b98ac2 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyAbstractValidator.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
@@ -38,7 +38,7 @@ import com.vaadin.legacy.data.Validator;
  * directly or implement {@link #isValidValue(Object)} when migrating legacy
  * applications. To check validity, {@link #validate(Object)} should be used.
  * </p>
- * 
+ *
  * @param <T>
  *            The type
  * @author Vaadin Ltd.
@@ -54,7 +54,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
 
     /**
      * Constructs a validator with the given error message.
-     * 
+     *
      * @param errorMessage
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
@@ -68,7 +68,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
      * {@link #isValidValue(Object)} or {@link #validate(Object)} instead of
      * {@link #isValid(Object)}. {@link #validate(Object)} should normally be
      * used to check values.
-     * 
+     *
      * @param value
      * @return true if the value is valid
      */
@@ -86,9 +86,9 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
      * perform validation in subclasses if customization of the error message is
      * not needed. Otherwise, subclasses should override
      * {@link #validate(Object)} and the return value of this method is ignored.
-     * 
+     *
      * This method should not be called from outside the validator class itself.
-     * 
+     *
      * @param value
      * @return
      */
@@ -108,7 +108,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
      * Checks the type of the value to validate to ensure it conforms with
      * getType. Enables sub classes to handle the specific type instead of
      * Object.
-     * 
+     *
      * @param value
      *            The value to check
      * @return true if the value can safely be cast to the type specified by
@@ -125,7 +125,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
     /**
      * Returns the message to be included in the exception in case the value
      * does not validate.
-     * 
+     *
      * @return the error message provided in the constructor or using
      *         {@link #setErrorMessage(String)}.
      */
@@ -136,7 +136,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
     /**
      * Sets the message to be included in the exception in case the value does
      * not validate. The exception message is typically shown to the end user.
-     * 
+     *
      * @param errorMessage
      *            the error message. "{0}" is automatically replaced by the
      *            value that did not validate.
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java
index 1c973dda4b..c1cda32229 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBeanValidator.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,16 +31,16 @@ import com.vaadin.legacy.data.Validator;
 /**
  * Vaadin {@link Validator} using the JSR-303 (javax.validation)
  * annotation-based bean validation.
- * 
+ *
  * The annotations of the fields of the beans are used to determine the
  * validation to perform.
- * 
+ *
  * Note that a JSR-303 implementation (e.g. Hibernate Validator or Apache Bean
  * Validation - formerly agimatec validation) must be present on the project
  * classpath when using bean validation.
- * 
+ *
  * @since 7.0
- * 
+ *
  * @author Petri Hakala
  * @author Henri Sara
  */
@@ -65,7 +65,7 @@ public class LegacyBeanValidator implements Validator {
 
         /**
          * Create a simple immutable message interpolator context.
-         * 
+         *
          * @param value
          *            value being validated
          * @param descriptor
@@ -91,7 +91,7 @@ public class LegacyBeanValidator implements Validator {
 
     /**
      * Creates a Vaadin {@link Validator} utilizing JSR-303 bean validation.
-     * 
+     *
      * @param beanClass
      *            bean class based on which the validation should be performed
      * @param propertyName
@@ -105,7 +105,7 @@ public class LegacyBeanValidator implements Validator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Validator#validate(java.lang.Object)
      */
     @Override
@@ -134,9 +134,9 @@ public class LegacyBeanValidator implements Validator {
 
     /**
      * Sets the locale used for validation error messages.
-     * 
+     *
      * Revalidation is not automatically triggered by setting the locale.
-     * 
+     *
      * @param locale
      */
     public void setLocale(Locale locale) {
@@ -145,7 +145,7 @@ public class LegacyBeanValidator implements Validator {
 
     /**
      * Gets the locale used for validation error messages.
-     * 
+     *
      * @return locale used for validation
      */
     public Locale getLocale() {
@@ -155,7 +155,7 @@ public class LegacyBeanValidator implements Validator {
     /**
      * Returns the underlying JSR-303 bean validator factory used. A factory is
      * created using {@link Validation} if necessary.
-     * 
+     *
      * @return {@link ValidatorFactory} to use
      */
     protected static ValidatorFactory getJavaxBeanValidatorFactory() {
@@ -170,7 +170,7 @@ public class LegacyBeanValidator implements Validator {
      * Returns a shared Validator instance to use. An instance is created using
      * the validator factory if necessary and thereafter reused by the
      * {@link LegacyBeanValidator} instance.
-     * 
+     *
      * @return the JSR-303 {@link javax.validation.Validator} to use
      */
     protected javax.validation.Validator getJavaxBeanValidator() {
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java
index 2280619835..ba09eb86a8 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigDecimalRangeValidator.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
@@ -19,7 +19,7 @@ import java.math.BigDecimal;
 
 /**
  * Validator for validating that an {@link BigDecimal} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -30,12 +30,12 @@ public class LegacyBigDecimalRangeValidator
     /**
      * Creates a validator for checking that an BigDecimal is within a given
      * range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java
index 456a63a15e..cbb99f4edb 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyBigIntegerRangeValidator.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
@@ -19,7 +19,7 @@ import java.math.BigInteger;
 
 /**
  * Validator for validating that an {@link BigInteger} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -30,12 +30,12 @@ public class LegacyBigIntegerRangeValidator
     /**
      * Creates a validator for checking that an BigInteger is within a given
      * range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java
index 4186168d23..d78e341efe 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyByteRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Byte} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -26,12 +26,12 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
 
     /**
      * Creates a validator for checking that an Byte is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java
index 04d6045396..fce5f7e429 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyCompositeValidator.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
@@ -29,7 +29,7 @@ import com.vaadin.legacy.data.Validator;
  * all validate the value to validate or it may be enough that one contained
  * validator validates the value. This behaviour is controlled by the modes
  * <code>AND</code> and <code>OR</code>.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -84,7 +84,7 @@ public class LegacyCompositeValidator implements Validator {
 
     /**
      * Constructs a composite validator in given mode.
-     * 
+     *
      * @param mode
      * @param errorMessage
      */
@@ -101,12 +101,12 @@ public class LegacyCompositeValidator implements Validator {
      * <li><code>MODE_AND</code>: All of the sub-validators are valid
      * <li><code>MODE_OR</code>: Any of the sub-validators are valid
      * </ul>
-     * 
+     *
      * If the value is invalid, validation error is thrown. If the error message
      * is set (non-null), it is used. If the error message has not been set, the
      * first error occurred is thrown.
      * </p>
-     * 
+     *
      * @param value
      *            the value to check.
      * @throws Validator.InvalidValueException
@@ -147,7 +147,7 @@ public class LegacyCompositeValidator implements Validator {
 
     /**
      * Gets the mode of the validator.
-     * 
+     *
      * @return Operation mode of the validator: {@link CombinationMode#AND} or
      *         {@link CombinationMode#OR}.
      */
@@ -161,7 +161,7 @@ public class LegacyCompositeValidator implements Validator {
      * <li>{@link CombinationMode#AND} (default)
      * <li>{@link CombinationMode#OR}
      * </ul>
-     * 
+     *
      * @param mode
      *            the mode to set.
      */
@@ -189,7 +189,7 @@ public class LegacyCompositeValidator implements Validator {
 
     /**
      * Adds validator to the interface.
-     * 
+     *
      * @param validator
      *            the Validator object which performs validation checks on this
      *            set of data field values.
@@ -203,7 +203,7 @@ public class LegacyCompositeValidator implements Validator {
 
     /**
      * Removes a validator from the composite.
-     * 
+     *
      * @param validator
      *            the Validator object which performs validation checks on this
      *            set of data field values.
@@ -214,22 +214,22 @@ public class LegacyCompositeValidator implements Validator {
 
     /**
      * Gets sub-validators by class.
-     * 
+     *
      * <p>
      * If the component contains directly or recursively (it contains another
      * composite containing the validator) validators compatible with given type
      * they are returned. This only applies to <code>AND</code> mode composite
      * validators.
      * </p>
-     * 
+     *
      * <p>
      * If the validator is in <code>OR</code> mode or does not contain any
      * validators of given type null is returned.
      * </p>
-     * 
+     *
      * @param validatorType
      *            The type of validators to return
-     * 
+     *
      * @return Collection<Validator> of validators compatible with given type
      *         that must apply or null if none found.
      */
@@ -259,7 +259,7 @@ public class LegacyCompositeValidator implements Validator {
     /**
      * Sets the message to be included in the exception in case the value does
      * not validate. The exception message is typically shown to the end user.
-     * 
+     *
      * @param errorMessage
      *            the error message.
      */
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java
index ad44353435..9986f1633b 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDateRangeValidator.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
@@ -21,13 +21,13 @@ import com.vaadin.shared.ui.datefield.Resolution;
 
 /**
  * Validator for validating that a Date is inside a given range.
- * 
+ *
  * <p>
  * Note that the comparison is done directly on the Date object so take care
  * that the hours/minutes/seconds/milliseconds of the min/max values are
  * properly set.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
  */
@@ -45,7 +45,7 @@ public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
      * that the hours/minutes/seconds/milliseconds of the min/max values are
      * properly set.
      * </p>
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java
index 0110cbffff..3c439f45c4 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that a {@link Double} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
  */
@@ -26,12 +26,12 @@ public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
 
     /**
      * Creates a validator for checking that an Double is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java
index 7f72d831ca..9f53df8161 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyDoubleValidator.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
@@ -22,7 +22,7 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
  * String validator for a double precision floating point number. See
  * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for
  * more information.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter
@@ -36,7 +36,7 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
     /**
      * Creates a validator for checking that a string can be parsed as an
      * double.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use a Double converter on the field instead and/or
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java
index fec2519871..6d1eca28b7 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyEmailValidator.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
@@ -19,16 +19,16 @@ package com.vaadin.legacy.data.validator;
  * String validator for e-mail addresses. The e-mail address syntax is not
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
- * 
+ *
  * See {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator}
  * for more information.
- * 
+ *
  * <p>
  * An empty string or a null is always accepted - use the required flag on
  * fields or a separate validator (or override {@link #isValidValue(String)}) to
  * fail on empty values.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  */
@@ -38,7 +38,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator {
     /**
      * Creates a validator for checking that a string is a syntactically valid
      * e-mail address.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java
index 6bd5a53778..0bcdc9922a 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyFloatRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that a {@link Float} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -26,12 +26,12 @@ public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
 
     /**
      * Creates a validator for checking that an Float is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java
index 272c1bd40a..94964f061b 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Integer} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  */
@@ -26,12 +26,12 @@ public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
 
     /**
      * Creates a validator for checking that an Integer is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java
index 31a5c0dc26..05759c2167 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyIntegerValidator.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
@@ -22,7 +22,7 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter;
  * String validator for integers. See
  * {@link com.vaadin.legacy.data.validator.LegacyAbstractStringValidator} for
  * more information.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter
@@ -36,7 +36,7 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
     /**
      * Creates a validator for checking that a string can be parsed as an
      * integer.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use an Integer converter on the field instead
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java
index c7db9be6d3..e5fe635897 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyLongRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Long} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -26,12 +26,12 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
 
     /**
      * Creates a validator for checking that an Long is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java
index 0df18cb461..812adc6d11 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyNullValidator.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
@@ -21,7 +21,7 @@ import com.vaadin.legacy.data.Validator;
 /**
  * This validator is used for validating properties that do or do not allow null
  * values. By default, nulls are not allowed.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -34,7 +34,7 @@ public class LegacyNullValidator implements Validator {
 
     /**
      * Creates a new NullValidator.
-     * 
+     *
      * @param errorMessage
      *            the error message to display on invalidation.
      * @param onlyNullAllowed
@@ -47,7 +47,7 @@ public class LegacyNullValidator implements Validator {
 
     /**
      * Validates the data given in value.
-     * 
+     *
      * @param value
      *            the value to validate.
      * @throws Validator.InvalidValueException
@@ -71,7 +71,7 @@ public class LegacyNullValidator implements Validator {
 
     /**
      * Sets if nulls (and only nulls) are to be allowed.
-     * 
+     *
      * @param onlyNullAllowed
      *            If true, only nulls are allowed. If false only non-nulls are
      *            allowed. Do we allow nulls?
@@ -82,7 +82,7 @@ public class LegacyNullValidator implements Validator {
 
     /**
      * Gets the error message that is displayed in case the value is invalid.
-     * 
+     *
      * @return the Error Message.
      */
     public String getErrorMessage() {
@@ -91,7 +91,7 @@ public class LegacyNullValidator implements Validator {
 
     /**
      * Sets the error message to be displayed on invalid value.
-     * 
+     *
      * @param errorMessage
      *            the Error Message to set.
      */
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java
index 10eddd0cbf..04ea9714ab 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRangeValidator.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
@@ -18,7 +18,7 @@ package com.vaadin.legacy.data.validator;
 /**
  * An base implementation for validating any objects that implement
  * {@link Comparable}.
- * 
+ *
  * Verifies that the value is of the given type and within the (optionally)
  * given limits. Typically you want to use a sub class of this like
  * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or
@@ -28,7 +28,7 @@ package com.vaadin.legacy.data.validator;
  * field required to ensure that no empty values are accepted or override
  * {@link #isValidValue(Comparable)}.
  * </p>
- * 
+ *
  * @param <T>
  *            The type of Number to validate. Must implement Comparable so that
  *            minimum and maximum checks work.
@@ -46,7 +46,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Creates a new range validator of the given type.
-     * 
+     *
      * @param errorMessage
      *            The error message to use if validation fails
      * @param type
@@ -66,7 +66,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Checks if the minimum value is part of the accepted range
-     * 
+     *
      * @return true if the minimum value is part of the range, false otherwise
      */
     public boolean isMinValueIncluded() {
@@ -75,7 +75,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Sets if the minimum value is part of the accepted range
-     * 
+     *
      * @param minValueIncluded
      *            true if the minimum value should be part of the range, false
      *            otherwise
@@ -86,7 +86,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Checks if the maximum value is part of the accepted range
-     * 
+     *
      * @return true if the maximum value is part of the range, false otherwise
      */
     public boolean isMaxValueIncluded() {
@@ -95,7 +95,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Sets if the maximum value is part of the accepted range
-     * 
+     *
      * @param maxValueIncluded
      *            true if the maximum value should be part of the range, false
      *            otherwise
@@ -106,7 +106,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Gets the minimum value of the range
-     * 
+     *
      * @return the minimum value
      */
     public T getMinValue() {
@@ -117,7 +117,7 @@ public class LegacyRangeValidator<T extends Comparable>
      * Sets the minimum value of the range. Use
      * {@link #setMinValueIncluded(boolean)} to control whether this value is
      * part of the range or not.
-     * 
+     *
      * @param minValue
      *            the minimum value
      */
@@ -127,7 +127,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /**
      * Gets the maximum value of the range
-     * 
+     *
      * @return the maximum value
      */
     public T getMaxValue() {
@@ -138,7 +138,7 @@ public class LegacyRangeValidator<T extends Comparable>
      * Sets the maximum value of the range. Use
      * {@link #setMaxValueIncluded(boolean)} to control whether this value is
      * part of the range or not.
-     * 
+     *
      * @param maxValue
      *            the maximum value
      */
@@ -148,7 +148,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.validator.AbstractValidator#isValidValue(java.lang.Object
      * )
@@ -187,7 +187,7 @@ public class LegacyRangeValidator<T extends Comparable>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.validator.AbstractValidator#getType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java
index a843b1aff7..aad1c9b623 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyRegexpValidator.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
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
 /**
  * String validator comparing the string against a Java regular expression. Both
  * complete matches and substring matches are supported.
- * 
+ *
  * <p>
  * For the Java regular expression syntax, see
  * {@link java.util.regex.Pattern#sum}
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
  * fields or a separate validator (or override {@link #isValidValue(String)}) to
  * fail on empty values.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.4
  */
@@ -49,7 +49,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
     /**
      * Creates a validator for checking that the regular expression matches the
      * complete string to validate.
-     * 
+     *
      * @param regexp
      *            a Java regular expression
      * @param errorMessage
@@ -62,7 +62,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
     /**
      * Creates a validator for checking that the regular expression matches the
      * string to validate.
-     * 
+     *
      * @param regexp
      *            a Java regular expression
      * @param complete
@@ -80,7 +80,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.validator.AbstractValidator#isValidValue(java.lang.Object
      * )
@@ -99,7 +99,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
 
     /**
      * Get a new or reused matcher for the pattern
-     * 
+     *
      * @param value
      *            the string to find matches in
      * @return Matcher for the string
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java
index 26bca9d78c..07a0613b6e 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyShortRangeValidator.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
@@ -17,7 +17,7 @@ package com.vaadin.legacy.data.validator;
 
 /**
  * Validator for validating that an {@link Short} is inside a given range.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.4
  */
@@ -26,12 +26,12 @@ public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
 
     /**
      * Creates a validator for checking that an Short is within a given range.
-     * 
+     *
      * By default the range is inclusive i.e. both minValue and maxValue are
      * valid values. Use {@link #setMinValueIncluded(boolean)} or
      * {@link #setMaxValueIncluded(boolean)} to change it.
-     * 
-     * 
+     *
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minValue
diff --git a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java
index 6d7a1d63e8..31db786c9b 100644
--- a/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.java
+++ b/server/src/main/java/com/vaadin/legacy/data/validator/LegacyStringLengthValidator.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
@@ -19,7 +19,7 @@ package com.vaadin.legacy.data.validator;
 /**
  * This <code>StringLengthValidator</code> is used to validate the length of
  * strings.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -34,7 +34,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Creates a new StringLengthValidator with a given error message.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
@@ -45,7 +45,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
     /**
      * Creates a new StringLengthValidator with a given error message and
      * minimum and maximum length limits.
-     * 
+     *
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @param minLength
@@ -70,7 +70,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Checks if the given value is valid.
-     * 
+     *
      * @param value
      *            the value to validate.
      * @return <code>true</code> for valid value, otherwise <code>false</code>.
@@ -90,7 +90,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Returns <code>true</code> if null strings are allowed.
-     * 
+     *
      * @return <code>true</code> if allows null string, otherwise
      *         <code>false</code>.
      */
@@ -101,7 +101,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Gets the maximum permissible length of the string.
-     * 
+     *
      * @return the maximum length of the string or null if there is no limit
      */
     public Integer getMaxLength() {
@@ -110,7 +110,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Gets the minimum permissible length of the string.
-     * 
+     *
      * @return the minimum length of the string or null if there is no limit
      */
     public Integer getMinLength() {
@@ -128,7 +128,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Sets the maximum permissible length of the string.
-     * 
+     *
      * @param maxLength
      *            the maximum length to accept or null for no limit
      */
@@ -138,7 +138,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
 
     /**
      * Sets the minimum permissible length.
-     * 
+     *
      * @param minLength
      *            the minimum length to accept or null for no limit
      */
diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java
index e8c4a098f1..f820a578e2 100644
--- a/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.java
+++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyAbstractTextField.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
@@ -238,17 +238,17 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Gets the null-string representation.
-     * 
+     *
      * <p>
      * The null-valued strings are represented on the user interface by
      * replacing the null value with this string. If the null representation is
      * set null (not 'null' string), painting null value throws exception.
      * </p>
-     * 
+     *
      * <p>
      * The default value is string 'null'.
      * </p>
-     * 
+     *
      * @return the String Textual representation for null strings.
      * @see LegacyTextField#isNullSettingAllowed()
      */
@@ -258,7 +258,7 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Is setting nulls with null-string representation allowed.
-     * 
+     *
      * <p>
      * If this property is true, writing null-representation string to text
      * field always sets the field value to real null. If this property is
@@ -267,11 +267,11 @@ public abstract class LegacyAbstractTextField
      * contents to real null, if the text field matches the null-string
      * representation and the current value of the field is null.
      * </p>
-     * 
+     *
      * <p>
      * By default this setting is false
      * </p>
-     * 
+     *
      * @return boolean Should the null-string represenation be always converted
      *         to null-values.
      * @see LegacyTextField#getNullRepresentation()
@@ -282,17 +282,17 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Sets the null-string representation.
-     * 
+     *
      * <p>
      * The null-valued strings are represented on the user interface by
      * replacing the null value with this string. If the null representation is
      * set null (not 'null' string), painting null value throws exception.
      * </p>
-     * 
+     *
      * <p>
      * The default value is string 'null'
      * </p>
-     * 
+     *
      * @param nullRepresentation
      *            Textual representation for null strings.
      * @see LegacyTextField#setNullSettingAllowed(boolean)
@@ -304,7 +304,7 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Sets the null conversion mode.
-     * 
+     *
      * <p>
      * If this property is true, writing null-representation string to text
      * field always sets the field value to real null. If this property is
@@ -313,11 +313,11 @@ public abstract class LegacyAbstractTextField
      * contents to real null, if the text field matches the null-string
      * representation and the current value of the field is null.
      * </p>
-     * 
+     *
      * <p>
      * By default this setting is false.
      * </p>
-     * 
+     *
      * @param nullSettingAllowed
      *            Should the null-string representation always be converted to
      *            null-values.
@@ -336,7 +336,7 @@ public abstract class LegacyAbstractTextField
     /**
      * Returns the maximum number of characters in the field. Value -1 is
      * considered unlimited. Terminal may however have some technical limits.
-     * 
+     *
      * @return the maxLength
      */
     public int getMaxLength() {
@@ -346,7 +346,7 @@ public abstract class LegacyAbstractTextField
     /**
      * Sets the maximum number of characters in the field. Value -1 is
      * considered unlimited. Terminal may however have some technical limits.
-     * 
+     *
      * @param maxLength
      *            the maxLength to set
      */
@@ -358,7 +358,7 @@ public abstract class LegacyAbstractTextField
      * Gets the number of columns in the editor. If the number of columns is set
      * 0, the actual number of displayed columns is determined implicitly by the
      * adapter.
-     * 
+     *
      * @return the number of columns in the editor.
      */
     public int getColumns() {
@@ -369,7 +369,7 @@ public abstract class LegacyAbstractTextField
      * Sets the number of columns in the editor. If the number of columns is set
      * 0, the actual number of displayed columns is determined implicitly by the
      * adapter.
-     * 
+     *
      * @param columns
      *            the number of columns to set.
      */
@@ -382,7 +382,7 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Gets the current input prompt.
-     * 
+     *
      * @see #setInputPrompt(String)
      * @return the current input prompt, or null if not enabled
      */
@@ -393,7 +393,7 @@ public abstract class LegacyAbstractTextField
     /**
      * Sets the input prompt - a textual prompt that is displayed when the field
      * would otherwise be empty, to prompt the user for input.
-     * 
+     *
      * @param inputPrompt
      */
     public void setInputPrompt(String inputPrompt) {
@@ -420,11 +420,11 @@ public abstract class LegacyAbstractTextField
 
             /*
              * TODO check for possible (minor?) issue (not tested)
-             * 
+             *
              * -field with e.g. PropertyFormatter.
-             * 
+             *
              * -TextChangeListener and it changes value.
-             * 
+             *
              * -if formatter again changes the value, do we get an extra
              * simulated text change event ?
              */
@@ -432,7 +432,7 @@ public abstract class LegacyAbstractTextField
             /*
              * Fire a "simulated" text change event before value change event if
              * change is coming from the client side.
-             * 
+             *
              * Iff there is both value change and textChangeEvent in same
              * variable burst, it is a text field in non immediate mode and the
              * text change event "flushed" queued value change event. In this
@@ -486,10 +486,10 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Sets the mode how the TextField triggers {@link TextChangeEvent}s.
-     * 
+     *
      * @param inputEventMode
      *            the new mode
-     * 
+     *
      * @see TextChangeEventMode
      */
     public void setTextChangeEventMode(TextChangeEventMode inputEventMode) {
@@ -574,10 +574,10 @@ public abstract class LegacyAbstractTextField
      * The text change timeout modifies how often text change events are
      * communicated to the application when {@link #getTextChangeEventMode()} is
      * {@link TextChangeEventMode#LAZY} or {@link TextChangeEventMode#TIMEOUT}.
-     * 
-     * 
+     *
+     *
      * @see #getTextChangeEventMode()
-     * 
+     *
      * @param timeout
      *            the timeout in milliseconds
      */
@@ -590,7 +590,7 @@ public abstract class LegacyAbstractTextField
      * Gets the timeout used to fire {@link TextChangeEvent}s when the
      * {@link #getTextChangeEventMode()} is {@link TextChangeEventMode#LAZY} or
      * {@link TextChangeEventMode#TIMEOUT}.
-     * 
+     *
      * @return the timeout value in milliseconds
      */
     public int getTextChangeTimeout() {
@@ -633,7 +633,7 @@ public abstract class LegacyAbstractTextField
      * pressing enter. The value returned by this method is updated also on
      * {@link TextChangeEvent}s. Due to this high dependency to the terminal
      * implementation this method is (at least at this point) not published.
-     * 
+     *
      * @return the text which is currently displayed in the field.
      */
     private String getCurrentTextContent() {
@@ -650,7 +650,7 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Selects all text in the field.
-     * 
+     *
      * @since 6.4
      */
     public void selectAll() {
@@ -660,11 +660,11 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Sets the range of text to be selected.
-     * 
+     *
      * As a side effect the field will become focused.
-     * 
+     *
      * @since 6.4
-     * 
+     *
      * @param pos
      *            the position of the first character to be selected
      * @param length
@@ -680,9 +680,9 @@ public abstract class LegacyAbstractTextField
     /**
      * Sets the cursor position in the field. As a side effect the field will
      * become focused.
-     * 
+     *
      * @since 6.4
-     * 
+     *
      * @param pos
      *            the position for the cursor
      */
@@ -693,14 +693,14 @@ public abstract class LegacyAbstractTextField
 
     /**
      * Returns the last known cursor position of the field.
-     * 
+     *
      * <p>
      * Note that due to the client server nature or the GWT terminal, Vaadin
      * cannot provide the exact value of the cursor position in most situations.
      * The value is updated only when the client side terminal communicates to
      * TextField, like on {@link ValueChangeEvent}s and {@link TextChangeEvent}
      * s. This may change later if a deep push integration is built to Vaadin.
-     * 
+     *
      * @return the cursor position
      */
     public int getCursorPosition() {
@@ -766,7 +766,7 @@ public abstract class LegacyAbstractTextField
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#readDesign(org.jsoup.nodes.Element ,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -782,7 +782,7 @@ public abstract class LegacyAbstractTextField
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#getCustomAttributes()
      */
     @Override
@@ -797,7 +797,7 @@ public abstract class LegacyAbstractTextField
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#writeDesign(org.jsoup.nodes.Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java
index f85e680e39..3bdd9293ea 100644
--- a/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.java
+++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyInlineDateField.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
@@ -23,9 +23,9 @@ import com.vaadin.data.Property;
 /**
  * <p>
  * A date entry component, which displays the actual date selector inline.
- * 
+ *
  * </p>
- * 
+ *
  * @see LegacyDateField
  * @see LegacyPopupDateField
  * @author Vaadin Ltd.
diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java
index 681ec40b09..6cd01953de 100644
--- a/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.java
+++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyPopupDateField.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,9 +26,9 @@ import com.vaadin.shared.ui.datefield.PopupDateFieldState;
 /**
  * <p>
  * A date entry component, which displays the actual date selector as a popup.
- * 
+ *
  * </p>
- * 
+ *
  * @see LegacyDateField
  * @see LegacyInlineDateField
  * @author Vaadin Ltd.
@@ -70,7 +70,7 @@ public class LegacyPopupDateField extends LegacyDateField {
 
     /**
      * Gets the current input prompt.
-     * 
+     *
      * @see #setInputPrompt(String)
      * @return the current input prompt, or null if not enabled
      */
@@ -81,7 +81,7 @@ public class LegacyPopupDateField extends LegacyDateField {
     /**
      * Sets the input prompt - a textual prompt that is displayed when the field
      * would otherwise be empty, to prompt the user for input.
-     * 
+     *
      * @param inputPrompt
      */
     public void setInputPrompt(String inputPrompt) {
@@ -101,9 +101,9 @@ public class LegacyPopupDateField extends LegacyDateField {
 
     /**
      * Checks whether the text field is enabled (default) or not.
-     * 
+     *
      * @see PopupDateField#setTextFieldEnabled(boolean);
-     * 
+     *
      * @return <b>true</b> if the text field is enabled, <b>false</b> otherwise.
      */
     public boolean isTextFieldEnabled() {
@@ -114,9 +114,9 @@ public class LegacyPopupDateField extends LegacyDateField {
      * Enables or disables the text field. By default the text field is enabled.
      * Disabling it causes only the button for date selection to be active, thus
      * preventing the user from entering invalid dates.
-     * 
+     *
      * See {@link http://dev.vaadin.com/ticket/6790}.
-     * 
+     *
      * @param state
      *            <b>true</b> to enable text field, <b>false</b> to disable it.
      */
@@ -127,7 +127,7 @@ public class LegacyPopupDateField extends LegacyDateField {
     /**
      * Set a description that explains the usage of the Widget for users of
      * assistive devices.
-     * 
+     *
      * @param description
      *            String with the description
      */
@@ -138,7 +138,7 @@ public class LegacyPopupDateField extends LegacyDateField {
     /**
      * Get the description that explains the usage of the Widget for users of
      * assistive devices.
-     * 
+     *
      * @return String with the description
      */
     public String getAssistiveText() {
diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.java b/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.java
index 9adf5a658e..4d8f4caaec 100644
--- a/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.java
+++ b/server/src/main/java/com/vaadin/legacy/ui/LegacyTextField.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * editor supports both multiline and single line modes, default is one-line
  * mode.
  * </p>
- * 
+ *
  * <p>
  * Since <code>TextField</code> extends <code>LegacyAbstractField</code> it
  * implements the {@link com.vaadin.data.Buffered} interface. A
@@ -37,7 +37,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * {@link com.vaadin.legacy.ui.LegacyAbstractField#setWriteThrough(boolean)}
  * must be called to enable buffering.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -54,7 +54,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
 
     /**
      * Constructs an empty <code>TextField</code> with given caption.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      */
@@ -66,7 +66,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
     /**
      * Constructs a new <code>TextField</code> that's bound to the specified
      * <code>Property</code> and has no caption.
-     * 
+     *
      * @param dataSource
      *            the Property to be edited with this editor.
      */
@@ -77,7 +77,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
     /**
      * Constructs a new <code>TextField</code> that's bound to the specified
      * <code>Property</code> and has the given caption <code>String</code>.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param dataSource
@@ -94,7 +94,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
      * to a Property unless
      * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param value
@@ -107,7 +107,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractTextField#readDesign(org.jsoup.nodes.Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -124,7 +124,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractTextField#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
@@ -140,7 +140,7 @@ public class LegacyTextField extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#clear()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/navigator/NavigationStateManager.java b/server/src/main/java/com/vaadin/navigator/NavigationStateManager.java
index 3e9c54c961..cb0996b7fc 100644
--- a/server/src/main/java/com/vaadin/navigator/NavigationStateManager.java
+++ b/server/src/main/java/com/vaadin/navigator/NavigationStateManager.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 java.io.Serializable;
  * portlet URL navigation and other similar systems.
  * <p>
  * This interface is mostly for internal use by Navigator.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -36,7 +36,7 @@ public interface NavigationStateManager extends Serializable {
     /**
      * Returns the current navigation state including view name and any optional
      * parameters.
-     * 
+     *
      * @return current view and parameter string, not null
      */
     public String getState();
@@ -46,7 +46,7 @@ public interface NavigationStateManager extends Serializable {
      * location, including view name and any optional parameters.
      * <p>
      * This method should be only called by a Navigator.
-     * 
+     *
      * @param fragment
      *            new view and parameter string, not null
      */
diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java
index 71a2115c46..88f25d112b 100644
--- a/server/src/main/java/com/vaadin/navigator/Navigator.java
+++ b/server/src/main/java/com/vaadin/navigator/Navigator.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
@@ -17,13 +17,13 @@ package com.vaadin.navigator;
 
 /*
  * 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
@@ -62,7 +62,7 @@ import com.vaadin.ui.UI;
  * <p>
  * Note that {@link Navigator} is not a component itself but uses a
  * {@link ViewDisplay} to update contents based on the state.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -108,7 +108,7 @@ public class Navigator implements Serializable {
         /**
          * Creates a new URIFragmentManager and attach it to listen to URI
          * fragment changes of a {@link Page}.
-         * 
+         *
          * @param page
          *            page whose URI fragment to get and modify
          */
@@ -148,7 +148,7 @@ public class Navigator implements Serializable {
 
         /**
          * Returns the current URI fragment tracked by this UriFragentManager.
-         * 
+         *
          * @return The URI fragment.
          */
         protected String getFragment() {
@@ -157,7 +157,7 @@ public class Navigator implements Serializable {
 
         /**
          * Sets the URI fragment to the given string.
-         * 
+         *
          * @param fragment
          *            The new URI fragment.
          */
@@ -237,7 +237,7 @@ public class Navigator implements Serializable {
     /**
      * A ViewProvider which supports mapping a single view name to a single
      * pre-initialized view instance.
-     * 
+     *
      * For most cases, ClassBasedViewProvider should be used instead of this.
      */
     public static class StaticViewProvider implements ViewProvider {
@@ -247,7 +247,7 @@ public class Navigator implements Serializable {
         /**
          * Creates a new view provider which returns a pre-created view
          * instance.
-         * 
+         *
          * @param viewName
          *            name of the view (not null)
          * @param view
@@ -281,7 +281,7 @@ public class Navigator implements Serializable {
 
         /**
          * Get the view name for this provider.
-         * 
+         *
          * @return view name for this provider
          */
         public String getViewName() {
@@ -306,7 +306,7 @@ public class Navigator implements Serializable {
         /**
          * Create a new view provider which creates new view instances based on
          * a view class.
-         * 
+         *
          * @param viewName
          *            name of the views to create (not null)
          * @param viewClass
@@ -353,7 +353,7 @@ public class Navigator implements Serializable {
 
         /**
          * Get the view name for this provider.
-         * 
+         *
          * @return view name for this provider
          */
         public String getViewName() {
@@ -362,7 +362,7 @@ public class Navigator implements Serializable {
 
         /**
          * Get the view class for this provider.
-         * 
+         *
          * @return {@link View} class
          */
         public Class<? extends View> getViewClass() {
@@ -393,7 +393,7 @@ public class Navigator implements Serializable {
      * navigator, {@code navigator.navigateTo(navigator.getState())} may need to
      * be explicitly called to ensure the current view matches the navigation
      * state.
-     * 
+     *
      * @param ui
      *            The UI to which this Navigator is attached.
      * @param container
@@ -416,7 +416,7 @@ public class Navigator implements Serializable {
      * navigator, {@code navigator.navigateTo(navigator.getState())} may need to
      * be explicitly called to ensure the current view matches the navigation
      * state.
-     * 
+     *
      * @param ui
      *            The UI to which this Navigator is attached.
      * @param container
@@ -436,7 +436,7 @@ public class Navigator implements Serializable {
      * navigator, {@code navigator.navigateTo(navigator.getState())} may need to
      * be explicitly called to ensure the current view matches the navigation
      * state.
-     * 
+     *
      * @param ui
      *            The UI to which this Navigator is attached.
      * @param display
@@ -457,7 +457,7 @@ public class Navigator implements Serializable {
      * navigator, {@code navigator.navigateTo(navigator.getState())} may need to
      * be explicitly called to ensure the current view matches the navigation
      * state.
-     * 
+     *
      * @param ui
      *            The UI to which this Navigator is attached.
      * @param stateManager
@@ -477,7 +477,7 @@ public class Navigator implements Serializable {
      * Creates a navigator. This method is for use by dependency injection
      * frameworks etc. and must be followed by a call to
      * {@link #init(UI, NavigationStateManager, ViewDisplay)} before use.
-     * 
+     *
      * @since 7.6
      */
     protected Navigator() {
@@ -535,10 +535,10 @@ public class Navigator implements Serializable {
      * <p>
      * Registered {@link ViewChangeListener}s are called upon successful view
      * change.
-     * 
+     *
      * @param navigationState
      *            view name and parameters
-     * 
+     *
      * @throws IllegalArgumentException
      *             if <code>navigationState</code> does not map to a known view
      *             and no error view is registered
@@ -590,7 +590,7 @@ public class Navigator implements Serializable {
      * <p>
      * This method also verifies that the user is allowed to perform the
      * navigation operation.
-     * 
+     *
      * @param view
      *            view to activate
      * @param viewName
@@ -626,10 +626,10 @@ public class Navigator implements Serializable {
     /**
      * Check whether view change is allowed by view change listeners (
      * {@link ViewChangeListener#beforeViewChange(ViewChangeEvent)}).
-     * 
+     *
      * This method can be overridden to extend the behavior, and should not be
      * called directly except by {@link #navigateTo(View, String, String)}.
-     * 
+     *
      * @since 7.6
      * @param event
      *            the event to fire as the before view change event
@@ -644,12 +644,12 @@ public class Navigator implements Serializable {
      * method can be called by {@link #navigateTo(View, String, String)} to
      * revert the URL fragment to point to the previous view to which navigation
      * succeeded.
-     * 
+     *
      * This method should only be called by
      * {@link #navigateTo(View, String, String)}. Normally it should not be
      * overridden, but can be by frameworks that need to hook into view change
      * cancellations of this type.
-     * 
+     *
      * @since 7.6
      */
     protected void revertNavigation() {
@@ -661,11 +661,11 @@ public class Navigator implements Serializable {
     /**
      * Update the internal state of the navigator (parameters, previous
      * successful URL fragment navigated to) when navigation succeeds.
-     * 
+     *
      * Normally this method should not be overridden nor called directly from
      * application code, but it can be called by a custom implementation of
      * {@link #navigateTo(View, String, String)}.
-     * 
+     *
      * @since 7.6
      * @param event
      *            a view change event with details of the change
@@ -688,12 +688,12 @@ public class Navigator implements Serializable {
     /**
      * Update the internal state of the navigator to reflect the actual
      * switching of views.
-     * 
+     *
      * This method should only be called by
      * {@link #navigateTo(View, String, String)} between showing the view and
      * calling {@link View#enter(ViewChangeEvent)}. If this method is
      * overridden, the overriding version must call the super method.
-     * 
+     *
      * @since 7.6
      * @param event
      *            a view change event with details of the change
@@ -712,7 +712,7 @@ public class Navigator implements Serializable {
      * The view change listeners may also e.g. open a warning or question dialog
      * and save the parameters to re-initiate the navigation operation upon user
      * action.
-     * 
+     *
      * @param event
      *            view change event (not null, view change not yet performed)
      * @return true if the view change should be allowed, false to silently
@@ -734,7 +734,7 @@ public class Navigator implements Serializable {
     /**
      * Returns the {@link NavigationStateManager} that is used to get, listen to
      * and manipulate the navigation state used by this Navigator.
-     * 
+     *
      * @return NavigationStateManager in use
      */
     protected NavigationStateManager getStateManager() {
@@ -744,7 +744,7 @@ public class Navigator implements Serializable {
     /**
      * Returns the current navigation state reported by this Navigator's
      * {@link NavigationStateManager}.
-     * 
+     *
      * @return The navigation state.
      */
     public String getState() {
@@ -753,7 +753,7 @@ public class Navigator implements Serializable {
 
     /**
      * Return the {@link ViewDisplay} used by the navigator.
-     * 
+     *
      * @return the ViewDisplay used for displaying views
      */
     public ViewDisplay getDisplay() {
@@ -778,7 +778,7 @@ public class Navigator implements Serializable {
      * Fires an event after the current view has changed.
      * <p>
      * Listeners are called in registration order.
-     * 
+     *
      * @param event
      *            view change event (not null)
      */
@@ -800,7 +800,7 @@ public class Navigator implements Serializable {
      * <p>
      * Note that a view should not be shared between UIs (for instance, it
      * should not be a static field in a UI subclass).
-     * 
+     *
      * @param viewName
      *            String that identifies a view (not null nor empty string)
      * @param view
@@ -825,7 +825,7 @@ public class Navigator implements Serializable {
      * overwrites the old registration of the same type.
      * <p>
      * A new view instance is created every time a view is requested.
-     * 
+     *
      * @param viewName
      *            String that identifies a view (not null nor empty string)
      * @param viewClass
@@ -849,7 +849,7 @@ public class Navigator implements Serializable {
      * <p>
      * This method only applies to views registered using
      * {@link #addView(String, View)} or {@link #addView(String, Class)}.
-     * 
+     *
      * @param viewName
      *            name of the view to remove
      */
@@ -876,7 +876,7 @@ public class Navigator implements Serializable {
      * <p>
      * Providers are called in order of registration until one that can handle
      * the requested view name is found.
-     * 
+     *
      * @param provider
      *            provider to register, not <code>null</code>
      * @throws IllegalArgumentException
@@ -892,7 +892,7 @@ public class Navigator implements Serializable {
 
     /**
      * Unregister a view provider (factory).
-     * 
+     *
      * @param provider
      *            provider to unregister
      */
@@ -908,7 +908,7 @@ public class Navigator implements Serializable {
      * <p>
      * Note that an error view should not be shared between UIs (for instance,
      * it should not be a static field in a UI subclass).
-     * 
+     *
      * @param viewClass
      *            The View class whose instance should be used as the error
      *            view.
@@ -935,7 +935,7 @@ public class Navigator implements Serializable {
      * Registers a view that is displayed when no other view matches the
      * navigation state. This implicitly sets an appropriate error view provider
      * and overrides any previous {@link #setErrorProvider(ViewProvider)} call.
-     * 
+     *
      * @param view
      *            The View that should be used as the error view.
      */
@@ -959,7 +959,7 @@ public class Navigator implements Serializable {
      * navigation state, but could return different views for different states.
      * Its <code>getViewName(String navigationState)</code> should return
      * <code>navigationState</code>.
-     * 
+     *
      * @param provider
      */
     public void setErrorProvider(ViewProvider provider) {
@@ -974,7 +974,7 @@ public class Navigator implements Serializable {
      * beforeViewChange()}) and after (
      * {@link ViewChangeListener#afterViewChange(ViewChangeEvent)
      * afterViewChange()}) a view change occurs.
-     * 
+     *
      * @param listener
      *            Listener to invoke during a view change.
      */
@@ -984,7 +984,7 @@ public class Navigator implements Serializable {
 
     /**
      * Removes a view change listener.
-     * 
+     *
      * @param listener
      *            Listener to remove.
      */
@@ -994,7 +994,7 @@ public class Navigator implements Serializable {
 
     /**
      * Get view provider that handles the given {@code state}.
-     * 
+     *
      * @param state
      *            state string
      * @return suitable provider
@@ -1016,7 +1016,7 @@ public class Navigator implements Serializable {
     /**
      * Creates view change event for given {@code view}, {@code viewName} and
      * {@code parameters}.
-     * 
+     *
      * @since 7.6.7
      * @return view change event
      */
diff --git a/server/src/main/java/com/vaadin/navigator/View.java b/server/src/main/java/com/vaadin/navigator/View.java
index 76b76f5520..826a199fc3 100644
--- a/server/src/main/java/com/vaadin/navigator/View.java
+++ b/server/src/main/java/com/vaadin/navigator/View.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
@@ -23,10 +23,10 @@ import com.vaadin.ui.Component;
 
 /**
  * Interface for all views controlled by the navigator.
- * 
+ *
  * Each view added to the navigator must implement this interface. Typically, a
  * view is a {@link Component}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -34,16 +34,16 @@ public interface View extends Serializable {
 
     /**
      * This view is navigated to.
-     * 
+     *
      * This method is always called before the view is shown on screen.
      * {@link ViewChangeEvent#getParameters() event.getParameters()} may contain
      * extra parameters relevant to the view.
-     * 
+     *
      * @param event
      *            ViewChangeEvent representing the view change that is
      *            occurring. {@link ViewChangeEvent#getNewView()
      *            event.getNewView()} returns <code>this</code>.
-     * 
+     *
      */
     public void enter(ViewChangeEvent event);
 }
diff --git a/server/src/main/java/com/vaadin/navigator/ViewChangeListener.java b/server/src/main/java/com/vaadin/navigator/ViewChangeListener.java
index 7d3f2b6044..18859d8c9e 100644
--- a/server/src/main/java/com/vaadin/navigator/ViewChangeListener.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewChangeListener.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
@@ -21,10 +21,10 @@ import java.util.EventObject;
 
 /**
  * Interface for listening to View changes before and after they occur.
- * 
+ *
  * Implementations of this interface can also block navigation between views
  * before it is performed.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -41,7 +41,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Create a new view change event.
-         * 
+         *
          * @param navigator
          *            Navigator that triggered the event, not null
          */
@@ -56,7 +56,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Returns the navigator that triggered this event.
-         * 
+         *
          * @return Navigator (not null)
          */
         public Navigator getNavigator() {
@@ -65,7 +65,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Returns the view being deactivated.
-         * 
+         *
          * @return old View
          */
         public View getOldView() {
@@ -74,7 +74,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Returns the view being activated.
-         * 
+         *
          * @return new View
          */
         public View getNewView() {
@@ -83,7 +83,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Returns the view name of the view being activated.
-         * 
+         *
          * @return view name of the new View
          */
         public String getViewName() {
@@ -92,7 +92,7 @@ public interface ViewChangeListener extends Serializable {
 
         /**
          * Returns the parameters for the view being activated.
-         * 
+         *
          * @return navigation parameters (potentially bookmarkable) for the new
          *         view
          */
@@ -111,7 +111,7 @@ public interface ViewChangeListener extends Serializable {
      * know the view in question), it should return true. If any listener
      * returns false, the view change is not allowed and
      * <code>afterViewChange()</code> methods are not called.
-     * 
+     *
      * @param event
      *            view change event
      * @return true if the view change should be allowed or this listener does
@@ -124,7 +124,7 @@ public interface ViewChangeListener extends Serializable {
      * method blocked the view change, this method is not called. Be careful of
      * unbounded recursion if you decide to change the view again in the
      * listener.
-     * 
+     *
      * @param event
      *            view change event
      */
diff --git a/server/src/main/java/com/vaadin/navigator/ViewDisplay.java b/server/src/main/java/com/vaadin/navigator/ViewDisplay.java
index 36aa5dadc2..a5700ebbdd 100644
--- a/server/src/main/java/com/vaadin/navigator/ViewDisplay.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewDisplay.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
@@ -20,10 +20,10 @@ import java.io.Serializable;
 
 /**
  * Interface for displaying a view in an appropriate location.
- * 
+ *
  * The view display can be a component/layout itself or can modify a separate
  * layout.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -31,9 +31,9 @@ public interface ViewDisplay extends Serializable {
     /**
      * Remove previously shown view and show the newly selected view in its
      * place.
-     * 
+     *
      * The parameters for the view have been set before this method is called.
-     * 
+     *
      * @param view
      *            new view to show
      */
diff --git a/server/src/main/java/com/vaadin/navigator/ViewProvider.java b/server/src/main/java/com/vaadin/navigator/ViewProvider.java
index ecf4e51073..6846e63b60 100644
--- a/server/src/main/java/com/vaadin/navigator/ViewProvider.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewProvider.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
@@ -21,11 +21,11 @@ import java.io.Serializable;
 /**
  * A provider for view instances that can return pre-registered views or
  * dynamically create new views.
- * 
+ *
  * If multiple providers are used, {@link #getViewName(String)} of each is
  * called (in registration order) until one of them returns a non-null value.
  * The {@link #getView(String)} method of that provider is then used.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
  */
@@ -34,7 +34,7 @@ public interface ViewProvider extends Serializable {
      * Extract the view name from a combined view name and parameter string.
      * This method should return a view name if and only if this provider
      * handles creation of such views.
-     * 
+     *
      * @param viewAndParameters
      *            string with view name and its fragment parameters (if given),
      *            not null
@@ -44,10 +44,10 @@ public interface ViewProvider extends Serializable {
 
     /**
      * Create or return a pre-created instance of a view.
-     * 
+     *
      * The parameters for the view are set separately by the navigator when the
      * view is activated.
-     * 
+     *
      * @param viewName
      *            name of the view, not null
      * @return newly created view (null if none available for the view name)
diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
index 85e87b297d..ca850e4a66 100644
--- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.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
@@ -50,7 +50,7 @@ import elemental.json.JsonObject;
 /**
  * An abstract base class for ClientConnector implementations. This class
  * provides all the basic functionality required for connectors.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -155,12 +155,12 @@ public abstract class AbstractClientConnector
 
     /**
      * Registers an RPC interface implementation for this component.
-     * 
+     *
      * A component can listen to multiple RPC interfaces, and subclasses can
      * register additional implementations.
-     * 
+     *
      * @since 7.0
-     * 
+     *
      * @param implementation
      *            RPC interface implementation
      * @param rpcInterfaceType
@@ -175,12 +175,12 @@ public abstract class AbstractClientConnector
 
     /**
      * Registers an RPC interface implementation for this component.
-     * 
+     *
      * A component can listen to multiple RPC interfaces, and subclasses can
      * register additional implementations.
-     * 
+     *
      * @since 7.0
-     * 
+     *
      * @param implementation
      *            RPC interface implementation. Also used to deduce the type.
      */
@@ -232,7 +232,7 @@ public abstract class AbstractClientConnector
      * state will be sent to the client. Use {@code getState(false)} to avoid
      * marking the connector as dirty.
      * </p>
-     * 
+     *
      * @return The shared state for this connector. Never null.
      */
     protected SharedState getState() {
@@ -241,11 +241,11 @@ public abstract class AbstractClientConnector
 
     /**
      * Returns the shared state for this connector.
-     * 
+     *
      * @param markAsDirty
      *            true if the connector should automatically be marked dirty,
      *            false otherwise
-     * 
+     *
      * @return The shared state for this connector. Never null.
      * @see #getState()
      */
@@ -284,9 +284,9 @@ public abstract class AbstractClientConnector
      * <p>
      * No configuration of the values of the state should be performed in
      * {@link #createState()}.
-     * 
+     *
      * @since 7.0
-     * 
+     *
      * @return new shared state object
      */
     protected SharedState createState() {
@@ -342,12 +342,12 @@ public abstract class AbstractClientConnector
     /**
      * Returns an RPC proxy for a given server to client RPC interface for this
      * component.
-     * 
+     *
      * TODO more javadoc, subclasses, ...
-     * 
+     *
      * @param rpcInterface
      *            RPC interface type
-     * 
+     *
      * @since 7.0
      */
     protected <T extends ClientRpc> T getRpcProxy(final Class<T> rpcInterface) {
@@ -395,14 +395,14 @@ public abstract class AbstractClientConnector
 
     /**
      * For internal use: adds a method invocation to the pending RPC call queue.
-     * 
+     *
      * @param interfaceName
      *            RPC interface name
      * @param method
      *            RPC method
      * @param parameters
      *            RPC all parameters
-     * 
+     *
      * @since 7.0
      */
     protected void addMethodInvocationToQueue(String interfaceName,
@@ -445,7 +445,7 @@ public abstract class AbstractClientConnector
     /**
      * Finds the {@link VaadinSession} to which this connector belongs. If the
      * connector has not been attached, <code>null</code> is returned.
-     * 
+     *
      * @return The connector's session, or <code>null</code> if not attached
      */
     protected VaadinSession getSession() {
@@ -461,7 +461,7 @@ public abstract class AbstractClientConnector
      * Finds a UI ancestor of this connector. <code>null</code> is returned if
      * no UI ancestor is found (typically because the connector is not attached
      * to a proper hierarchy).
-     * 
+     *
      * @return the UI ancestor of this connector, or <code>null</code> if none
      *         is found.
      */
@@ -502,7 +502,7 @@ public abstract class AbstractClientConnector
     /**
      * Get an Iterable for iterating over all child connectors, including both
      * extensions and child components.
-     * 
+     *
      * @param connector
      *            the connector to get children for
      * @return an Iterable giving all child connectors.
@@ -573,7 +573,7 @@ public abstract class AbstractClientConnector
     /**
      * Add an extension to this connector. This method is protected to allow
      * extensions to select which targets they can extend.
-     * 
+     *
      * @param extension
      *            the extension to add
      */
@@ -606,7 +606,7 @@ public abstract class AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.ClientConnector#isAttached()
      */
     @Override
@@ -629,7 +629,7 @@ public abstract class AbstractClientConnector
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * <p>
      * The {@link #getSession()} and {@link #getUI()} methods might return
      * <code>null</code> after this method is called.
@@ -686,12 +686,12 @@ public abstract class AbstractClientConnector
     /**
      * Gets a resource defined using {@link #setResource(String, Resource)} with
      * the corresponding key.
-     * 
+     *
      * @param key
      *            the string identifier of the resource
      * @return a resource, or <code>null</code> if there's no resource
      *         associated with the given key
-     * 
+     *
      * @see #setResource(String, Resource)
      */
     protected Resource getResource(String key) {
@@ -705,7 +705,7 @@ public abstract class AbstractClientConnector
      * connector using
      * {@link com.vaadin.terminal.gwt.client.ui.AbstractConnector#getResourceUrl(String)}
      * with the same key.
-     * 
+     *
      * @param key
      *            the string key to associate the resource with
      * @param resource
@@ -732,17 +732,17 @@ public abstract class AbstractClientConnector
      * have any arguments the event object will not be passed to it when it's
      * called.
      * </p>
-     * 
+     *
      * <p>
      * This method additionally informs the event-api to route events with the
      * given eventIdentifier to the components handleEvent function call.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventIdentifier
      *            the identifier of the event to listen for
      * @param eventType
@@ -752,7 +752,7 @@ public abstract class AbstractClientConnector
      *            the object instance who owns the activation method.
      * @param method
      *            the activation method.
-     * 
+     *
      * @since 6.2
      */
     protected void addListener(String eventIdentifier, Class<?> eventType,
@@ -771,7 +771,7 @@ public abstract class AbstractClientConnector
 
     /**
      * Checks if the given {@link Event} type is listened for this component.
-     * 
+     *
      * @param eventType
      *            the event type to be checked
      * @return true if a listener is registered for the given event type
@@ -786,18 +786,18 @@ public abstract class AbstractClientConnector
      * parameters, it will unregister all <code>object</code>'s methods that are
      * registered to listen to events of type <code>eventType</code> generated
      * by this component.
-     * 
+     *
      * <p>
      * This method additionally informs the event-api to stop routing events
      * with the given eventIdentifier to the components handleEvent function
      * call.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventIdentifier
      *            the identifier of the event to stop listening for
      * @param eventType
@@ -805,7 +805,7 @@ 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.
-     * 
+     *
      * @since 6.2
      */
     protected void removeListener(String eventIdentifier, Class<?> eventType,
@@ -826,12 +826,12 @@ public abstract class AbstractClientConnector
      * have any arguments the event object will not be passed to it when it's
      * called.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the type of the listened event. Events of this type or its
      *            subclasses activate the listener.
@@ -839,7 +839,7 @@ public abstract class AbstractClientConnector
      *            the object instance who owns the activation method.
      * @param method
      *            the activation method.
-     * 
+     *
      */
     @Override
     public void addListener(Class<?> eventType, Object target, Method method) {
@@ -856,25 +856,25 @@ public abstract class AbstractClientConnector
      * activation method does not have any arguments the event object will not
      * be passed to it when it's called.
      * </p>
-     * 
+     *
      * <p>
      * This version of <code>addListener</code> gets the name of the activation
      * method as a parameter. The actual method is reflected from
      * <code>object</code>, and unless exactly one match is found,
      * <code>java.lang.IllegalArgumentException</code> is thrown.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * <p>
      * Note: Using this method is discouraged because it cannot be checked
      * during compilation. Use {@link #addListener(Class, Object, Method)} or
      * {@link #addListener(com.vaadin.ui.Component.Listener)} instead.
      * </p>
-     * 
+     *
      * @param eventType
      *            the type of the listened event. Events of this type or its
      *            subclasses activate the listener.
@@ -902,12 +902,12 @@ public abstract class AbstractClientConnector
      * parameters, it will unregister all <code>object</code>'s methods that are
      * registered to listen to events of type <code>eventType</code> generated
      * by this component.
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
@@ -925,12 +925,12 @@ public abstract class AbstractClientConnector
      * Removes one registered listener method. The given method owned by the
      * given object will no longer be called when the specified events are
      * generated by this component.
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
@@ -954,19 +954,19 @@ public abstract class AbstractClientConnector
      * given object will no longer be called when the specified events are
      * generated by this component.
      * </p>
-     * 
+     *
      * <p>
      * This version of <code>removeListener</code> gets the name of the
      * activation method as a parameter. The actual method is reflected from
      * <code>target</code>, and unless exactly one match is found,
      * <code>java.lang.IllegalArgumentException</code> is thrown.
      * </p>
-     * 
+     *
      * <p>
      * For more information on the inheritable event mechanism see the
      * {@link com.vaadin.event com.vaadin.event package documentation}.
      * </p>
-     * 
+     *
      * @param eventType
      *            the exact event type the <code>object</code> listens to.
      * @param target
@@ -990,7 +990,7 @@ public abstract class AbstractClientConnector
     /**
      * Returns all listeners that are registered for the given event type or one
      * of its subclasses.
-     * 
+     *
      * @param eventType
      *            The type of event to return listeners for.
      * @return A collection with all registered listeners. Empty if no listeners
@@ -1006,7 +1006,7 @@ public abstract class AbstractClientConnector
 
     /**
      * Sends the event to all listeners.
-     * 
+     *
      * @param event
      *            the Event to be sent to all listeners.
      */
@@ -1018,7 +1018,7 @@ public abstract class AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.ClientConnector#getErrorHandler()
      */
     @Override
@@ -1028,7 +1028,7 @@ public abstract class AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.ClientConnector#setErrorHandler(com.vaadin.server.
      * ErrorHandler)
      */
@@ -1039,7 +1039,7 @@ public abstract class AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
@@ -1066,7 +1066,7 @@ public abstract class AbstractClientConnector
      * by the proxy to actually be called on the underlying instance.
      * <p>
      * See #14639
-     * 
+     *
      * @deprecated only defined for framework hacks, do not use.
      */
     @Deprecated
@@ -1076,7 +1076,7 @@ public abstract class AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#hashCode()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java
index 709c7930dd..b1e4413508 100644
--- a/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java
+++ b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.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
@@ -18,9 +18,9 @@ package com.vaadin.server;
 /**
  * An abstract base class for DeploymentConfiguration implementations. This
  * class provides default implementation for common config properties.
- * 
+ *
  * @since 7.4
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class AbstractDeploymentConfiguration
diff --git a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
index 29eddfdf53..5d34f73c54 100644
--- a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.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,10 +26,10 @@ import com.vaadin.legacy.data.Validator;
 
 /**
  * Base class for component error messages.
- * 
+ *
  * This class is used on the server side to construct the error messages to send
  * to the client.
- * 
+ *
  * @since 7.0
  */
 public abstract class AbstractErrorMessage implements ErrorMessage {
@@ -46,7 +46,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage {
 
         /**
          * Content mode, where the error contains HTML.
-         * 
+         *
          */
         HTML,
     }
diff --git a/server/src/main/java/com/vaadin/server/AbstractExtension.java b/server/src/main/java/com/vaadin/server/AbstractExtension.java
index c72cc9cb39..513084c179 100644
--- a/server/src/main/java/com/vaadin/server/AbstractExtension.java
+++ b/server/src/main/java/com/vaadin/server/AbstractExtension.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
@@ -25,7 +25,7 @@ package com.vaadin.server;
  * AbstractExtension adds a mechanism for adding the extension to any Connector
  * (extend). To let the Extension determine what kind target it can be added to,
  * the extend method is declared as protected.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -44,9 +44,9 @@ public abstract class AbstractExtension extends AbstractClientConnector
 
     /**
      * Creates a new extension instance that extends the provided connector.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param target
      *            the connector to extend
      */
@@ -59,7 +59,7 @@ public abstract class AbstractExtension extends AbstractClientConnector
      * Gets a type that the parent must be an instance of. Override this if the
      * extension only support certain targets, e.g. if only TextFields can be
      * extended.
-     * 
+     *
      * @return a type that the parent must be an instance of
      */
     protected Class<? extends ClientConnector> getSupportedParentType() {
@@ -69,7 +69,7 @@ public abstract class AbstractExtension extends AbstractClientConnector
     /**
      * Add this extension to the target connector. This method is protected to
      * allow subclasses to require a more specific type of target.
-     * 
+     *
      * @param target
      *            the connector to attach this extension to
      */
@@ -103,7 +103,7 @@ public abstract class AbstractExtension extends AbstractClientConnector
 
     /**
      * Actually sets the parent and calls required listeners.
-     * 
+     *
      * @since 7.1
      * @param parent
      *            The parent to set
diff --git a/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java
index ae7bafb142..56e258ded8 100644
--- a/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java
+++ b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.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
@@ -39,7 +39,7 @@ import elemental.json.JsonValue;
  * , then <code>com_example_SuperExtension</code> will also be attempted if
  * <code>com_example_MyExtension</code> has not been defined.
  * <p>
- * 
+ *
  * The initialization function will be called with <code>this</code> pointing to
  * a connector wrapper object providing integration to Vaadin. Please note that
  * in JavaScript, <code>this</code> is not necessarily defined inside callback
@@ -103,7 +103,7 @@ import elemental.json.JsonValue;
  * field.</li>
  * </ul>
  * <p>
- * 
+ *
  * Values in the Shared State and in RPC calls are converted between Java and
  * JavaScript using the following conventions:
  * <ul>
@@ -130,7 +130,7 @@ import elemental.json.JsonValue;
  * here. Please refer to the documentation for specific types for serialization
  * information.</li>
  * </ul>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -148,9 +148,9 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension {
 
     /**
      * Creates a new JavaScript extension extending the provided connector.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param target
      *            the connector to extend
      */
@@ -173,7 +173,7 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension {
      * available as <code>this</code>). Calling that JavaScript function will
      * cause the call method in the registered {@link JavaScriptFunction} to be
      * invoked with the same arguments.
-     * 
+     *
      * @param functionName
      *            the name that should be used for client-side callback
      * @param function
@@ -194,7 +194,7 @@ public abstract class AbstractJavaScriptExtension extends AbstractExtension {
      * before sending. This can be done either with
      * {@link JsonCodec#encode(Object, JsonValue, java.lang.reflect.Type, com.vaadin.ui.ConnectorTracker)}
      * or using the factory methods in {@link Json}.
-     * 
+     *
      * @param name
      *            the name of the function
      * @param arguments
diff --git a/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.java b/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.java
index 14a12a20ec..050645f524 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.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.ui.UI;
  * A representation of a bootstrap fragment being generated. The bootstrap
  * fragment is the HTML code that will make up the actual application. This also
  * includes the JavaScript that initializes the application.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -35,10 +35,10 @@ public class BootstrapFragmentResponse extends BootstrapResponse {
 
     /**
      * Crate a new bootstrap fragment response.
-     * 
+     *
      * @see BootstrapResponse#BootstrapResponse(BootstrapHandler, VaadinRequest,
      *      VaadinSession, Class)
-     * 
+     *
      * @param handler
      *            the bootstrap handler that is firing the event
      * @param request
@@ -67,7 +67,7 @@ public class BootstrapFragmentResponse extends BootstrapResponse {
      * Gets the list of DOM nodes that will be used to generate the fragment
      * HTML. Changes to the returned list will be reflected in the generated
      * HTML.
-     * 
+     *
      * @return the current list of DOM nodes that makes up the application
      *         fragment
      */
diff --git a/server/src/main/java/com/vaadin/server/BootstrapListener.java b/server/src/main/java/com/vaadin/server/BootstrapListener.java
index 374268dbdc..fbd1357632 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapListener.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapListener.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 javax.portlet.RenderResponse;
  * send to the client. The bootstrap HTML is first constructed as an in-memory
  * DOM representation which registered listeners can modify before the final
  * HTML is generated.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -36,7 +36,7 @@ public interface BootstrapListener extends EventListener, Serializable {
      * Vaadin application. In a typical Servlet deployment, this is the contents
      * of the HTML body tag. In a typical Portlet deployment, this is the HTML
      * that will be returned in a {@link RenderResponse}.
-     * 
+     *
      * @param response
      *            the bootstrap response that can modified to cause changes in
      *            the generated HTML.
@@ -52,7 +52,7 @@ public interface BootstrapListener extends EventListener, Serializable {
      * If a full page is being generated, this method is invoked after
      * {@link #modifyBootstrapFragment(BootstrapFragmentResponse)} has been
      * invoked for all registered listeners.
-     * 
+     *
      * @param response
      *            the bootstrap response that can be modified to cause change in
      *            the generate HTML and in the HTTP headers of the response.
diff --git a/server/src/main/java/com/vaadin/server/BootstrapPageResponse.java b/server/src/main/java/com/vaadin/server/BootstrapPageResponse.java
index e57ed413f0..9583783fd1 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapPageResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapPageResponse.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.ui.UI;
  * A representation of a bootstrap page being generated. The bootstrap page
  * contains of the full DOM of the HTML document as well as the HTTP headers
  * that will be included in the corresponding HTTP response.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -37,10 +37,10 @@ public class BootstrapPageResponse extends BootstrapResponse {
 
     /**
      * Crate a new bootstrap page response.
-     * 
+     *
      * @see BootstrapResponse#BootstrapResponse(BootstrapHandler, VaadinRequest,
      *      VaadinSession, Class)
-     * 
+     *
      * @param handler
      *            the bootstrap handler that is firing the event
      * @param request
@@ -70,9 +70,9 @@ public class BootstrapPageResponse extends BootstrapResponse {
     /**
      * Sets a header value that will be added to the HTTP response. If the
      * header had already been set, the new value overwrites the previous one.
-     * 
+     *
      * @see VaadinResponse#setHeader(String, String)
-     * 
+     *
      * @param name
      *            the name of the header
      * @param value
@@ -86,10 +86,10 @@ public class BootstrapPageResponse extends BootstrapResponse {
      * Properly formats a timestamp as a date in a header that will be included
      * in the HTTP response. If the header had already been set, the new value
      * overwrites the previous one.
-     * 
+     *
      * @see #setHeader(String, String)
      * @see VaadinResponse#setDateHeader(String, long)
-     * 
+     *
      * @param name
      *            the name of the header
      * @param timestamp
@@ -103,7 +103,7 @@ public class BootstrapPageResponse extends BootstrapResponse {
      * Gets the document node representing the root of the DOM hierarchy that
      * will be used to generate the HTML page. Changes to the document will be
      * reflected in the HTML.
-     * 
+     *
      * @return the document node
      */
     public Document getDocument() {
diff --git a/server/src/main/java/com/vaadin/server/BootstrapResponse.java b/server/src/main/java/com/vaadin/server/BootstrapResponse.java
index 59e18d4c8a..84c395d003 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapResponse.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.UI;
 /**
  * Base class providing common functionality used in different bootstrap
  * modification events.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -35,7 +35,7 @@ public abstract class BootstrapResponse extends EventObject {
 
     /**
      * Creates a new bootstrap event.
-     * 
+     *
      * @param handler
      *            the bootstrap handler that is firing the event
      * @param request
@@ -60,7 +60,7 @@ public abstract class BootstrapResponse extends EventObject {
 
     /**
      * Gets the bootstrap handler that fired this event
-     * 
+     *
      * @return the bootstrap handler that fired this event
      */
     public BootstrapHandler getBootstrapHandler() {
@@ -74,7 +74,7 @@ public abstract class BootstrapResponse extends EventObject {
      * will not be available because the bootstrap page is generated before the
      * bootstrap javascript has had a chance to send any information back to the
      * server.
-     * 
+     *
      * @return the Vaadin request that is being handled
      */
     public VaadinRequest getRequest() {
@@ -83,7 +83,7 @@ public abstract class BootstrapResponse extends EventObject {
 
     /**
      * Gets the service session to which the rendered view belongs.
-     * 
+     *
      * @return the Vaadin service session
      */
     public VaadinSession getSession() {
@@ -93,7 +93,7 @@ public abstract class BootstrapResponse extends EventObject {
     /**
      * Gets the class of the UI that will be displayed on the generated
      * bootstrap page.
-     * 
+     *
      * @return the class of the UI
      */
     public Class<? extends UI> getUiClass() {
@@ -103,7 +103,7 @@ public abstract class BootstrapResponse extends EventObject {
     /**
      * Gets the UI provider that is used to provide information about the
      * bootstapped UI.
-     * 
+     *
      * @return the UI provider
      */
     public UIProvider getUIProvider() {
diff --git a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java
index de6ab10527..df490cfd74 100644
--- a/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java
+++ b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.UI;
 /**
  * Component extension that opens a browser popup window when the extended
  * component is clicked.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -70,7 +70,7 @@ public class BrowserWindowOpener extends AbstractExtension {
     /**
      * Creates a window opener that will open windows containing the provided UI
      * class
-     * 
+     *
      * @param uiClass
      *            the UI class that should be opened when the extended component
      *            is clicked
@@ -82,7 +82,7 @@ public class BrowserWindowOpener extends AbstractExtension {
     /**
      * Creates a window opener that will open windows containing the provided UI
      * using the provided path
-     * 
+     *
      * @param uiClass
      *            the UI class that should be opened when the extended component
      *            is clicked
@@ -98,7 +98,7 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Creates a window opener that will open windows to the provided URL
-     * 
+     *
      * @param url
      *            the URL to open in the window
      */
@@ -108,7 +108,7 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Creates a window opener that will open window to the provided resource
-     * 
+     *
      * @param resource
      *            the resource to open in the window
      */
@@ -130,9 +130,9 @@ public class BrowserWindowOpener extends AbstractExtension {
      * Sets the provided URL {@code url} for this instance. The {@code url} will
      * be opened in a new browser window/tab when the extended component is
      * clicked.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param url
      *            URL to open
      */
@@ -144,9 +144,9 @@ public class BrowserWindowOpener extends AbstractExtension {
      * Sets the provided {@code resource} for this instance. The
      * {@code resource} will be opened in a new browser window/tab when the
      * extended component is clicked.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @param resource
      *            resource to open
      */
@@ -156,9 +156,9 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Returns the resource for this instance.
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @return resource to open browser window
      */
     public Resource getResource() {
@@ -169,9 +169,9 @@ public class BrowserWindowOpener extends AbstractExtension {
      * Returns the URL for this BrowserWindowOpener instance. Returns
      * {@code null} if this instance is not URL resource based (a non URL based
      * resource has been set for it).
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @return URL to open in the new browser window/tab when the extended
      *         component is clicked
      */
@@ -189,7 +189,7 @@ public class BrowserWindowOpener extends AbstractExtension {
      * replaced instead of opening a new window. If the name is
      * <code>null</code> or <code>"_blank"</code>, a new window will always be
      * opened.
-     * 
+     *
      * @param windowName
      *            the target name for the window
      */
@@ -199,9 +199,9 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Gets the target window name.
-     * 
+     *
      * @see #setWindowName(String)
-     * 
+     *
      * @return the window target string
      */
     public String getWindowName() {
@@ -214,7 +214,7 @@ public class BrowserWindowOpener extends AbstractExtension {
      * 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}
      * for a description of the commonly supported features.
-     * 
+     *
      * @param features a string with window features, or <code>null</code> to use the default features.
      */
     // @formatter:on
@@ -224,7 +224,7 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Gets the window features.
-     * 
+     *
      * @see #setFeatures(String)
      * @return
      */
@@ -270,7 +270,7 @@ public class BrowserWindowOpener extends AbstractExtension {
      * new UI.
      * <p>
      * The default value is <code>null</code>.
-     * 
+     *
      * @param uriFragment
      *            the URI fragment string that should be included in the opened
      *            URI, or <code>null</code> to preserve the original fragment of
@@ -282,10 +282,10 @@ public class BrowserWindowOpener extends AbstractExtension {
 
     /**
      * Gets that URI fragment configured for opened windows.
-     * 
+     *
      * @return the URI fragment string, or <code>null</code> if no fragment is
      *         configured.
-     * 
+     *
      * @see #setUriFragment(String)
      */
     public String getUriFragment() {
@@ -300,12 +300,12 @@ public class BrowserWindowOpener extends AbstractExtension {
      * <p>
      * Setting a parameter with the same name as a previously set parameter will
      * replace the previous value.
-     * 
+     *
      * @param name
      *            the name of the parameter to add, not <code>null</code>
      * @param value
      *            the value of the parameter to add, not <code>null</code>
-     * 
+     *
      * @see #removeParameter(String)
      * @see #getParameterNames()
      * @see #getParameter(String)
@@ -321,10 +321,10 @@ public class BrowserWindowOpener extends AbstractExtension {
      * Removes a parameter that has been set using
      * {@link #setParameter(String, String)}. Removing a parameter that has not
      * been set has no effect.
-     * 
+     *
      * @param name
      *            the name of the parameter to remove, not <code>null</code>
-     * 
+     *
      * @see #setParameter(String, String)
      */
     public void removeParameter(String name) {
@@ -337,9 +337,9 @@ public class BrowserWindowOpener extends AbstractExtension {
     /**
      * Gets the names of all parameters set using
      * {@link #setParameter(String, String)}.
-     * 
+     *
      * @return an unmodifiable set of parameter names
-     * 
+     *
      * @see #setParameter(String, String)
      * @see #getParameter(String)
      */
@@ -351,12 +351,12 @@ public class BrowserWindowOpener extends AbstractExtension {
      * Gets the value of a parameter set using
      * {@link #setParameter(String, String)}. If there is no parameter with the
      * given name, <code>null</code> is returned.
-     * 
+     *
      * @param name
      *            the name of the parameter to get, not <code>null</code>
      * @return the value of the parameter, or <code>null</code> there is no
      *         parameter
-     * 
+     *
      * @see #setParameter(String, String)
      * @see #getParameter(String)
      */
diff --git a/server/src/main/java/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java
index e02590208c..86d66eade8 100644
--- a/server/src/main/java/com/vaadin/server/ClassResource.java
+++ b/server/src/main/java/com/vaadin/server/ClassResource.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
@@ -25,11 +25,11 @@ import com.vaadin.util.FileTypeResolver;
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
  * loader.
- * 
+ *
  * This can be used to access resources such as icons, files, etc.
- * 
+ *
  * @see java.lang.Class#getResource(java.lang.String)
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -60,7 +60,7 @@ public class ClassResource implements ConnectorResource, Serializable {
      * Creates a new application resource instance. The resource id is relative
      * to the location of the UI of the component using this resource (or the
      * Application if using LegacyWindow).
-     * 
+     *
      * @param resourceName
      *            the Unique identifier of the resource within the application.
      */
@@ -70,7 +70,7 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Creates a new application resource instance.
-     * 
+     *
      * @param associatedClass
      *            the class of the which the resource is associated.
      * @param resourceName
@@ -86,7 +86,7 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Gets the MIME type of this resource.
-     * 
+     *
      * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
@@ -125,12 +125,12 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Gets the size of the download buffer used for this resource.
-     * 
+     *
      * <p>
      * If the buffer size is 0, the buffer size is decided by the terminal
      * adapter. The default value is 0.
      * </p>
-     * 
+     *
      * @return the size of the buffer in bytes.
      */
     public int getBufferSize() {
@@ -139,10 +139,10 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Sets the size of the download buffer used for this resource.
-     * 
+     *
      * @param bufferSize
      *            the size of the buffer in bytes.
-     * 
+     *
      * @see #getBufferSize()
      */
     public void setBufferSize(int bufferSize) {
@@ -151,13 +151,13 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Gets the length of cache expiration time.
-     * 
+     *
      * <p>
      * This gives the adapter the possibility cache streams sent to the client.
      * The caching may be made in adapter or at the client if the client
      * supports caching. Default is {@link DownloadStream#DEFAULT_CACHETIME}.
      * </p>
-     * 
+     *
      * @return Cache time in milliseconds
      */
     public long getCacheTime() {
@@ -166,17 +166,17 @@ public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Sets the length of cache expiration time.
-     * 
+     *
      * <p>
      * This gives the adapter the possibility cache streams sent to the client.
      * The caching may be made in adapter or at the client if the client
      * supports caching. Zero or negative value disables the caching of this
      * stream.
      * </p>
-     * 
+     *
      * @param cacheTime
      *            the cache time in milliseconds.
-     * 
+     *
      */
     public void setCacheTime(long cacheTime) {
         this.cacheTime = cacheTime;
diff --git a/server/src/main/java/com/vaadin/server/ClientConnector.java b/server/src/main/java/com/vaadin/server/ClientConnector.java
index b9584eff7d..d357d85624 100644
--- a/server/src/main/java/com/vaadin/server/ClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/ClientConnector.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
@@ -32,10 +32,10 @@ import elemental.json.JsonObject;
 /**
  * Interface implemented by all connectors that are capable of communicating
  * with the client side
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
- * 
+ *
  */
 public interface ClientConnector extends Connector {
 
@@ -52,7 +52,7 @@ public interface ClientConnector extends Connector {
 
     /**
      * Interface for listening {@link AttachEvent connector attach events}.
-     * 
+     *
      */
     public static interface AttachListener extends ConnectorEventListener {
         public static final Method attachMethod = ReflectTools
@@ -60,7 +60,7 @@ public interface ClientConnector extends Connector {
 
         /**
          * Called when a AttachListener is notified of a AttachEvent.
-         * 
+         *
          * @param event
          *            The attach event that was fired.
          */
@@ -80,7 +80,7 @@ public interface ClientConnector extends Connector {
 
     /**
      * Interface for listening {@link DetachEvent connector detach events}.
-     * 
+     *
      */
     public static interface DetachListener extends ConnectorEventListener {
         public static final Method detachMethod = ReflectTools
@@ -88,7 +88,7 @@ public interface ClientConnector extends Connector {
 
         /**
          * Called when a DetachListener is notified of a DetachEvent.
-         * 
+         *
          * @param event
          *            The detach event that was fired.
          */
@@ -120,7 +120,7 @@ public interface ClientConnector extends Connector {
 
         /**
          * Gets the connector for which this error occurred.
-         * 
+         *
          * @return The connector for which the error occurred
          */
         public Connector getConnector() {
@@ -132,7 +132,7 @@ public interface ClientConnector extends Connector {
     /**
      * Returns the list of pending server to client RPC calls and clears the
      * list.
-     * 
+     *
      * @return an unmodifiable ordered list of pending server to client method
      *         calls (not null)
      */
@@ -141,14 +141,14 @@ public interface ClientConnector extends Connector {
     /**
      * Checks if the communicator is enabled. An enabled communicator is allowed
      * to receive messages from its counter-part.
-     * 
+     *
      * @return true if the connector can receive messages, false otherwise
      */
     public boolean isConnectorEnabled();
 
     /**
      * Returns the type of the shared state for this connector
-     * 
+     *
      * @return The type of the state. Must never return null.
      */
     public Class<? extends SharedState> getStateType();
@@ -168,7 +168,7 @@ public interface ClientConnector extends Connector {
      * {@link #beforeClientResponse(boolean)} followed by {@link #encodeState()}
      * for all connectors that are marked as dirty and send any updated state
      * info to the client.
-     * 
+     *
      * @since 7.0.0
      */
     public void markAsDirty();
@@ -184,16 +184,16 @@ public interface ClientConnector extends Connector {
      * <p>
      * This should only be used in special cases, e.g when the state of a
      * descendant depends on the state of an ancestor.
-     * 
+     *
      * @see #markAsDirty()
-     * 
+     *
      * @since 7.0.0
      */
     public void markAsDirtyRecursive();
 
     /**
      * Checks if the connector is attached to a VaadinSession.
-     * 
+     *
      * @since 7.1
      * @return true if the connector is attached to a session, false otherwise
      */
@@ -209,7 +209,7 @@ public interface ClientConnector extends Connector {
      * the session. This method is always called before the connector's data is
      * sent to the client-side for the first time.
      * </p>
-     * 
+     *
      * <p>
      * The attachment logic is implemented in {@link AbstractClientConnector}.
      * </p>
@@ -218,26 +218,26 @@ public interface ClientConnector extends Connector {
 
     /**
      * Notifies the connector that it is detached from its VaadinSession.
-     * 
+     *
      * <p>
      * The caller of this method is {@link #setParent(ClientConnector)} if the
      * parent is in the session. When the parent is detached from the session it
      * is its responsibility to call {@link #detach()} for each of its children.
-     * 
+     *
      * </p>
      */
     public void detach();
 
     /**
      * Get a read-only collection of all extensions attached to this connector.
-     * 
+     *
      * @return a collection of extensions
      */
     public Collection<Extension> getExtensions();
 
     /**
      * Remove an extension from this connector.
-     * 
+     *
      * @param extension
      *            the extension to remove.
      */
@@ -245,7 +245,7 @@ public interface ClientConnector extends Connector {
 
     /**
      * Returns the UI this connector is attached to
-     * 
+     *
      * @return The UI this connector is attached to or null if it is not
      *         attached to any UI
      */
@@ -256,13 +256,13 @@ public interface ClientConnector extends Connector {
      * client. Gives the connector an opportunity to set computed/dynamic state
      * values or to invoke last minute RPC methods depending on other component
      * features.
-     * 
+     *
      * @param initial
      *            <code>true</code> if the client-side connector will be created
      *            and initialized after this method has been invoked.
      *            <code>false</code> if there is already an initialized
      *            client-side connector.
-     * 
+     *
      * @since 7.0
      */
     public void beforeClientResponse(boolean initial);
@@ -272,7 +272,7 @@ public interface ClientConnector extends Connector {
      * typically done by calling the static method
      * {@link LegacyCommunicationManager#encodeState(ClientConnector, SharedState)}
      * .
-     * 
+     *
      * @return a JSON object with the encoded connector state
      */
     public JsonObject encodeState();
@@ -292,7 +292,7 @@ public interface ClientConnector extends Connector {
      * the session should be unlocked before writing a large response to the
      * client.
      * </p>
-     * 
+     *
      * @param request
      *            the request that should be handled
      * @param response
@@ -310,7 +310,7 @@ public interface ClientConnector extends Connector {
     /**
      * Returns the RPC manager instance to use when receiving calls for an RPC
      * interface.
-     * 
+     *
      * @param rpcInterfaceName
      *            name of the interface for which the call was made
      * @return ServerRpcManager or null if none found for the interface
@@ -319,20 +319,20 @@ public interface ClientConnector extends Connector {
 
     /**
      * Gets the error handler for the connector.
-     * 
+     *
      * The error handler is dispatched whenever there is an error processing the
      * data coming from the client to this connector.
-     * 
+     *
      * @return The error handler or null if not set
      */
     public ErrorHandler getErrorHandler();
 
     /**
      * Sets the error handler for the connector.
-     * 
+     *
      * The error handler is dispatched whenever there is an error processing the
      * data coming from the client for this connector.
-     * 
+     *
      * @param errorHandler
      *            The error handler for this connector
      */
diff --git a/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java
index 99458ac00e..67bac57300 100644
--- a/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java
+++ b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.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
@@ -30,7 +30,7 @@ import elemental.json.impl.JsonUtil;
 /**
  * Internal class for keeping track of pending server to client method
  * invocations for a Connector.
- * 
+ *
  * @since 7.0
  */
 public class ClientMethodInvocation
diff --git a/server/src/main/java/com/vaadin/server/CompositeErrorMessage.java b/server/src/main/java/com/vaadin/server/CompositeErrorMessage.java
index ee2af74994..de5b932d0e 100644
--- a/server/src/main/java/com/vaadin/server/CompositeErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/CompositeErrorMessage.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
@@ -21,7 +21,7 @@ import java.util.Iterator;
 
 /**
  * Class for combining multiple error messages together.
- * 
+ *
  * @author Vaadin Ltd
  * @since 3.0
  */
@@ -30,7 +30,7 @@ public class CompositeErrorMessage extends AbstractErrorMessage {
 
     /**
      * Constructor for CompositeErrorMessage.
-     * 
+     *
      * @param errorMessages
      *            the array of error messages that are listed together. Nulls
      *            are ignored, but at least one message is required.
@@ -52,7 +52,7 @@ public class CompositeErrorMessage extends AbstractErrorMessage {
 
     /**
      * Constructor for CompositeErrorMessage.
-     * 
+     *
      * @param errorMessages
      *            the Collection of error messages that are listed together. At
      *            least one message is required.
@@ -76,7 +76,7 @@ public class CompositeErrorMessage extends AbstractErrorMessage {
     /**
      * Adds a error message into this composite message. Updates the level
      * field.
-     * 
+     *
      * @param error
      *            the error message to be added. Duplicate errors are ignored.
      */
@@ -91,7 +91,7 @@ public class CompositeErrorMessage extends AbstractErrorMessage {
 
     /**
      * Gets Error Iterator.
-     * 
+     *
      * @return the error iterator.
      */
     public Iterator<ErrorMessage> iterator() {
@@ -100,7 +100,7 @@ public class CompositeErrorMessage extends AbstractErrorMessage {
 
     /**
      * Returns a comma separated list of the error messages.
-     * 
+     *
      * @return String, comma separated list of error messages.
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/ConnectorResource.java b/server/src/main/java/com/vaadin/server/ConnectorResource.java
index 3c4fb1955f..53225087d6 100644
--- a/server/src/main/java/com/vaadin/server/ConnectorResource.java
+++ b/server/src/main/java/com/vaadin/server/ConnectorResource.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
@@ -18,9 +18,9 @@ package com.vaadin.server;
 
 /**
  * A resource that is served through the Connector that is using the resource.
- * 
+ *
  * @see AbstractClientConnector#setResource(String, Resource)
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
@@ -37,14 +37,14 @@ public interface ConnectorResource extends Resource {
      * holding session locks (to prevent locking the session during long file
      * downloads).
      * </p>
-     * 
+     *
      * @return A download stream which produces the resource content
      */
     public DownloadStream getStream();
 
     /**
      * Gets the virtual filename for this resource.
-     * 
+     *
      * @return the file name associated to this resource.
      */
     public String getFilename();
diff --git a/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java
index e10248cb31..a07380a521 100644
--- a/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java
+++ b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.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/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java
index b1c48c450e..0c1da79ec4 100644
--- a/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java
+++ b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.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
@@ -54,7 +54,7 @@ public class CustomizedSystemMessages extends SystemMessages
 
     /**
      * Sets the URL to go to when the session has expired.
-     * 
+     *
      * @param sessionExpiredURL
      *            the URL to go to, or null to reload current
      */
@@ -66,7 +66,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * Enables or disables the notification. If disabled, the set URL (or
      * current) is loaded directly when next transaction between server and
      * client happens.
-     * 
+     *
      * @param sessionExpiredNotificationEnabled
      *            true = enabled, false = disabled
      */
@@ -80,7 +80,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * caption and message are null, client automatically forwards to
      * sessionExpiredUrl after timeout timer expires. Timer uses value read from
      * HTTPSession.getMaxInactiveInterval()
-     * 
+     *
      * @param sessionExpiredCaption
      *            the caption
      */
@@ -93,7 +93,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * caption and message are null, client automatically forwards to
      * sessionExpiredUrl after timeout timer expires. Timer uses value read from
      * HTTPSession.getMaxInactiveInterval()
-     * 
+     *
      * @param sessionExpiredMessage
      *            the message
      */
@@ -103,7 +103,7 @@ public class CustomizedSystemMessages extends SystemMessages
 
     /**
      * Sets the URL to go to when there is a authentication error.
-     * 
+     *
      * @param authenticationErrorURL
      *            the URL to go to, or null to reload current
      */
@@ -114,7 +114,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Enables or disables the notification. If disabled, the set URL (or
      * current) is loaded directly.
-     * 
+     *
      * @param authenticationErrorNotificationEnabled
      *            true = enabled, false = disabled
      */
@@ -126,7 +126,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the caption of the notification. Set to null for no caption. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param authenticationErrorCaption
      *            the caption
      */
@@ -138,7 +138,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the message of the notification. Set to null for no message. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param authenticationErrorMessage
      *            the message
      */
@@ -149,7 +149,7 @@ public class CustomizedSystemMessages extends SystemMessages
 
     /**
      * Sets the URL to go to when there is a communication error.
-     * 
+     *
      * @param communicationErrorURL
      *            the URL to go to, or null to reload current
      */
@@ -160,7 +160,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Enables or disables the notification. If disabled, the set URL (or
      * current) is loaded directly.
-     * 
+     *
      * @param communicationErrorNotificationEnabled
      *            true = enabled, false = disabled
      */
@@ -172,7 +172,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the caption of the notification. Set to null for no caption. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param communicationErrorCaption
      *            the caption
      */
@@ -183,7 +183,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the message of the notification. Set to null for no message. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param communicationErrorMessage
      *            the message
      */
@@ -193,7 +193,7 @@ public class CustomizedSystemMessages extends SystemMessages
 
     /**
      * Sets the URL to go to when an internal error occurs.
-     * 
+     *
      * @param internalErrorURL
      *            the URL to go to, or null to reload current
      */
@@ -204,7 +204,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Enables or disables the notification. If disabled, the set URL (or
      * current) is loaded directly.
-     * 
+     *
      * @param internalErrorNotificationEnabled
      *            true = enabled, false = disabled
      */
@@ -216,7 +216,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the caption of the notification. Set to null for no caption. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param internalErrorCaption
      *            the caption
      */
@@ -227,7 +227,7 @@ public class CustomizedSystemMessages extends SystemMessages
     /**
      * Sets the message of the notification. Set to null for no message. If both
      * caption and message is null, the notification is disabled;
-     * 
+     *
      * @param internalErrorMessage
      *            the message
      */
@@ -237,7 +237,7 @@ public class CustomizedSystemMessages extends SystemMessages
 
     /**
      * Sets the URL to redirect to when the browser has cookies disabled.
-     * 
+     *
      * @param cookiesDisabledURL
      *            the URL to redirect to, or null to reload the current URL
      */
@@ -249,7 +249,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * Enables or disables the notification for "cookies disabled" messages. If
      * disabled, the URL returned by {@link #getCookiesDisabledURL()} is loaded
      * directly.
-     * 
+     *
      * @param cookiesDisabledNotificationEnabled
      *            true to enable "cookies disabled" messages, false otherwise
      */
@@ -262,7 +262,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * Sets the caption of the "cookies disabled" notification. Set to null for
      * no caption. If both caption and message is null, the notification is
      * disabled.
-     * 
+     *
      * @param cookiesDisabledCaption
      *            the caption for the "cookies disabled" notification
      */
@@ -274,7 +274,7 @@ public class CustomizedSystemMessages extends SystemMessages
      * Sets the message of the "cookies disabled" notification. Set to null for
      * no message. If both caption and message is null, the notification is
      * disabled.
-     * 
+     *
      * @param cookiesDisabledMessage
      *            the message for the "cookies disabled" notification
      */
diff --git a/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java
index bb59d0e5f8..ad0234c4e8 100644
--- a/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java
+++ b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.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
@@ -63,7 +63,7 @@ public class DefaultErrorHandler implements ErrorHandler {
      * might be also other irrelevant exceptions that make no sense for Vaadin
      * users (~developers using Vaadin). This method tries to choose the
      * relevant one to be reported.
-     * 
+     *
      * @since 7.2
      * @param t
      *            a throwable passed to ErrorHandler
@@ -99,7 +99,7 @@ public class DefaultErrorHandler implements ErrorHandler {
     /**
      * Returns the AbstractComponent associated with the given error if such can
      * be found
-     * 
+     *
      * @param event
      *            The error to investigate
      * @return The {@link AbstractComponent} to error relates to or null if
@@ -123,7 +123,7 @@ public class DefaultErrorHandler implements ErrorHandler {
      * Finds the nearest component by traversing upwards in the hierarchy. If
      * connector is a Component, that Component is returned. Otherwise, looks
      * upwards in the hierarchy until it finds a {@link Component}.
-     * 
+     *
      * @return A Component or null if no component was found
      */
     public static Component findComponent(Connector connector) {
diff --git a/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.java b/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.java
index 17177c36ca..9bd6e1232f 100644
--- a/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.java
+++ b/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.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
@@ -19,7 +19,7 @@ package com.vaadin.server;
 /**
  * System messages provider using the built-in default system messages. This
  * singleton is accessed using {@link #get()}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -39,7 +39,7 @@ public class DefaultSystemMessagesProvider implements SystemMessagesProvider {
 
     /**
      * Gets the instance.
-     * 
+     *
      * @return the default system messages provider.
      */
     public static SystemMessagesProvider get() {
diff --git a/server/src/main/java/com/vaadin/server/DefaultUIProvider.java b/server/src/main/java/com/vaadin/server/DefaultUIProvider.java
index cbf1768cc0..e264a053e5 100644
--- a/server/src/main/java/com/vaadin/server/DefaultUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/DefaultUIProvider.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/server/src/main/java/com/vaadin/server/DownloadStream.java b/server/src/main/java/com/vaadin/server/DownloadStream.java
index 02b43d6bfe..fdc757bd5e 100644
--- a/server/src/main/java/com/vaadin/server/DownloadStream.java
+++ b/server/src/main/java/com/vaadin/server/DownloadStream.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
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse;
  * session to prevent locking the session during long file downloads. If your
  * DownloadStream uses anything from the session, you must handle the locking.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -78,7 +78,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Gets downloadable stream.
-     * 
+     *
      * @return output stream.
      */
     public InputStream getStream() {
@@ -87,7 +87,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Sets the stream.
-     * 
+     *
      * @param stream
      *            The stream to set
      */
@@ -97,7 +97,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Gets stream content type.
-     * 
+     *
      * @return type of the stream content.
      */
     public String getContentType() {
@@ -106,7 +106,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Sets stream content type.
-     * 
+     *
      * @param contentType
      *            the contentType to set
      */
@@ -116,7 +116,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Returns the file name.
-     * 
+     *
      * @return the name of the file.
      */
     public String getFileName() {
@@ -125,7 +125,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Sets the file name.
-     * 
+     *
      * @param fileName
      *            the file name to set.
      */
@@ -138,9 +138,9 @@ public class DownloadStream implements Serializable {
      * about the downloadable stream and their meaning depends on the used
      * adapter. For example in WebAdapter they are interpreted as HTTP response
      * headers.
-     * 
+     *
      * If the parameters by this name exists, the old value is replaced.
-     * 
+     *
      * @param name
      *            the Name of the parameter to set.
      * @param value
@@ -158,7 +158,7 @@ public class DownloadStream implements Serializable {
      * about the downloadable stream and their meaning depends on the used
      * adapter. For example in WebAdapter they are interpreted as HTTP response
      * headers.
-     * 
+     *
      * @param name
      *            the Name of the parameter to set.
      * @return Value of the parameter or null if the parameter does not exist.
@@ -172,7 +172,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Gets the names of the parameters.
-     * 
+     *
      * @return Iterator of names or null if no parameters are set.
      */
     public Iterator<String> getParameterNames() {
@@ -187,7 +187,7 @@ public class DownloadStream implements Serializable {
      * possibility cache streams sent to the client. The caching may be made in
      * adapter or at the client if the client supports caching. Default is
      * <code>DEFAULT_CACHETIME</code>.
-     * 
+     *
      * @return Cache time in milliseconds
      */
     public long getCacheTime() {
@@ -199,7 +199,7 @@ public class DownloadStream implements Serializable {
      * possibility cache streams sent to the client. The caching may be made in
      * adapter or at the client if the client supports caching. Zero or negavive
      * value disbales the caching of this stream.
-     * 
+     *
      * @param cacheTime
      *            the cache time in milliseconds.
      */
@@ -209,7 +209,7 @@ public class DownloadStream implements Serializable {
 
     /**
      * Gets the size of the download buffer.
-     * 
+     *
      * @return int The size of the buffer in bytes.
      */
     public int getBufferSize() {
@@ -218,10 +218,10 @@ public class DownloadStream implements Serializable {
 
     /**
      * Sets the size of the download buffer.
-     * 
+     *
      * @param bufferSize
      *            the size of the buffer in bytes.
-     * 
+     *
      * @since 7.0
      */
     public void setBufferSize(int bufferSize) {
@@ -238,15 +238,15 @@ public class DownloadStream implements Serializable {
      * response. If there's is a parameter named <code>Location</code>, a
      * redirect (302 Moved temporarily) is sent instead of the contents of this
      * stream.
-     * 
+     *
      * @param request
      *            the request for which the response should be written
      * @param response
      *            the Vaadin response to write this download stream to
-     * 
+     *
      * @throws IOException
      *             passed through from the Vaadin response
-     * 
+     *
      * @since 7.0
      */
     public void writeResponse(VaadinRequest request, VaadinResponse response)
@@ -322,7 +322,7 @@ public class DownloadStream implements Serializable {
     /**
      * Returns the filename formatted for inclusion in a Content-Disposition
      * header. Includes both a plain version of the name and a UTF-8 version
-     * 
+     *
      * @since 7.4.8
      * @param filename
      *            The filename to include
@@ -341,7 +341,7 @@ public class DownloadStream implements Serializable {
     /**
      * Helper method that tries to close an output stream and ignores any
      * exceptions.
-     * 
+     *
      * @param out
      *            the output stream to close, <code>null</code> is also
      *            supported
@@ -360,7 +360,7 @@ public class DownloadStream implements Serializable {
     /**
      * Helper method that tries to close an input stream and ignores any
      * exceptions.
-     * 
+     *
      * @param in
      *            the input stream to close, <code>null</code> is also supported
      */
diff --git a/server/src/main/java/com/vaadin/server/DragAndDropService.java b/server/src/main/java/com/vaadin/server/DragAndDropService.java
index 421fa71799..61fd1fefbd 100644
--- a/server/src/main/java/com/vaadin/server/DragAndDropService.java
+++ b/server/src/main/java/com/vaadin/server/DragAndDropService.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
@@ -103,7 +103,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
     /**
      * Handles a drop request from the VDragAndDropManager.
-     * 
+     *
      * @param dropTarget
      * @param variables
      */
@@ -136,7 +136,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
     /**
      * Handles a drag/move request from the VDragAndDropManager.
-     * 
+     *
      * @param dropTarget
      * @param variables
      */
@@ -165,7 +165,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
      * Construct DragDropDetails based on variables from client drop target.
      * Uses DragDropDetailsTranslator if available, otherwise a default
      * DragDropDetails implementation is used.
-     * 
+     *
      * @param dropTarget
      * @param variables
      * @return
@@ -377,7 +377,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.ClientConnector#isAttached()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/EncodeResult.java b/server/src/main/java/com/vaadin/server/EncodeResult.java
index bf4fd48438..a6647b1c5a 100644
--- a/server/src/main/java/com/vaadin/server/EncodeResult.java
+++ b/server/src/main/java/com/vaadin/server/EncodeResult.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/server/src/main/java/com/vaadin/server/ErrorEvent.java b/server/src/main/java/com/vaadin/server/ErrorEvent.java
index 5f8cb4eaca..b886c30afb 100644
--- a/server/src/main/java/com/vaadin/server/ErrorEvent.java
+++ b/server/src/main/java/com/vaadin/server/ErrorEvent.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.UI;
  * Typically handled by {@link VaadinSession#getErrorHandler()} but can also be
  * handled by a {@link Connector} specific handler, set using
  * {@link ClientConnector#setErrorHandler(ErrorHandler)}.
- * 
+ *
  */
 public class ErrorEvent implements Serializable {
 
@@ -37,7 +37,7 @@ public class ErrorEvent implements Serializable {
 
     /**
      * Gets the contained throwable, the cause of the error.
-     * 
+     *
      * @return
      */
     public Throwable getThrowable() {
@@ -56,7 +56,7 @@ public class ErrorEvent implements Serializable {
      * <p>
      * Returns a {@link DefaultErrorHandler} if no error handler was found
      * </p>
-     * 
+     *
      * @param connector
      *            The target connector
      * @return An ErrorHandler for the connector
@@ -108,10 +108,10 @@ public class ErrorEvent implements Serializable {
 
     /**
      * Method for finding the error handler for the given session.
-     * 
+     *
      * @param connector
      *            The target connector
-     * 
+     *
      * @return An ErrorHandler for the session or null if none was found
      */
     public static ErrorHandler findErrorHandler(VaadinSession session) {
diff --git a/server/src/main/java/com/vaadin/server/ErrorHandler.java b/server/src/main/java/com/vaadin/server/ErrorHandler.java
index 9c3af4c999..dc58348db1 100644
--- a/server/src/main/java/com/vaadin/server/ErrorHandler.java
+++ b/server/src/main/java/com/vaadin/server/ErrorHandler.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 @@ public interface ErrorHandler extends Serializable {
 
     /**
      * Invoked when an error occurs.
-     * 
+     *
      * @param event
      *            the fired event.
      */
diff --git a/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
index 8ec24c0bcb..0b8f21c008 100644
--- a/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
+++ b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.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
@@ -20,7 +20,7 @@ import java.io.Serializable;
 /**
  * Defines the interface to handle exceptions thrown during the execution of a
  * FutureAccess.
- * 
+ *
  * @since 7.1.8
  * @author Vaadin Ltd
  */
@@ -28,7 +28,7 @@ public interface ErrorHandlingRunnable extends Runnable, Serializable {
 
     /**
      * Handles exceptions thrown during the execution of a FutureAccess.
-     * 
+     *
      * @since 7.1.8
      * @param exception
      *            the thrown exception.
diff --git a/server/src/main/java/com/vaadin/server/ErrorMessage.java b/server/src/main/java/com/vaadin/server/ErrorMessage.java
index 0171b95e54..26bdb123ef 100644
--- a/server/src/main/java/com/vaadin/server/ErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/ErrorMessage.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
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * Interface for rendering error messages to terminal. All the visible errors
  * shown to user must implement this interface.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -59,7 +59,7 @@ public interface ErrorMessage extends Serializable {
 
         /**
          * Textual representation for server-client communication of level
-         * 
+         *
          * @return String for error severity
          */
         public String getText() {
@@ -68,7 +68,7 @@ public interface ErrorMessage extends Serializable {
 
         /**
          * Integer representation of error severity for comparison
-         * 
+         *
          * @return integer for error severity
          */
         public int intValue() {
@@ -115,7 +115,7 @@ public interface ErrorMessage extends Serializable {
 
     /**
      * Gets the errors level.
-     * 
+     *
      * @return the level of error as an integer.
      */
     public ErrorLevel getErrorLevel();
@@ -123,11 +123,11 @@ public interface ErrorMessage extends Serializable {
     /**
      * Returns the HTML formatted message to show in as the error message on the
      * client.
-     * 
+     *
      * This method should perform any necessary escaping to avoid XSS attacks.
-     * 
+     *
      * TODO this API may still change to use a separate data transfer object
-     * 
+     *
      * @return HTML formatted string for the error message
      * @since 7.0
      */
diff --git a/server/src/main/java/com/vaadin/server/Extension.java b/server/src/main/java/com/vaadin/server/Extension.java
index b27c58b4bc..ca6c048d91 100644
--- a/server/src/main/java/com/vaadin/server/Extension.java
+++ b/server/src/main/java/com/vaadin/server/Extension.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 @@ package com.vaadin.server;
  * extension from one target to another.
  * <p>
  * Extensions can use shared state and RPC in the same way as components.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -38,7 +38,7 @@ public interface Extension extends ClientConnector {
 
     /**
      * Sets the parent connector of the connector.
-     * 
+     *
      * This method automatically calls {@link #attach()} if the connector
      * becomes attached to the session.
      * <p>
@@ -47,7 +47,7 @@ public interface Extension extends ClientConnector {
      * for adding extensions to a parent and it will call this method
      * implicitly.
      * </p>
-     * 
+     *
      * @param parent
      *            the parent connector
      * @throws IllegalStateException
diff --git a/server/src/main/java/com/vaadin/server/ExternalResource.java b/server/src/main/java/com/vaadin/server/ExternalResource.java
index e3b026dde8..2eed5b7ab5 100644
--- a/server/src/main/java/com/vaadin/server/ExternalResource.java
+++ b/server/src/main/java/com/vaadin/server/ExternalResource.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
@@ -25,7 +25,7 @@ import com.vaadin.util.FileTypeResolver;
  * <code>ExternalResource</code> implements source for resources fetched from
  * location specified by URL:s. The resources are fetched directly by the client
  * terminal and are not fetched trough the terminal adapter.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -44,7 +44,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Creates a new download component for downloading directly from given URL.
-     * 
+     *
      * @param sourceURL
      *            the source URL.
      */
@@ -58,7 +58,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Creates a new download component for downloading directly from given URL.
-     * 
+     *
      * @param sourceURL
      *            the source URL.
      * @param mimeType
@@ -71,7 +71,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Creates a new download component for downloading directly from given URL.
-     * 
+     *
      * @param sourceURL
      *            the source URL.
      */
@@ -85,7 +85,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Creates a new download component for downloading directly from given URL.
-     * 
+     *
      * @param sourceURL
      *            the source URL.
      * @param mimeType
@@ -98,7 +98,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Gets the URL of the external resource.
-     * 
+     *
      * @return the URL of the external resource.
      */
     public String getURL() {
@@ -107,7 +107,7 @@ public class ExternalResource implements Resource, Serializable {
 
     /**
      * Gets the MIME type of the resource.
-     * 
+     *
      * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/FileDownloader.java b/server/src/main/java/com/vaadin/server/FileDownloader.java
index ad3742b5c8..adb526219b 100644
--- a/server/src/main/java/com/vaadin/server/FileDownloader.java
+++ b/server/src/main/java/com/vaadin/server/FileDownloader.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
@@ -41,7 +41,7 @@ import com.vaadin.ui.AbstractComponent;
  * while files served in other ways, (e.g. {@link ExternalResource} or
  * {@link ThemeResource}) will not automatically get this treatment.
  * </p>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -53,7 +53,7 @@ public class FileDownloader extends AbstractExtension {
      * Creates a new file downloader for the given resource. To use the
      * downloader, you should also {@link #extend(AbstractClientConnector)} the
      * component.
-     * 
+     *
      * @param resource
      *            the resource to download when the user clicks the extended
      *            component.
@@ -71,7 +71,7 @@ public class FileDownloader extends AbstractExtension {
 
     /**
      * Gets the resource set for download.
-     * 
+     *
      * @return the resource that will be downloaded if clicking the extended
      *         component
      */
@@ -82,7 +82,7 @@ public class FileDownloader extends AbstractExtension {
     /**
      * Sets the resource that is downloaded when the extended component is
      * clicked.
-     * 
+     *
      * @param resource
      *            the resource to download
      */
@@ -100,7 +100,7 @@ public class FileDownloader extends AbstractExtension {
      * {@link FileResource} and {@link ClassResource}) but not other resource
      * types (e.g. {@link ExternalResource} or {@link ThemeResource}).
      * </p>
-     * 
+     *
      * @param overrideContentType
      *            <code>true</code> to override the content type if possible;
      *            <code>false</code> to use the original content type.
@@ -111,9 +111,9 @@ public class FileDownloader extends AbstractExtension {
 
     /**
      * Checks whether the content type should be overridden.
-     * 
+     *
      * @see #setOverrideContentType(boolean)
-     * 
+     *
      * @return <code>true</code> if the content type will be overridden when
      *         possible; <code>false</code> if the original content type will be
      *         used.
diff --git a/server/src/main/java/com/vaadin/server/FileResource.java b/server/src/main/java/com/vaadin/server/FileResource.java
index cc361f2dc1..ff74ab9dca 100644
--- a/server/src/main/java/com/vaadin/server/FileResource.java
+++ b/server/src/main/java/com/vaadin/server/FileResource.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
@@ -27,7 +27,7 @@ import com.vaadin.util.FileTypeResolver;
  * files and directories are served through URI:s to the client terminal and
  * thus must be registered to an URI context before they can be used. The
  * resource is automatically registered to the application when it is created.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -52,7 +52,7 @@ public class FileResource implements ConnectorResource {
     /**
      * Creates a new file resource for providing given file for client
      * terminals.
-     * 
+     *
      * @param sourceFile
      *            the file that should be served.
      */
@@ -82,7 +82,7 @@ public class FileResource implements ConnectorResource {
 
     /**
      * Gets the source file.
-     * 
+     *
      * @return the source File.
      */
     public File getSourceFile() {
@@ -91,7 +91,7 @@ public class FileResource implements ConnectorResource {
 
     /**
      * Sets the source file.
-     * 
+     *
      * @param sourceFile
      *            the source file to set.
      */
@@ -114,7 +114,7 @@ public class FileResource implements ConnectorResource {
      * possibility cache streams sent to the client. The caching may be made in
      * adapter or at the client if the client supports caching. Default is
      * <code>DownloadStream.DEFAULT_CACHETIME</code>.
-     * 
+     *
      * @return Cache time in milliseconds.
      */
     public long getCacheTime() {
@@ -126,7 +126,7 @@ public class FileResource implements ConnectorResource {
      * possibility cache streams sent to the client. The caching may be made in
      * adapter or at the client if the client supports caching. Zero or negavive
      * value disbales the caching of this stream.
-     * 
+     *
      * @param cacheTime
      *            the cache time in milliseconds.
      */
@@ -136,12 +136,12 @@ public class FileResource implements ConnectorResource {
 
     /**
      * Gets the size of the download buffer used for this resource.
-     * 
+     *
      * <p>
      * If the buffer size is 0, the buffer size is decided by the terminal
      * adapter. The default value is 0.
      * </p>
-     * 
+     *
      * @return the size of the buffer in bytes.
      */
     public int getBufferSize() {
@@ -150,7 +150,7 @@ public class FileResource implements ConnectorResource {
 
     /**
      * Sets the size of the download buffer used for this resource.
-     * 
+     *
      * @param bufferSize
      *            the size of the buffer in bytes.
      */
diff --git a/server/src/main/java/com/vaadin/server/FontAwesome.java b/server/src/main/java/com/vaadin/server/FontAwesome.java
index c3b41cbe75..ee152df571 100644
--- a/server/src/main/java/com/vaadin/server/FontAwesome.java
+++ b/server/src/main/java/com/vaadin/server/FontAwesome.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 @@ package com.vaadin.server;
  * <p>
  * The Font Awesome version currently included is 4.4.0.
  * </p>
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  * @see http://fortawesome.github.io/Font-Awesome/
@@ -750,7 +750,7 @@ public enum FontAwesome implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.FontIcon#getFontFamily()
      */
     @Override
@@ -760,7 +760,7 @@ public enum FontAwesome implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.FontIcon#getCodepoint()
      */
     @Override
@@ -775,7 +775,7 @@ public enum FontAwesome implements FontIcon {
 
     /**
      * Finds an instance of FontAwesome with given codepoint
-     * 
+     *
      * @since 7.5.0
      * @param codepoint
      * @return FontAwesome instance with a specific codepoint or null if there
diff --git a/server/src/main/java/com/vaadin/server/FontIcon.java b/server/src/main/java/com/vaadin/server/FontIcon.java
index 2ada45084f..f3671d5159 100644
--- a/server/src/main/java/com/vaadin/server/FontIcon.java
+++ b/server/src/main/java/com/vaadin/server/FontIcon.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.Label;
  * <code>fonticon://&lt;fontfamily&gt;/&lt;codepoint&gt;</code> to reference a
  * specific icon from a specific icon font. <br/>
  * </p>
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -35,7 +35,7 @@ public interface FontIcon extends Resource {
     /**
      * Returns the name (font family) of the font from which this icon comes.
      * The name is used to apply the correct font where the icon is used.
-     * 
+     *
      * @since 7.2
      * @return
      */
@@ -50,7 +50,7 @@ public interface FontIcon extends Resource {
      * When constructing icon fonts, it might be a good idea to use the
      * codepoints in the "Private use area", from 0xE000 0xF8FF.
      * </p>
-     * 
+     *
      * @since 7.2
      * @return
      */
@@ -59,8 +59,8 @@ public interface FontIcon extends Resource {
     /**
      * Returns HTML that can be used to display the icon in places where HTML
      * can be used, such as a {@link Label} with {@link ContentMode#HTML}.
-     * 
-     * 
+     *
+     *
      * @since 7.2
      * @return HTML needed to display icon
      */
diff --git a/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java
index fdbcd0b019..2164517b78 100644
--- a/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.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
@@ -51,7 +51,7 @@ import com.google.apphosting.api.DeadlineExceededException;
 /**
  * ApplicationServlet to be used when deploying to Google App Engine, in
  * web.xml:
- * 
+ *
  * <pre>
  *      &lt;servlet&gt;
  *              &lt;servlet-name&gt;HelloWorld&lt;/servlet-name&gt;
@@ -62,17 +62,17 @@ import com.google.apphosting.api.DeadlineExceededException;
  *              &lt;/init-param&gt;
  *      &lt;/servlet&gt;
  * </pre>
- * 
+ *
  * Session support must be enabled in appengine-web.xml:
- * 
+ *
  * <pre>
  *      &lt;sessions-enabled&gt;true&lt;/sessions-enabled&gt;
  * </pre>
- * 
+ *
  * Appengine datastore cleanup can be invoked by calling one of the applications
  * with an additional path "/CLEAN". This can be set up as a cron-job in
  * cron.xml (see appengine documentation for more information):
- * 
+ *
  * <pre>
  * &lt;cronentries&gt;
  *   &lt;cron&gt;
@@ -82,18 +82,18 @@ import com.google.apphosting.api.DeadlineExceededException;
  *   &lt;/cron&gt;
  * &lt;/cronentries&gt;
  * </pre>
- * 
+ *
  * It is recommended (but not mandatory) to extract themes and widgetsets and
  * have App Engine server these statically. Extract VAADIN folder (and it's
  * contents) 'next to' the WEB-INF folder, and add the following to
  * appengine-web.xml:
- * 
+ *
  * <pre>
  *      &lt;static-files&gt;
  *           &lt;include path=&quot;/VAADIN/**&quot; /&gt;
  *      &lt;/static-files&gt;
  * </pre>
- * 
+ *
  * Additional limitations:
  * <ul>
  * <li/>Do not change application state when serving an ApplicationResource.
@@ -295,7 +295,7 @@ public class GAEVaadinServlet extends VaadinServlet {
     /**
      * Returns the maximum inactive time for a session. This is used for
      * handling the expiration of session related information in caches etc.
-     * 
+     *
      * @param session
      * @return inactive timeout in seconds, greater than zero
      */
@@ -375,7 +375,7 @@ public class GAEVaadinServlet extends VaadinServlet {
     /**
      * Removes the ApplicationContext from the session in order to minimize the
      * data serialized to datastore and memcache.
-     * 
+     *
      * @param request
      */
     private void cleanSession(VaadinServletRequest request) {
@@ -405,7 +405,7 @@ public class GAEVaadinServlet extends VaadinServlet {
     /**
      * This will look at the timestamp and delete expired persisted Vaadin and
      * appengine sessions from the datastore.
-     * 
+     *
      * TODO Possible improvements include: 1. Use transactions (requires entity
      * groups - overkill?) 2. Delete one-at-a-time, catch possible exception,
      * continue w/ next.
diff --git a/server/src/main/java/com/vaadin/server/GenericFontIcon.java b/server/src/main/java/com/vaadin/server/GenericFontIcon.java
index cf435d55e6..879ca679c8 100644
--- a/server/src/main/java/com/vaadin/server/GenericFontIcon.java
+++ b/server/src/main/java/com/vaadin/server/GenericFontIcon.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
@@ -17,7 +17,7 @@ package com.vaadin.server;
 
 /**
  * A generic implementation of {@link FontIcon} interface
- * 
+ *
  * @since 7.5.0
  * @author Vaadin Ltd
  */
@@ -29,7 +29,7 @@ public class GenericFontIcon implements FontIcon {
     /**
      * Creates a new instance of GenericFontIcon with given font family and
      * codepoint
-     * 
+     *
      * @param fontFamily
      *            Name of the type face that is used to display icons
      * @param codepoint
@@ -42,7 +42,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.FontIcon#getFontFamily()
      */
     @Override
@@ -52,7 +52,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
@@ -63,7 +63,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.FontIcon#getCodepoint()
      */
     @Override
@@ -73,7 +73,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.FontIcon#getHtml()
      */
     @Override
@@ -84,7 +84,7 @@ public class GenericFontIcon implements FontIcon {
     /**
      * Utility method for generating HTML that displays an icon from specific
      * fontFamiliy with a given codePoint in the font
-     * 
+     *
      * @param fontFamily
      *            Name of the font family
      * @param codePoint
@@ -98,7 +98,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#hashCode()
      */
     @Override
@@ -113,7 +113,7 @@ public class GenericFontIcon implements FontIcon {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java
index 3b9639793f..1c3d5816d4 100644
--- a/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java
+++ b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.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
@@ -36,7 +36,7 @@ import com.vaadin.util.CurrentInstance;
 /**
  * A {@link RequestHandler} that takes care of {@link ConnectorResource}s that
  * should not be served by the connector.
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
@@ -130,7 +130,7 @@ public class GlobalResourceHandler implements RequestHandler {
      * A {@link ConnectorResource} registered for a {@link LegacyComponent} will
      * be set to be served with a global URL. Other resource types will be
      * ignored and thus not served by this handler.
-     * 
+     *
      * @param resource
      *            the resource to register
      * @param ownerConnector
@@ -181,7 +181,7 @@ public class GlobalResourceHandler implements RequestHandler {
 
     /**
      * Gets a global URI for a resource if it's registered with this handler.
-     * 
+     *
      * @param connector
      *            the connector for which the uri should be generated.
      * @param resource
@@ -206,7 +206,7 @@ public class GlobalResourceHandler implements RequestHandler {
     /**
      * Notifies this handler that resources registered for the given connector
      * can be released.
-     * 
+     *
      * @param connector
      *            the connector for which any registered resources can be
      *            released.
diff --git a/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java
index ea30b4a4cd..9e9dcf3d2a 100644
--- a/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java
+++ b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.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
@@ -39,7 +39,7 @@ import elemental.json.JsonException;
  * {@link com.vaadin.client.JavaScriptConnectorHelper}.
  * <p>
  * You should most likely no use this class directly.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
diff --git a/server/src/main/java/com/vaadin/server/JsonCodec.java b/server/src/main/java/com/vaadin/server/JsonCodec.java
index 6cdad94720..60f3856211 100644
--- a/server/src/main/java/com/vaadin/server/JsonCodec.java
+++ b/server/src/main/java/com/vaadin/server/JsonCodec.java
@@ -787,12 +787,12 @@ public class JsonCodec implements Serializable {
 
     /**
      * Compares two json values for deep equality.
-     * 
+     *
      * This is a helper for overcoming the fact that
      * {@link JsonValue#equals(Object)} only does an identity check and
      * {@link JsonValue#jsEquals(JsonValue)} is defined to use JavaScript
      * semantics where arrays and objects are equals only based on identity.
-     * 
+     *
      * @since 7.4
      * @param a
      *            the first json value to check, may not be null
diff --git a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
index 4483387e9a..41cf52d6ab 100644
--- a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.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
@@ -35,10 +35,10 @@ import com.vaadin.ui.CustomLayout;
 
 /**
  * User Interface Description Language Target.
- * 
+ *
  * TODO document better: role of this class, UIDL format, attributes, variables,
  * etc.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.0
  */
@@ -77,7 +77,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Creates a new JsonPaintTarget.
-     * 
+     *
      * @param manager
      * @param outWriter
      *            A character-output stream.
@@ -112,18 +112,18 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Prints the element start tag.
-     * 
+     *
      * <pre>
      *   Todo:
      *    Checking of input values
-     * 
+     *
      * </pre>
-     * 
+     *
      * @param tagName
      *            the name of the start tag.
      * @throws PaintException
      *             if the paint operation failed.
-     * 
+     *
      */
     public void startTag(String tagName, boolean isChildNode)
             throws PaintException {
@@ -152,10 +152,10 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Prints the element end tag.
-     * 
+     *
      * If the parent tag is closed before every child tag is closed an
      * PaintException is raised.
-     * 
+     *
      * @param tag
      *            the name of the end tag.
      * @throws PaintException
@@ -198,7 +198,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Substitutes the XML sensitive characters with predefined XML entities.
-     * 
+     *
      * @param xml
      *            the String to be substituted.
      * @return A new string instance where all occurrences of XML sensitive
@@ -213,12 +213,12 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Substitutes the XML sensitive characters with predefined XML entities.
-     * 
+     *
      * @param xml
      *            the String to be substituted.
      * @return A new StringBuilder instance where all occurrences of XML
      *         sensitive characters are substituted with entities.
-     * 
+     *
      */
     static StringBuilder escapeXML(StringBuilder xml) {
         if (xml == null || xml.length() <= 0) {
@@ -241,7 +241,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Escapes the given string so it can safely be used as a JSON string.
-     * 
+     *
      * @param s
      *            The string to escape
      * @return Escaped version of the string
@@ -298,7 +298,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Substitutes a XML sensitive character with predefined XML entity.
-     * 
+     *
      * @param c
      *            the Character to be replaced with an entity.
      * @return String of the entity or null if character is not to be replaced
@@ -323,11 +323,11 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Prints XML-escaped text.
-     * 
+     *
      * @param str
      * @throws PaintException
      *             if the paint operation failed.
-     * 
+     *
      */
 
     @Override
@@ -507,14 +507,14 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Adds a upload stream type variable.
-     * 
+     *
      * TODO not converted for JSON
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -529,9 +529,9 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Prints the single text section.
-     * 
+     *
      * Prints full text section. The section data is escaped
-     * 
+     *
      * @param sectionTagName
      *            the name of the tag.
      * @param sectionData
@@ -549,7 +549,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Adds XML directly to UIDL.
-     * 
+     *
      * @param xml
      *            the Xml to be added.
      * @throws PaintException
@@ -577,7 +577,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /**
      * Adds XML section with namespace.
-     * 
+     *
      * @param sectionTagName
      *            the name of the tag.
      * @param sectionData
@@ -586,7 +586,7 @@ public class JsonPaintTarget implements PaintTarget {
      *            the namespace to be added.
      * @throws PaintException
      *             if the paint operation failed.
-     * 
+     *
      * @see com.vaadin.server.PaintTarget#addXMLSection(String, String, String)
      */
 
@@ -614,7 +614,7 @@ public class JsonPaintTarget implements PaintTarget {
     /**
      * Gets the UIDL already printed to stream. Paint target must be closed
      * before the <code>getUIDL</code> can be called.
-     * 
+     *
      * @return the UIDL.
      */
     public String getUIDL() {
@@ -630,7 +630,7 @@ public class JsonPaintTarget implements PaintTarget {
      * <code>getUIDL</code> can be called. Subsequent attempts to write to paint
      * target. If the target was already closed, call to this function is
      * ignored. will generate an exception.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -651,7 +651,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.terminal.PaintTarget#startPaintable(com.vaadin.terminal
      * .Paintable, java.lang.String)
      */
@@ -707,7 +707,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.terminal.PaintTarget#addCharacterData(java.lang.String )
      */
 
@@ -721,9 +721,9 @@ public class JsonPaintTarget implements PaintTarget {
     /**
      * This is basically a container for UI components variables, that will be
      * added at the end of JSON object.
-     * 
+     *
      * @author mattitahvonen
-     * 
+     *
      */
     class JsonTag implements Serializable {
         boolean firstField = false;
@@ -794,7 +794,7 @@ public class JsonPaintTarget implements PaintTarget {
         }
 
         /**
-         * 
+         *
          * @param s
          *            json string, object or array
          */
@@ -1018,7 +1018,7 @@ public class JsonPaintTarget implements PaintTarget {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.terminal.PaintTarget#isFullRepaint()
      */
 
diff --git a/server/src/main/java/com/vaadin/server/KeyMapper.java b/server/src/main/java/com/vaadin/server/KeyMapper.java
index b858660b4b..9a2c776045 100644
--- a/server/src/main/java/com/vaadin/server/KeyMapper.java
+++ b/server/src/main/java/com/vaadin/server/KeyMapper.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
@@ -22,7 +22,7 @@ import java.util.HashMap;
 /**
  * <code>KeyMapper</code> is the simple two-way map for generating textual keys
  * for objects and retrieving the objects later with the key.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -36,7 +36,7 @@ public class KeyMapper<V> implements Serializable {
 
     /**
      * Gets key for an object.
-     * 
+     *
      * @param o
      *            the object.
      */
@@ -62,7 +62,7 @@ public class KeyMapper<V> implements Serializable {
 
     /**
      * Retrieves object with the key.
-     * 
+     *
      * @param key
      *            the name with the desired value.
      * @return the object with the key.
@@ -73,7 +73,7 @@ public class KeyMapper<V> implements Serializable {
 
     /**
      * Removes object from the mapper.
-     * 
+     *
      * @param removeobj
      *            the object to be removed.
      */
@@ -96,9 +96,9 @@ public class KeyMapper<V> implements Serializable {
 
     /**
      * Checks if the given key is mapped to an object.
-     * 
+     *
      * @since 7.7
-     * 
+     *
      * @param key
      *            the key to check
      * @return <code>true</code> if the key is currently mapped,
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java
index d03b3d7f96..c256699f06 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplication.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplication.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,10 +31,10 @@ import com.vaadin.ui.UI;
  * to Vaadin 7. The legacy application supports setting a main window, adding
  * additional browser level windows and defining the theme for the entire
  * application.
- * 
+ *
  * @deprecated As of 7.0. This class is only intended to ease migration and
  *             should not be used for new projects.
- * 
+ *
  * @since 7.0
  */
 @Deprecated
@@ -56,7 +56,7 @@ public abstract class LegacyApplication implements ErrorHandler {
     /**
      * Sets the main window of this application. Setting window as a main window
      * of this application also adds the window to this application.
-     * 
+     *
      * @param mainWindow
      *            the UI to set as the default window
      */
@@ -87,7 +87,7 @@ public abstract class LegacyApplication implements ErrorHandler {
 
     /**
      * Gets the mainWindow of the application.
-     * 
+     *
      * <p>
      * The main window is the window attached to the application URL (
      * {@link #getURL()}) and thus which is show by default to the user.
@@ -95,7 +95,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * <p>
      * Note that each application must have at least one main window.
      * </p>
-     * 
+     *
      * @return the UI used as the default window
      */
     public LegacyWindow getMainWindow() {
@@ -110,7 +110,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * <code>null</code> selects the default theme. For the available theme
      * names, see the contents of the VAADIN/themes directory.
      * </p>
-     * 
+     *
      * @param theme
      *            the new theme for this application.
      */
@@ -123,7 +123,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * theme used by all the uIs for which a theme is not explicitly defined. If
      * the application theme is not explicitly set, <code>null</code> is
      * returned.
-     * 
+     *
      * @return the name of the application's theme.
      */
     public String getTheme() {
@@ -135,7 +135,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * Gets a UI by name. Returns <code>null</code> if the application is not
      * running or it does not contain a window corresponding to the name.
      * </p>
-     * 
+     *
      * @param name
      *            the name of the requested window
      * @return a UI corresponding to the name, or <code>null</code> to use the
@@ -154,11 +154,11 @@ public abstract class LegacyApplication implements ErrorHandler {
      * Adds a new browser level window to this application. Please note that UI
      * doesn't have a name that is used in the URL - to add a named window you
      * should instead use {@link #addWindow(UI, String)}
-     * 
+     *
      * @param uI
      *            the UI window to add to the application
      * @return returns the name that has been assigned to the window
-     * 
+     *
      * @see #addWindow(UI, String)
      */
     public void addWindow(LegacyWindow uI) {
@@ -177,12 +177,12 @@ public abstract class LegacyApplication implements ErrorHandler {
      * Removes the specified window from the application. This also removes all
      * name mappings for the window (see {@link #addWindow(UI, String) and
      * #getWindowName(UI)}.
-     * 
+     *
      * <p>
      * Note that removing window from the application does not close the browser
      * window - the window is only removed from the server-side.
      * </p>
-     * 
+     *
      * @param uI
      *            the UI to remove
      */
@@ -196,11 +196,11 @@ public abstract class LegacyApplication implements ErrorHandler {
 
     /**
      * Gets the set of windows contained by the application.
-     * 
+     *
      * <p>
      * Note that the returned set of windows can not be modified.
      * </p>
-     * 
+     *
      * @return the unmodifiable collection of windows.
      */
     public Collection<LegacyWindow> getWindows() {
@@ -250,7 +250,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * Desktop application just closes the application window and
      * web-application redirects the browser to application main URL.
      * </p>
-     * 
+     *
      * @return the URL.
      */
     public String getLogoutURL() {
@@ -263,7 +263,7 @@ public abstract class LegacyApplication implements ErrorHandler {
      * application running environment: Desktop application just closes the
      * application window and web-application redirects the browser to
      * application main URL.
-     * 
+     *
      * @param logoutURL
      *            the logoutURL to set.
      */
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
index 3c5012b115..02a6544d3f 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.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
@@ -25,10 +25,10 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
- * 
+ *
  * @deprecated As of 7.0. Used only to support LegacyApplication - will be
  *             removed when LegacyApplication support is removed.
  */
@@ -100,7 +100,7 @@ public abstract class LegacyApplicationUIProvider extends UIProvider {
     /**
      * Hack used to return existing LegacyWindow instances without regard for
      * out-of-sync problems.
-     * 
+     *
      * @param event
      * @return
      */
diff --git a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
index 987b524708..f8074c5449 100644
--- a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.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
@@ -48,7 +48,7 @@ import elemental.json.JsonValue;
  * {@link com.vaadin.client.ApplicationConnection}.
  * <p>
  * TODO Document better!
- * 
+ *
  * @deprecated As of 7.0. Will likely change or be removed in a future version
  */
 @Deprecated
@@ -71,7 +71,7 @@ public class LegacyCommunicationManager implements Serializable {
 
     /**
      * TODO New constructor - document me!
-     * 
+     *
      * @param session
      */
     public LegacyCommunicationManager(VaadinSession session) {
@@ -133,7 +133,7 @@ public class LegacyCommunicationManager implements Serializable {
      * Resolves a dependency URI, registering the URI with this
      * {@code LegacyCommunicationManager} if needed and returns a fully
      * qualified URI.
-     * 
+     *
      * @deprecated As of 7.1. See #11413.
      */
     @Deprecated
@@ -204,9 +204,9 @@ public class LegacyCommunicationManager implements Serializable {
      * {@link #isComponentVisibleToClient(Component)} is used. For other types
      * of connectors, the contextual visibility of its first Component ancestor
      * is used. If no Component ancestor is found, the connector is not visible.
-     * 
+     *
      * @deprecated As of 7.1. See #11411.
-     * 
+     *
      * @param connector
      *            The connector to check
      * @return <code>true</code> if the connector is visible to the client,
@@ -230,9 +230,9 @@ public class LegacyCommunicationManager implements Serializable {
     /**
      * Checks if the component should be visible to the client. Returns false if
      * the child should not be sent to the client, true otherwise.
-     * 
+     *
      * @deprecated As of 7.1. See #11411.
-     * 
+     *
      * @param child
      *            The child to check
      * @return true if the child is visible to the client, false otherwise
@@ -330,9 +330,9 @@ public class LegacyCommunicationManager implements Serializable {
     /**
      * Helper class for terminal to keep track of data that client is expected
      * to know.
-     * 
+     *
      * TODO make customlayout templates (from theme) to be cached here.
-     * 
+     *
      * @deprecated As of 7.1. See #11410.
      */
     @Deprecated
@@ -341,7 +341,7 @@ public class LegacyCommunicationManager implements Serializable {
         private final Set<Object> res = new HashSet<Object>();
 
         /**
-         * 
+         *
          * @param paintable
          * @return true if the given class was added to cache
          */
@@ -368,12 +368,12 @@ public class LegacyCommunicationManager implements Serializable {
         /*
          * We will use the same APP/* URI space as ApplicationResources but
          * prefix url with UPLOAD
-         * 
+         *
          * eg. APP/UPLOAD/[UIID]/[PID]/[NAME]/[SECKEY]
-         * 
+         *
          * SECKEY is created on each paint to make URL's unpredictable (to
          * prevent CSRF attacks).
-         * 
+         *
          * NAME and PID from URI forms a key to fetch StreamVariable when
          * handling post
          */
@@ -394,9 +394,9 @@ public class LegacyCommunicationManager implements Serializable {
     /**
      * Handles an exception related to a connector by invoking the appropriate
      * error handler.
-     * 
+     *
      * @deprecated As of 7.1. See #11411.
-     * 
+     *
      * @param throwable
      *            the exception to handle
      * @param connector
@@ -413,7 +413,7 @@ public class LegacyCommunicationManager implements Serializable {
     /**
      * Requests that the given UI should be fully re-rendered on the client
      * side.
-     * 
+     *
      * @since 7.1 @deprecated. As of 7.1. Should be refactored once locales are
      *        fixed (#11378)
      */
diff --git a/server/src/main/java/com/vaadin/server/LegacyPaint.java b/server/src/main/java/com/vaadin/server/LegacyPaint.java
index 91ff103db6..9aad82561b 100644
--- a/server/src/main/java/com/vaadin/server/LegacyPaint.java
+++ b/server/src/main/java/com/vaadin/server/LegacyPaint.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
@@ -23,24 +23,24 @@ import com.vaadin.ui.LegacyComponent;
 
 public class LegacyPaint implements Serializable {
     /**
-     * 
+     *
      * <p>
      * Paints the Paintable into a UIDL stream. This method creates the UIDL
      * sequence describing it and outputs it to the given UIDL stream.
      * </p>
-     * 
+     *
      * <p>
      * It is called when the contents of the component should be painted in
      * response to the component first being shown or having been altered so
      * that its visual representation is changed.
      * </p>
-     * 
+     *
      * <p>
      * <b>Do not override this to paint your component.</b> Override
      * {@link #paintContent(PaintTarget)} instead.
      * </p>
-     * 
-     * 
+     *
+     *
      * @param target
      *            the target UIDL stream where the component should paint itself
      *            to.
diff --git a/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java
index 606809d893..6392e46f3d 100644
--- a/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java
+++ b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.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/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java
index 8ef16b50bc..4a6a7af866 100644
--- a/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.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/server/src/main/java/com/vaadin/server/LocaleService.java b/server/src/main/java/com/vaadin/server/LocaleService.java
index b7ea7812d4..6435a08cdd 100644
--- a/server/src/main/java/com/vaadin/server/LocaleService.java
+++ b/server/src/main/java/com/vaadin/server/LocaleService.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
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.server;
 
@@ -35,7 +35,7 @@ import com.vaadin.ui.UI;
 /**
  * Server side service which handles locale and the transmission of locale date
  * to the client side LocaleService.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -47,7 +47,7 @@ public class LocaleService implements Serializable {
 
     /**
      * Creates a LocaleService bound to the given UI
-     * 
+     *
      * @since 7.1
      * @param ui
      *            The UI which owns the LocaleService
@@ -59,7 +59,7 @@ public class LocaleService implements Serializable {
 
     /**
      * Retrieves the UI this service is bound to
-     * 
+     *
      * @since 7.1
      * @return the UI for this service
      */
@@ -73,7 +73,7 @@ public class LocaleService implements Serializable {
      * {@link Locale} instances and sent to the client when needed, eliminating
      * the need to use the {@link Locale} class and all the framework behind it
      * on the client.
-     * 
+     *
      * @param locale
      *            The locale which is required on the client side
      */
@@ -94,7 +94,7 @@ public class LocaleService implements Serializable {
      * The state is transmitted inside the UI state rather than as an individual
      * entity.
      * </p>
-     * 
+     *
      * @since 7.1
      * @param markAsDirty
      *            true to mark the state as dirty
@@ -111,7 +111,7 @@ public class LocaleService implements Serializable {
 
     /**
      * Creates a LocaleData instance for transportation to the client
-     * 
+     *
      * @since 7.1
      * @param locale
      *            The locale for which to create a LocaleData object
@@ -200,7 +200,7 @@ public class LocaleService implements Serializable {
         final String timeformat = df.substring(timeStart, df.length());
         /*
          * Doesn't return second or milliseconds.
-         * 
+         *
          * We use timeformat to determine 12/24-hour clock
          */
         final boolean twelve_hour_clock = timeformat.indexOf("a") > -1;
diff --git a/server/src/main/java/com/vaadin/server/NoInputStreamException.java b/server/src/main/java/com/vaadin/server/NoInputStreamException.java
index 9f12c52fdf..8e35a66902 100644
--- a/server/src/main/java/com/vaadin/server/NoInputStreamException.java
+++ b/server/src/main/java/com/vaadin/server/NoInputStreamException.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/server/src/main/java/com/vaadin/server/NoOutputStreamException.java b/server/src/main/java/com/vaadin/server/NoOutputStreamException.java
index 8dce2194e8..66675b0a30 100644
--- a/server/src/main/java/com/vaadin/server/NoOutputStreamException.java
+++ b/server/src/main/java/com/vaadin/server/NoOutputStreamException.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/server/src/main/java/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java
index 0d9531cdf3..abb2ce19ef 100644
--- a/server/src/main/java/com/vaadin/server/Page.java
+++ b/server/src/main/java/com/vaadin/server/Page.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
@@ -45,13 +45,13 @@ public class Page implements Serializable {
     /**
      * Listener that gets notified when the size of the browser window
      * containing the uI has changed.
-     * 
+     *
      * @see UI#addListener(BrowserWindowResizeListener)
      */
     public interface BrowserWindowResizeListener extends Serializable {
         /**
          * Invoked when the browser window containing a UI has been resized.
-         * 
+         *
          * @param event
          *            a browser window resize event
          */
@@ -68,7 +68,7 @@ public class Page implements Serializable {
 
         /**
          * Creates a new event
-         * 
+         *
          * @param source
          *            the uI for which the browser window has been resized
          * @param width
@@ -89,7 +89,7 @@ public class Page implements Serializable {
 
         /**
          * Gets the new browser window height
-         * 
+         *
          * @return an integer with the new pixel height of the browser window
          */
         public int getHeight() {
@@ -98,7 +98,7 @@ public class Page implements Serializable {
 
         /**
          * Gets the new browser window width
-         * 
+         *
          * @return an integer with the new pixel width of the browser window
          */
         public int getWidth() {
@@ -140,7 +140,7 @@ public class Page implements Serializable {
 
         /**
          * Creates a new open resource.
-         * 
+         *
          * @param url
          *            The URL to open
          * @param name
@@ -162,7 +162,7 @@ public class Page implements Serializable {
 
         /**
          * Creates a new open resource.
-         * 
+         *
          * @param resource
          *            The resource to open
          * @param name
@@ -188,7 +188,7 @@ public class Page implements Serializable {
 
         /**
          * Paints the open request. Should be painted inside the window.
-         * 
+         *
          * @param target
          *            the paint target
          * @throws PaintException
@@ -247,7 +247,7 @@ public class Page implements Serializable {
     /**
      * Listener that that gets notified when the URI fragment of the page
      * changes.
-     * 
+     *
      * @see Page#addUriFragmentChangedListener(UriFragmentChangedListener)
      */
     public interface UriFragmentChangedListener extends Serializable {
@@ -256,9 +256,9 @@ public class Page implements Serializable {
          * changes. Please note that the initial URI fragment has already been
          * set when a new UI is initialized, so there will not be any initial
          * event for listeners added during {@link UI#init(VaadinRequest)}.
-         * 
+         *
          * @see Page#addUriFragmentChangedListener(UriFragmentChangedListener)
-         * 
+         *
          * @param event
          *            the URI fragment changed event
          */
@@ -283,7 +283,7 @@ public class Page implements Serializable {
 
     /**
      * Event fired when the URI fragment of a <code>Page</code> changes.
-     * 
+     *
      * @see Page#addUriFragmentChangedListener(UriFragmentChangedListener)
      */
     public static class UriFragmentChangedEvent extends EventObject {
@@ -295,7 +295,7 @@ public class Page implements Serializable {
 
         /**
          * Creates a new instance of UriFragmentReader change event.
-         * 
+         *
          * @param source
          *            the Source of the event.
          * @param uriFragment
@@ -308,7 +308,7 @@ public class Page implements Serializable {
 
         /**
          * Gets the page in which the fragment has changed.
-         * 
+         *
          * @return the page in which the fragment has changed
          */
         public Page getPage() {
@@ -317,7 +317,7 @@ public class Page implements Serializable {
 
         /**
          * Get the new URI fragment
-         * 
+         *
          * @return the new fragment
          */
         public String getUriFragment() {
@@ -383,7 +383,7 @@ public class Page implements Serializable {
     /**
      * Contains dynamically injected styles injected in the HTML document at
      * runtime.
-     * 
+     *
      * @since 7.1
      */
     public static class Styles implements Serializable {
@@ -400,7 +400,7 @@ public class Page implements Serializable {
 
         /**
          * Injects a raw CSS string into the page.
-         * 
+         *
          * @param css
          *            The CSS to inject
          */
@@ -416,7 +416,7 @@ public class Page implements Serializable {
 
         /**
          * Injects a CSS resource into the page
-         * 
+         *
          * @param resource
          *            The resource to inject.
          */
@@ -503,11 +503,11 @@ public class Page implements Serializable {
      * page is changed. Please note that the initial URI fragment has already
      * been set when a new UI is initialized, so there will not be any initial
      * event for listeners added during {@link UI#init(VaadinRequest)}.
-     * 
+     *
      * @see #getUriFragment()
      * @see #setUriFragment(String)
      * @see #removeUriFragmentChangedListener(UriFragmentChangedListener)
-     * 
+     *
      * @param listener
      *            the URI fragment listener to add
      */
@@ -528,10 +528,10 @@ public class Page implements Serializable {
 
     /**
      * Removes a URI fragment listener that was previously added to this page.
-     * 
+     *
      * @param listener
      *            the URI fragment listener to remove
-     * 
+     *
      * @see Page#addUriFragmentChangedListener(UriFragmentChangedListener)
      */
     public void removeUriFragmentChangedListener(
@@ -561,17 +561,17 @@ public class Page implements Serializable {
      * is already a non-null fragment will leave a trailing # in the URI since
      * removing it would cause the browser to reload the page. This is not fully
      * consistent with the semantics of {@link java.net.URI}.
-     * 
+     *
      * @param newUriFragment
      *            The new fragment.
      * @param fireEvents
      *            true to fire event
-     * 
+     *
      * @see #getUriFragment()
      * @see #setLocation(URI)
      * @see UriFragmentChangedEvent
      * @see Page.UriFragmentChangedListener
-     * 
+     *
      */
     public void setUriFragment(String newUriFragment, boolean fireEvents) {
         String oldUriFragment = location.getFragment();
@@ -606,7 +606,7 @@ public class Page implements Serializable {
 
     /**
      * Sets URI fragment. This method fires a {@link UriFragmentChangedEvent}
-     * 
+     *
      * @param newUriFragment
      *            id of the new fragment
      * @see UriFragmentChangedEvent
@@ -624,9 +624,9 @@ public class Page implements Serializable {
      * <p>
      * To listen to changes in fragment, hook a
      * {@link Page.UriFragmentChangedListener}.
-     * 
+     *
      * @return the current fragment in browser location URI.
-     * 
+     *
      * @see #getLocation()
      * @see #setUriFragment(String)
      * @see #addUriFragmentChangedListener(UriFragmentChangedListener)
@@ -671,9 +671,9 @@ public class Page implements Serializable {
 
     /**
      * Gets the window.name value of the browser window of this page.
-     * 
+     *
      * @since 7.2
-     * 
+     *
      * @return the window name, <code>null</code> if the name is not known
      */
     public String getWindowName() {
@@ -700,9 +700,9 @@ public class Page implements Serializable {
     /**
      * For internal use only. Updates the internal state with the given values.
      * Does not resize the Page or browser window.
-     * 
+     *
      * @since 7.2
-     * 
+     *
      * @param width
      *            the new browser window width
      * @param height
@@ -742,10 +742,10 @@ public class Page implements Serializable {
      * received while a resize is being performed. Use
      * {@link UI#setResizeLazy(boolean)}.
      * </p>
-     * 
+     *
      * @param resizeListener
      *            the listener to add
-     * 
+     *
      * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
      * @see UI#setResizeLazy(boolean)
      */
@@ -768,7 +768,7 @@ public class Page implements Serializable {
     /**
      * Removes a {@link BrowserWindowResizeListener} from this UI. The listener
      * will no longer be notified when the browser window is resized.
-     * 
+     *
      * @param resizeListener
      *            the listener to remove
      */
@@ -792,7 +792,7 @@ public class Page implements Serializable {
     /**
      * Gets the last known height of the browser window in which this UI
      * resides.
-     * 
+     *
      * @return the browser window height in pixels
      */
     public int getBrowserWindowHeight() {
@@ -801,7 +801,7 @@ public class Page implements Serializable {
 
     /**
      * Gets the last known width of the browser window in which this uI resides.
-     * 
+     *
      * @return the browser window width in pixels
      */
     public int getBrowserWindowWidth() {
@@ -820,7 +820,7 @@ public class Page implements Serializable {
     /**
      * Returns that stylesheet associated with this Page. The stylesheet
      * contains additional styles injected at runtime into the HTML document.
-     * 
+     *
      * @since 7.1
      */
     public Styles getStyles() {
@@ -898,10 +898,10 @@ public class Page implements Serializable {
      * This method should not be used to start downloads, as the client side
      * will assume the browser will navigate away when opening the URI. Use one
      * of the {@code Page.open} methods or {@code FileDownloader} instead.
-     * 
+     *
      * @see #open(String, String)
      * @see FileDownloader
-     * 
+     *
      * @param uri
      *            the URI to show
      */
@@ -918,10 +918,10 @@ public class Page implements Serializable {
      * This method should not be used to start downloads, as the client side
      * will assume the browser will navigate away when opening the URI. Use one
      * of the {@code Page.open} methods or {@code FileDownloader} instead.
-     * 
+     *
      * @see #open(String, String)
      * @see FileDownloader
-     * 
+     *
      * @param uri
      *            the URI to show
      */
@@ -933,7 +933,7 @@ public class Page implements Serializable {
      * Returns the location URI of this page, as reported by the browser. Note
      * that this may not be consistent with the server URI the application is
      * deployed in due to potential proxies, redirections and similar.
-     * 
+     *
      * @return The browser location URI.
      */
     public URI getLocation() {
@@ -949,10 +949,10 @@ public class Page implements Serializable {
     /**
      * For internal use only. Used to update the server-side location when the
      * client-side location changes.
-     * 
+     *
      * @deprecated As of 7.2, use {@link #updateLocation(String, boolean)}
      *             instead.
-     * 
+     *
      * @param location
      *            the new location URI
      */
@@ -964,9 +964,9 @@ public class Page implements Serializable {
     /**
      * For internal use only. Used to update the server-side location when the
      * client-side location changes.
-     * 
+     *
      * @since 7.2
-     * 
+     *
      * @param location
      *            the new location URI
      * @param fireEvents
@@ -1028,7 +1028,7 @@ public class Page implements Serializable {
      * forgiving when the window is opened directly from a client-side click
      * event.
      * </p>
-     * 
+     *
      * @param url
      *            the URL to open.
      * @param windowName
@@ -1079,7 +1079,7 @@ public class Page implements Serializable {
      * forgiving when the window is opened directly from a client-side click
      * event.
      * </p>
-     * 
+     *
      * @param url
      *            the URL to open.
      * @param windowName
@@ -1106,7 +1106,7 @@ public class Page implements Serializable {
      * forgiving when the window is opened directly from a client-side click
      * event.
      * </p>
-     * 
+     *
      * @param url
      *            the URL to open.
      * @param windowName
@@ -1155,7 +1155,7 @@ public class Page implements Serializable {
 
     /**
      * Internal helper method to actually add a notification.
-     * 
+     *
      * @param notification
      *            the notification to add
      */
@@ -1169,12 +1169,12 @@ public class Page implements Serializable {
 
     /**
      * Shows a notification message.
-     * 
+     *
      * @see Notification
-     * 
+     *
      * @param notification
      *            The notification message to show
-     * 
+     *
      * @deprecated As of 7.0, use Notification.show(Page) instead.
      */
     @Deprecated
@@ -1186,9 +1186,9 @@ public class Page implements Serializable {
      * Gets the Page to which the current uI belongs. This is automatically
      * defined when processing requests to the server. In other cases, (e.g.
      * from background threads), the current uI is not automatically defined.
-     * 
+     *
      * @see UI#getCurrent()
-     * 
+     *
      * @return the current page instance if available, otherwise
      *         <code>null</code>
      */
@@ -1206,7 +1206,7 @@ public class Page implements Serializable {
      * <p>
      * If the title is set to null, it will not left as-is. Set to empty string
      * to clear the title.
-     * 
+     *
      * @param title
      *            the page title to set
      */
@@ -1232,7 +1232,7 @@ public class Page implements Serializable {
      * outside of Page should not access it directly but only through public
      * APIs provided by Page.
      * </p>
-     * 
+     *
      * @since 7.1
      * @param markAsDirty
      *            true to mark the state as dirty
diff --git a/server/src/main/java/com/vaadin/server/PaintException.java b/server/src/main/java/com/vaadin/server/PaintException.java
index a7025598b2..5fb0e06779 100644
--- a/server/src/main/java/com/vaadin/server/PaintException.java
+++ b/server/src/main/java/com/vaadin/server/PaintException.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
@@ -21,7 +21,7 @@ import java.io.Serializable;
 
 /**
  * <code>PaintExcepection</code> is thrown if painting of a component fails.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -31,7 +31,7 @@ public class PaintException extends IOException implements Serializable {
     /**
      * Constructs an instance of <code>PaintExeception</code> with the specified
      * detail message.
-     * 
+     *
      * @param msg
      *            the detail message.
      */
@@ -42,7 +42,7 @@ public class PaintException extends IOException implements Serializable {
     /**
      * Constructs an instance of <code>PaintExeception</code> with the specified
      * detail message and cause.
-     * 
+     *
      * @param msg
      *            the detail message.
      * @param cause
@@ -54,7 +54,7 @@ public class PaintException extends IOException implements Serializable {
 
     /**
      * Constructs an instance of <code>PaintExeception</code> from IOException.
-     * 
+     *
      * @param exception
      *            the original exception.
      */
diff --git a/server/src/main/java/com/vaadin/server/PaintTarget.java b/server/src/main/java/com/vaadin/server/PaintTarget.java
index 902cb13816..b0acefda65 100644
--- a/server/src/main/java/com/vaadin/server/PaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/PaintTarget.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.ui.Component;
 
 /**
  * This interface defines the methods for painting XML to the UIDL stream.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -32,10 +32,10 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Prints single XMLsection.
-     * 
+     *
      * Prints full XML section. The section data is escaped from XML tags and
      * surrounded by XML start and end-tags.
-     * 
+     *
      * @param sectionTagName
      *            the name of the tag.
      * @param sectionData
@@ -49,7 +49,7 @@ public interface PaintTarget extends Serializable {
     /**
      * Result of starting to paint a Component (
      * {@link PaintTarget#startPaintable(Component, String)}).
-     * 
+     *
      * @since 7.0
      */
     public enum PaintStatus {
@@ -85,7 +85,7 @@ public interface PaintTarget extends Serializable {
      * {@link #endPaintable(Component)} regardless of the {@link PaintStatus}
      * returned.
      * </p>
-     * 
+     *
      * @param paintable
      *            the paintable to start.
      * @param tag
@@ -103,11 +103,11 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Prints paintable element end tag.
-     * 
+     *
      * Calls to {@link #startPaintable(Component, String)}should be matched by
      * {@link #endPaintable(Component)}. If the parent tag is closed before
      * every child tag is closed a PaintException is raised.
-     * 
+     *
      * @param paintable
      *            the paintable to close.
      * @throws PaintException
@@ -118,12 +118,12 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Prints element start tag.
-     * 
+     *
      * <pre>
      * Todo:
      * Checking of input values
      * </pre>
-     * 
+     *
      * @param tagName
      *            the name of the start tag.
      * @throws PaintException
@@ -133,10 +133,10 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Prints element end tag.
-     * 
+     *
      * If the parent tag is closed before every child tag is closed an
      * PaintException is raised.
-     * 
+     *
      * @param tagName
      *            the name of the end tag.
      * @throws PaintException
@@ -147,12 +147,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a boolean attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Attribute name.
      * @param value
      *            the Attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -161,12 +161,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a integer attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Attribute name.
      * @param value
      *            the Attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -175,12 +175,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a resource attribute to component. Atributes must be added before
      * any content is written.
-     * 
+     *
      * @param name
      *            the Attribute name
      * @param value
      *            the Attribute value
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -206,7 +206,7 @@ public interface PaintTarget extends Serializable {
      * Most commonly a component developer can just ignore this issue, but with
      * strict memory requirements and lots of StreamVariables implementations
      * that reserve a lot of memory this may be a critical issue.
-     * 
+     *
      * @param owner
      *            the ReceiverOwner that can track the progress of streaming to
      *            the given StreamVariable
@@ -214,7 +214,7 @@ public interface PaintTarget extends Serializable {
      *            an identifying name for the StreamVariable
      * @param value
      *            the StreamVariable to paint
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -224,12 +224,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a long attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Attribute name.
      * @param value
      *            the Attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -238,12 +238,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a float attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Attribute name.
      * @param value
      *            the Attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -252,12 +252,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a double attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Attribute name.
      * @param value
      *            the Attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -266,12 +266,12 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds a string attribute to component. Atributes must be added before any
      * content is written.
-     * 
+     *
      * @param name
      *            the Boolean attribute name.
      * @param value
      *            the Boolean attribute value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -279,7 +279,7 @@ public interface PaintTarget extends Serializable {
 
     /**
      * TODO
-     * 
+     *
      * @param name
      * @param value
      * @throws PaintException
@@ -291,7 +291,7 @@ public interface PaintTarget extends Serializable {
      * Adds a Component type attribute. On client side the value will be a
      * terminal specific reference to corresponding component on client side
      * implementation.
-     * 
+     *
      * @param name
      *            the name of the attribute
      * @param value
@@ -303,14 +303,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a string type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -319,14 +319,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a int type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -335,14 +335,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a long type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -351,14 +351,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a float type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -367,14 +367,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a double type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -383,14 +383,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a boolean type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -399,14 +399,14 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a string array type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
      * @param value
      *            the Variable initial value.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -419,14 +419,14 @@ public interface PaintTarget extends Serializable {
      * implementation. When updated from client side, terminal will map the
      * client side component reference back to a corresponding server side
      * reference.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes
      * @param name
      *            the name of the variable
      * @param value
      *            the initial value of the variable
-     * 
+     *
      * @throws PaintException
      *             if the paint oparation fails
      */
@@ -435,12 +435,12 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds a upload stream type variable.
-     * 
+     *
      * @param owner
      *            the Listener for variable changes.
      * @param name
      *            the Variable name.
-     * 
+     *
      * @throws PaintException
      *             if the paint operation failed.
      */
@@ -453,7 +453,7 @@ public interface PaintTarget extends Serializable {
      * Prints full XML section. The section data must be XML and it is
      * surrounded by XML start and end-tags.
      * </p>
-     * 
+     *
      * @param sectionTagName
      *            the tag name.
      * @param sectionData
@@ -469,7 +469,7 @@ public interface PaintTarget extends Serializable {
     /**
      * Adds UIDL directly. The UIDL must be valid in accordance with the
      * UIDL.dtd
-     * 
+     *
      * @param uidl
      *            the UIDL to be added.
      * @throws PaintException
@@ -479,7 +479,7 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds text node. All the contents of the text are XML-escaped.
-     * 
+     *
      * @param text
      *            the Text to add
      * @throws PaintException
@@ -489,7 +489,7 @@ public interface PaintTarget extends Serializable {
 
     /**
      * Adds CDATA node to target UIDL-tree.
-     * 
+     *
      * @param text
      *            the Character data to add
      * @throws PaintException
diff --git a/server/src/main/java/com/vaadin/server/RequestHandler.java b/server/src/main/java/com/vaadin/server/RequestHandler.java
index b667ed038c..64f9cf6aa1 100644
--- a/server/src/main/java/com/vaadin/server/RequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/RequestHandler.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
@@ -40,7 +40,7 @@ public interface RequestHandler extends Serializable {
      * {@link VaadinSession#accessSynchronously(Runnable)} or
      * {@link UI#accessSynchronously(Runnable)}.
      * </p>
-     * 
+     *
      * @param session
      *            The session for the request
      * @param request
diff --git a/server/src/main/java/com/vaadin/server/Resource.java b/server/src/main/java/com/vaadin/server/Resource.java
index 20e0bb7f9a..6e54fab8ed 100644
--- a/server/src/main/java/com/vaadin/server/Resource.java
+++ b/server/src/main/java/com/vaadin/server/Resource.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
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * <code>Resource</code> provided to the client terminal. Support for actually
  * displaying the resource type is left to the terminal.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -29,7 +29,7 @@ public interface Resource extends Serializable {
 
     /**
      * Gets the MIME type of the resource.
-     * 
+     *
      * @return the MIME type of the resource.
      */
     public String getMIMEType();
diff --git a/server/src/main/java/com/vaadin/server/ResourceReference.java b/server/src/main/java/com/vaadin/server/ResourceReference.java
index 72f6980836..014301adf0 100644
--- a/server/src/main/java/com/vaadin/server/ResourceReference.java
+++ b/server/src/main/java/com/vaadin/server/ResourceReference.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/server/src/main/java/com/vaadin/server/Responsive.java b/server/src/main/java/com/vaadin/server/Responsive.java
index 9209f14ff9..f44b8e4926 100644
--- a/server/src/main/java/com/vaadin/server/Responsive.java
+++ b/server/src/main/java/com/vaadin/server/Responsive.java
@@ -4,9 +4,9 @@
  * 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
@@ -40,22 +40,22 @@ import com.vaadin.ui.Component;
  * <code>Page.getCurrent().getStyles().add(...)</code>) or any other style
  * updates after the initial page load are not supported at the moment.</i>
  * </p>
- * 
- * 
+ *
+ *
  * <p>
  * Example:
- * 
+ *
  * <b>Java</b>
- * 
+ *
  * <pre>
  * CssLayout layout = new CssLayout();
  * layout.setStyleName(&quot;responsive&quot;);
  * layout.setSizeFull();
  * Responsive.makeResponsive(layout);
  * </pre>
- * 
+ *
  * <b>SCSS</b>
- * 
+ *
  * <pre>
  * .v-csslayout.responsive {
  *   &[width-range~="0-300px"] {
@@ -78,9 +78,9 @@ import com.vaadin.ui.Component;
  *   }
  * }
  * </pre>
- * 
+ *
  * <b>CSS</b>
- * 
+ *
  * <pre>
  * .v-csslayout.responsive[width-range~="0-300px"] {
  *    // Styles for the layout when its width is between 0 and 300 pixels
@@ -91,7 +91,7 @@ import com.vaadin.ui.Component;
  * .v-csslayout.responsive[width-range~="501-"] {
  *    // Styles for the layout when its width is over 500 pixels
  * }
- * 
+ *
  * .v-csslayout.responsive[height-range~="0-300px"] {
  *    // Styles for the layout when its height is between 0 and 300 pixels
  * }
@@ -102,7 +102,7 @@ import com.vaadin.ui.Component;
  *    // Styles for the layout when its height is over 500 pixels
  * }
  * </pre>
- * 
+ *
  * </p>
  * <p>
  * <b>Note:</b> <i>The defined ranges are applied on a global context, so even
@@ -114,24 +114,24 @@ import com.vaadin.ui.Component;
  * though the CSS implies it would only affect CssLayout instances inside a
  * parent with a style name "foobar":
  * </p>
- * 
+ *
  * <pre>
  * .foobar .v-csslayout[width-range~="0px-100px"] {
  *    // These properties will affect all responsive CssLayout instances
  * }
  * </pre>
- * 
+ *
  * <p>
  * To scope the ranges, use an additional style name for the target component,
  * and add that to your CSS selector:
  * </p>
- * 
+ *
  * <pre>
  *  .v-csslayout.mystyle[width-range="0px-100px"] {
  *    // These properties will only affect responsive CssLayout instances with an additional style name of 'mystyle'
  * }
  * </pre>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.2
  */
@@ -146,7 +146,7 @@ public class Responsive extends AbstractExtension {
     /**
      * Enable responsive width and height range styling for the target component
      * or UI instance.
-     * 
+     *
      * @param target
      *            The component which should be able to respond to width and/or
      *            height changes.
diff --git a/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java
index 0fd9476944..e4092f8383 100644
--- a/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java
+++ b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.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
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 
 /**
  * Read-only wrapper for a {@link RenderResponse}.
- * 
+ *
  * Only for use by {@link PortletApplicationContext} and
  * {@link VaadinPortletSession}.
  */
diff --git a/server/src/main/java/com/vaadin/server/Scrollable.java b/server/src/main/java/com/vaadin/server/Scrollable.java
index ae6828e339..36be9cac01 100644
--- a/server/src/main/java/com/vaadin/server/Scrollable.java
+++ b/server/src/main/java/com/vaadin/server/Scrollable.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
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * This interface is implemented by all visual objects that can be scrolled
  * programmatically from the server-side. The unit of scrolling is pixel.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -31,24 +31,24 @@ public interface Scrollable extends Serializable {
 
     /**
      * Gets scroll left offset.
-     * 
+     *
      * <p>
      * Scrolling offset is the number of pixels this scrollable has been
      * scrolled right.
      * </p>
-     * 
+     *
      * @return Horizontal scrolling position in pixels.
      */
     public int getScrollLeft();
 
     /**
      * Sets scroll left offset.
-     * 
+     *
      * <p>
      * Scrolling offset is the number of pixels this scrollable has been
      * scrolled right.
      * </p>
-     * 
+     *
      * @param scrollLeft
      *            the xOffset.
      */
@@ -56,24 +56,24 @@ public interface Scrollable extends Serializable {
 
     /**
      * Gets scroll top offset.
-     * 
+     *
      * <p>
      * Scrolling offset is the number of pixels this scrollable has been
      * scrolled down.
      * </p>
-     * 
+     *
      * @return Vertical scrolling position in pixels.
      */
     public int getScrollTop();
 
     /**
      * Sets scroll top offset.
-     * 
+     *
      * <p>
      * Scrolling offset is the number of pixels this scrollable has been
      * scrolled down.
      * </p>
-     * 
+     *
      * <p>
      * The scrolling position is limited by the current height of the content
      * area. If the position is below the height, it is scrolled to the bottom.
@@ -81,7 +81,7 @@ public interface Scrollable extends Serializable {
      * scrolling to bottom only scrolls to the bottom of the previous content
      * area.
      * </p>
-     * 
+     *
      * @param scrollTop
      *            the yOffset.
      */
diff --git a/server/src/main/java/com/vaadin/server/ServerRpcManager.java b/server/src/main/java/com/vaadin/server/ServerRpcManager.java
index 55b2753ead..ce09dd2ec2 100644
--- a/server/src/main/java/com/vaadin/server/ServerRpcManager.java
+++ b/server/src/main/java/com/vaadin/server/ServerRpcManager.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
@@ -29,11 +29,11 @@ import com.vaadin.shared.communication.ServerRpc;
 
 /**
  * Server side RPC manager that handles RPC calls coming from the client.
- * 
+ *
  * Each {@link RpcTarget} (typically a {@link ClientConnector}) should have its
  * own instance of {@link ServerRpcManager} if it wants to receive RPC calls
  * from the client.
- * 
+ *
  * @since 7.0
  */
 public class ServerRpcManager<T extends ServerRpc> implements Serializable {
@@ -44,10 +44,10 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
     /**
      * Wrapper exception for exceptions which occur during invocation of an RPC
      * call
-     * 
+     *
      * @author Vaadin Ltd
      * @since 7.0
-     * 
+     *
      */
     public static class RpcInvocationException extends Exception {
 
@@ -87,7 +87,7 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
 
     /**
      * Create a RPC manager for an RPC target.
-     * 
+     *
      * @param target
      *            RPC call target (normally a {@link Connector})
      * @param implementation
@@ -103,7 +103,7 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
     /**
      * Invoke a method in a server side RPC target class. This method is to be
      * used by the RPC framework and unit testing tools only.
-     * 
+     *
      * @param target
      *            non-null target of the RPC call
      * @param invocation
@@ -127,7 +127,7 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
 
     /**
      * Returns the RPC interface implementation for the RPC target.
-     * 
+     *
      * @return RPC interface implementation
      */
     protected T getImplementation() {
@@ -136,7 +136,7 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
 
     /**
      * Returns the RPC interface type managed by this RPC manager instance.
-     * 
+     *
      * @return RPC interface type
      */
     public Class<T> getRpcInterface() {
@@ -146,7 +146,7 @@ public class ServerRpcManager<T extends ServerRpc> implements Serializable {
     /**
      * Invoke a method in a server side RPC target class. This method is to be
      * used by the RPC framework and unit testing tools only.
-     * 
+     *
      * @param invocation
      *            method invocation to perform
      */
diff --git a/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.java b/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.java
index d3f8531406..7dc669e1cf 100644
--- a/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.java
+++ b/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.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
@@ -55,7 +55,7 @@ public class ServerRpcMethodInvocation extends MethodInvocation {
      * Tries to find the method from the cache or alternatively by invoking
      * {@link #doFindInvocationMethod(Class, String, int)} and updating the
      * cache.
-     * 
+     *
      * @param targetType
      * @param methodName
      * @param parameterCount
@@ -90,7 +90,7 @@ public class ServerRpcMethodInvocation extends MethodInvocation {
     /**
      * Tries to find the method from the class by looping through available
      * methods.
-     * 
+     *
      * @param targetType
      * @param methodName
      * @param parameterCount
diff --git a/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.java b/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.java
index 2ed0bbf8f1..6f3d790b82 100644
--- a/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.java
+++ b/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.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
@@ -21,7 +21,7 @@ import java.util.EventObject;
 /**
  * Event fired to {@link ServiceDestroyListener} when a {@link VaadinService} is
  * being destroyed.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -29,7 +29,7 @@ public class ServiceDestroyEvent extends EventObject {
 
     /**
      * Creates a new event for the given service.
-     * 
+     *
      * @param service
      *            the service being destroyed
      */
@@ -39,7 +39,7 @@ public class ServiceDestroyEvent extends EventObject {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.util.EventObject#getSource()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/server/ServiceDestroyListener.java b/server/src/main/java/com/vaadin/server/ServiceDestroyListener.java
index 1549d82d51..54b9a607d5 100644
--- a/server/src/main/java/com/vaadin/server/ServiceDestroyListener.java
+++ b/server/src/main/java/com/vaadin/server/ServiceDestroyListener.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
@@ -21,17 +21,17 @@ import java.io.Serializable;
 /**
  * Listener that gets notified when the {@link VaadinService} to which it has
  * been registered is destroyed.
- * 
+ *
  * @see VaadinService#addServiceDestroyListener(ServiceDestroyListener)
  * @see VaadinService#removeServiceDestroyListener(ServiceDestroyListener)
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
 public interface ServiceDestroyListener extends Serializable {
     /**
      * Invoked when a service is destroyed
-     * 
+     *
      * @param event
      *            the event
      */
diff --git a/server/src/main/java/com/vaadin/server/ServiceException.java b/server/src/main/java/com/vaadin/server/ServiceException.java
index 2bc36bc1d7..dffa4ac024 100644
--- a/server/src/main/java/com/vaadin/server/ServiceException.java
+++ b/server/src/main/java/com/vaadin/server/ServiceException.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/server/src/main/java/com/vaadin/server/ServletPortletHelper.java b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
index 55add64d5f..7431ec6360 100644
--- a/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/main/java/com/vaadin/server/ServletPortletHelper.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.ui.UI;
 /**
  * Contains helper methods shared by {@link VaadinServlet} and
  * {@link VaadinPortlet}.
- * 
+ *
  * @deprecated As of 7.1. Will be removed or refactored in the future.
  */
 @Deprecated
diff --git a/server/src/main/java/com/vaadin/server/SessionDestroyEvent.java b/server/src/main/java/com/vaadin/server/SessionDestroyEvent.java
index a64fce0b64..ced5729177 100644
--- a/server/src/main/java/com/vaadin/server/SessionDestroyEvent.java
+++ b/server/src/main/java/com/vaadin/server/SessionDestroyEvent.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
@@ -20,9 +20,9 @@ import java.util.EventObject;
 
 /**
  * Event fired when a Vaadin service session is no longer in use.
- * 
+ *
  * @see SessionDestroyListener#sessionDestroy(SessionDestroyEvent)
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -32,7 +32,7 @@ public class SessionDestroyEvent extends EventObject {
 
     /**
      * Creates a new event.
-     * 
+     *
      * @param service
      *            the Vaadin service from which the even originates
      * @param session
@@ -50,7 +50,7 @@ public class SessionDestroyEvent extends EventObject {
 
     /**
      * Gets the Vaadin service from which the even originates.
-     * 
+     *
      * @return the Vaadin service
      */
     public VaadinService getService() {
@@ -59,7 +59,7 @@ public class SessionDestroyEvent extends EventObject {
 
     /**
      * Gets the Vaadin service session that is no longer used.
-     * 
+     *
      * @return the Vaadin service session
      */
     public VaadinSession getSession() {
diff --git a/server/src/main/java/com/vaadin/server/SessionDestroyListener.java b/server/src/main/java/com/vaadin/server/SessionDestroyListener.java
index 29daa60a40..7c6ce1b354 100644
--- a/server/src/main/java/com/vaadin/server/SessionDestroyListener.java
+++ b/server/src/main/java/com/vaadin/server/SessionDestroyListener.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
@@ -21,16 +21,16 @@ import java.io.Serializable;
 /**
  * A listener that gets notified when a Vaadin service session is no longer
  * used.
- * 
+ *
  * @see VaadinService#addSessionDestroyListener(SessionDestroyListener)
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
 public interface SessionDestroyListener extends Serializable {
     /**
      * Called when a Vaadin service session is no longer used.
-     * 
+     *
      * @param event
      *            the event with details about the destroyed session
      */
diff --git a/server/src/main/java/com/vaadin/server/SessionExpiredException.java b/server/src/main/java/com/vaadin/server/SessionExpiredException.java
index d70498e7cb..d0e8fb04dc 100644
--- a/server/src/main/java/com/vaadin/server/SessionExpiredException.java
+++ b/server/src/main/java/com/vaadin/server/SessionExpiredException.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/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
index 3d6de95dea..5bb6d58764 100644
--- a/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
+++ b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.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
@@ -20,7 +20,7 @@ import java.io.IOException;
 /**
  * A specialized RequestHandler which is capable of sending session expiration
  * messages to the user.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -31,7 +31,7 @@ public interface SessionExpiredHandler extends RequestHandler {
      * to be sent to the user. If a response is written, this method should
      * return <code>true</code> to indicate that no more
      * {@link SessionExpiredHandler} handlers should be invoked for the request.
-     * 
+     *
      * @param request
      *            The request to handle
      * @param response
diff --git a/server/src/main/java/com/vaadin/server/SessionInitEvent.java b/server/src/main/java/com/vaadin/server/SessionInitEvent.java
index 76262c6140..1ab9fe6083 100644
--- a/server/src/main/java/com/vaadin/server/SessionInitEvent.java
+++ b/server/src/main/java/com/vaadin/server/SessionInitEvent.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,9 +26,9 @@ import java.util.EventObject;
  * event is not necessarily fired immediately when the session is created but
  * only when the first request for that session is handled by a specific
  * service.
- * 
+ *
  * @see SessionInitListener#sessionInit(SessionInitEvent)
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -39,7 +39,7 @@ public class SessionInitEvent extends EventObject {
 
     /**
      * Creates a new event.
-     * 
+     *
      * @param service
      *            the Vaadin service from which the event originates
      * @param session
@@ -61,7 +61,7 @@ public class SessionInitEvent extends EventObject {
 
     /**
      * Gets the Vaadin service from which this event originates
-     * 
+     *
      * @return the Vaadin service instance
      */
     public VaadinService getService() {
@@ -70,7 +70,7 @@ public class SessionInitEvent extends EventObject {
 
     /**
      * Gets the Vaadin service session that has been initialized.
-     * 
+     *
      * @return the Vaadin service session
      */
     public VaadinSession getSession() {
@@ -79,7 +79,7 @@ public class SessionInitEvent extends EventObject {
 
     /**
      * Gets the request that triggered the initialization.
-     * 
+     *
      * @return the request
      */
     public VaadinRequest getRequest() {
diff --git a/server/src/main/java/com/vaadin/server/SessionInitListener.java b/server/src/main/java/com/vaadin/server/SessionInitListener.java
index 2bbb8e3d1f..3434df3ce2 100644
--- a/server/src/main/java/com/vaadin/server/SessionInitListener.java
+++ b/server/src/main/java/com/vaadin/server/SessionInitListener.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,9 +26,9 @@ import java.io.Serializable;
  * listener is not necessarily notified immediately when the session is created
  * but only when the first request for that session is handled by a specific
  * service.
- * 
+ *
  * @see VaadinService#addSessionInitListener(SessionInitListener)
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -41,7 +41,7 @@ public interface SessionInitListener extends Serializable {
      * the listener is not necessarily notified immediately when the session is
      * created but only when the first request for that session is handled by a
      * specific service.
-     * 
+     *
      * @param event
      *            the initialization event
      * @throws ServiceException
diff --git a/server/src/main/java/com/vaadin/server/SizeWithUnit.java b/server/src/main/java/com/vaadin/server/SizeWithUnit.java
index 4c3c51eaec..ddd584b607 100644
--- a/server/src/main/java/com/vaadin/server/SizeWithUnit.java
+++ b/server/src/main/java/com/vaadin/server/SizeWithUnit.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
@@ -25,7 +25,7 @@ import com.vaadin.shared.util.SharedUtil;
 /**
  * A class for representing a value-unit pair. Also contains utility methods for
  * parsing such pairs from a string.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -37,7 +37,7 @@ public class SizeWithUnit implements Serializable {
 
     /**
      * Constructs a new SizeWithUnit object representing the pair (size, unit).
-     * 
+     *
      * @param size
      *            a numeric value
      * @param unit
@@ -50,7 +50,7 @@ public class SizeWithUnit implements Serializable {
 
     /**
      * Returns the numeric value stored in this object.
-     * 
+     *
      * @return the value of this (value, unit) pair
      */
     public float getSize() {
@@ -59,7 +59,7 @@ public class SizeWithUnit implements Serializable {
 
     /**
      * Returns the unit stored in this object.
-     * 
+     *
      * @return the unit of this (value, unit) pair
      */
     public Unit getUnit() {
@@ -72,7 +72,7 @@ public class SizeWithUnit implements Serializable {
      * is used as the unit. If defaultUnit is null and s is a nonempty string
      * representing a unitless number, an exception is thrown. Null or empty
      * string will produce {-1,Unit#PIXELS}.
-     * 
+     *
      * @param s
      *            the string to be parsed
      * @param defaultUnit
@@ -116,7 +116,7 @@ public class SizeWithUnit implements Serializable {
      * Returns an object whose numeric value and unit are taken from the string
      * s. Null or empty string will produce {-1,Unit#PIXELS}. An exception is
      * thrown if s specifies a number without a unit.
-     * 
+     *
      * @param s
      *            the string to be parsed
      * @return an object containing the parsed value and unit
diff --git a/server/src/main/java/com/vaadin/server/Sizeable.java b/server/src/main/java/com/vaadin/server/Sizeable.java
index 59754b60cd..dfdbc6d9d4 100644
--- a/server/src/main/java/com/vaadin/server/Sizeable.java
+++ b/server/src/main/java/com/vaadin/server/Sizeable.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
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * Interface to be implemented by components wishing to display some object that
  * may be dynamically resized during runtime.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -163,7 +163,7 @@ public interface Sizeable extends Serializable {
     /**
      * Gets the width of the object. Negative number implies unspecified size
      * (terminal is free to set the size).
-     * 
+     *
      * @return width of the object in units specified by widthUnits property.
      */
     public float getWidth();
@@ -171,38 +171,38 @@ public interface Sizeable extends Serializable {
     /**
      * Gets the height of the object. Negative number implies unspecified size
      * (terminal is free to set the size).
-     * 
+     *
      * @return height of the object in units specified by heightUnits property.
      */
     public float getHeight();
 
     /**
      * Gets the width property units.
-     * 
+     *
      * @return units used in width property.
      */
     public Unit getWidthUnits();
 
     /**
      * Gets the height property units.
-     * 
+     *
      * @return units used in height property.
      */
     public Unit getHeightUnits();
 
     /**
      * Sets the height of the component using String presentation.
-     * 
+     *
      * String presentation is similar to what is used in Cascading Style Sheets.
      * Size can be length or percentage of available size.
-     * 
+     *
      * The empty string ("") or null will unset the height and set the units to
      * pixels.
-     * 
+     *
      * See
      * <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS
      * specification</a> for more details.
-     * 
+     *
      * @param height
      *            in CSS style string representation
      */
@@ -211,7 +211,7 @@ public interface Sizeable extends Serializable {
     /**
      * Sets the width of the object. Negative number implies unspecified size
      * (terminal is free to set the size).
-     * 
+     *
      * @param width
      *            the width of the object.
      * @param unit
@@ -222,7 +222,7 @@ public interface Sizeable extends Serializable {
     /**
      * Sets the height of the object. Negative number implies unspecified size
      * (terminal is free to set the size).
-     * 
+     *
      * @param height
      *            the height of the object.
      * @param unit
@@ -232,17 +232,17 @@ public interface Sizeable extends Serializable {
 
     /**
      * Sets the width of the component using String presentation.
-     * 
+     *
      * String presentation is similar to what is used in Cascading Style Sheets.
      * Size can be length or percentage of available size.
-     * 
+     *
      * The empty string ("") or null will unset the width and set the units to
      * pixels.
-     * 
+     *
      * See
      * <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-length">CSS
      * specification</a> for more details.
-     * 
+     *
      * @param width
      *            in CSS style string representation, null or empty string to
      *            reset
@@ -261,14 +261,14 @@ public interface Sizeable extends Serializable {
 
     /**
      * Clears any defined width
-     * 
+     *
      * @since 7.3
      */
     public void setWidthUndefined();
 
     /**
      * Clears any defined height
-     * 
+     *
      * @since 7.3
      */
     public void setHeightUndefined();
diff --git a/server/src/main/java/com/vaadin/server/StreamResource.java b/server/src/main/java/com/vaadin/server/StreamResource.java
index 070cfb5138..25d5436529 100644
--- a/server/src/main/java/com/vaadin/server/StreamResource.java
+++ b/server/src/main/java/com/vaadin/server/StreamResource.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.util.FileTypeResolver;
 /**
  * <code>StreamResource</code> is a resource provided to the client directly by
  * the application.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -60,7 +60,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Creates a new stream resource for downloading from stream.
-     * 
+     *
      * @param streamSource
      *            the source Stream.
      * @param filename
@@ -84,7 +84,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Sets the mime type of the resource.
-     * 
+     *
      * @param MIMEType
      *            the MIME type to be set.
      */
@@ -95,7 +95,7 @@ public class StreamResource implements ConnectorResource {
     /**
      * Returns the source for this <code>StreamResource</code>. StreamSource is
      * queried when the resource is about to be streamed to the client.
-     * 
+     *
      * @return Source of the StreamResource.
      */
     public StreamSource getStreamSource() {
@@ -106,7 +106,7 @@ public class StreamResource implements ConnectorResource {
      * Sets the source for this <code>StreamResource</code>.
      * <code>StreamSource</code> is queried when the resource is about to be
      * streamed to the client.
-     * 
+     *
      * @param streamSource
      *            the source to set.
      */
@@ -116,7 +116,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Gets the filename.
-     * 
+     *
      * @return the filename.
      */
     @Override
@@ -126,7 +126,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Sets the filename.
-     * 
+     *
      * @param filename
      *            the filename to set.
      */
@@ -149,7 +149,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Interface implemented by the source of a StreamResource.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -163,12 +163,12 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Gets the size of the download buffer used for this resource.
-     * 
+     *
      * <p>
      * If the buffer size is 0, the buffer size is decided by the terminal
      * adapter. The default value is 0.
      * </p>
-     * 
+     *
      * @return the size of the buffer in bytes.
      */
     public int getBufferSize() {
@@ -177,7 +177,7 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Sets the size of the download buffer used for this resource.
-     * 
+     *
      * @param bufferSize
      *            the size of the buffer in bytes.
      */
@@ -190,7 +190,7 @@ public class StreamResource implements ConnectorResource {
      * possibility cache streams sent to the client. The caching may be made in
      * adapter or at the client if the client supports caching. Default is
      * <code>DownloadStream.DEFAULT_CACHETIME</code>.
-     * 
+     *
      * @return Cache time in milliseconds.
      */
     public long getCacheTime() {
@@ -199,17 +199,17 @@ public class StreamResource implements ConnectorResource {
 
     /**
      * Sets the length of cache expiration time.
-     * 
+     *
      * <p>
      * This gives the adapter the possibility cache streams sent to the client.
      * The caching may be made in adapter or at the client if the client
      * supports caching. Zero or negavive value disbales the caching of this
      * stream.
      * </p>
-     * 
+     *
      * @param cacheTime
      *            the cache time in milliseconds.
-     * 
+     *
      */
     public void setCacheTime(long cacheTime) {
         this.cacheTime = cacheTime;
diff --git a/server/src/main/java/com/vaadin/server/StreamVariable.java b/server/src/main/java/com/vaadin/server/StreamVariable.java
index c7b84c92d6..08a405b741 100644
--- a/server/src/main/java/com/vaadin/server/StreamVariable.java
+++ b/server/src/main/java/com/vaadin/server/StreamVariable.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
@@ -33,7 +33,7 @@ import com.vaadin.server.StreamVariable.StreamingStartEvent;
  * service or file system). If UI is changed as a side effect of writing to the
  * output stream, developer must handle synchronization manually.
  * <p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 6.5
  * @see PaintTarget#addVariable(VariableOwner, String, StreamVariable)
@@ -45,7 +45,7 @@ public interface StreamVariable extends Serializable {
      * {@link #streamingStarted(StreamingStartEvent)} method has been called.
      * The terminal implementation will write the streamed variable to the
      * returned output stream.
-     * 
+     *
      * @return Stream to which the uploaded file should be written.
      */
     public OutputStream getOutputStream();
@@ -59,7 +59,7 @@ public interface StreamVariable extends Serializable {
      * calling that method only if requested. The value is requested after the
      * {@link #uploadStarted(StreamingStartEvent)} event, but not after reading
      * each buffer.
-     * 
+     *
      * @return true if this {@link StreamVariable} wants to by notified during
      *         the upload of the progress of streaming.
      * @see #onProgress(StreamingProgressEvent)
@@ -91,7 +91,7 @@ public interface StreamVariable extends Serializable {
      * instance by the terminal like other methods. The implementation should
      * only return a boolean field and especially not modify UI or implement a
      * synchronization by itself.
-     * 
+     *
      * @return true if the streaming should be interrupted as soon as possible.
      */
     public boolean isInterrupted();
diff --git a/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.java b/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.java
index 56abfbb8f3..cb93eb9535 100644
--- a/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.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
@@ -22,7 +22,7 @@ import java.io.IOException;
  * automatically. The session is locked before
  * {@link #synchronizedHandleRequest(VaadinSession, VaadinRequest, VaadinResponse)}
  * is called and unlocked after it has completed.
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.1
@@ -49,7 +49,7 @@ public abstract class SynchronizedRequestHandler implements RequestHandler {
      * {@link #handleRequest(VaadinSession, VaadinRequest, VaadinResponse)}
      * except the {@link VaadinSession} is locked before this is called and
      * unlocked after this has completed.
-     * 
+     *
      * @see #handleRequest(VaadinSession, VaadinRequest, VaadinResponse)
      * @param session
      *            The session for the request
@@ -59,7 +59,7 @@ public abstract class SynchronizedRequestHandler implements RequestHandler {
      *            The response object to which a response can be written.
      * @return true if a response has been written and no further request
      *         handlers should be called, otherwise false
-     * 
+     *
      * @throws IOException
      *             If an IO error occurred
      */
@@ -74,7 +74,7 @@ public abstract class SynchronizedRequestHandler implements RequestHandler {
      * calling
      * {@link #synchronizedHandleRequest(VaadinSession, VaadinRequest, VaadinResponse)}
      * with the session locked.
-     * 
+     *
      * @since 7.2
      * @param request
      *            the request to handle
diff --git a/server/src/main/java/com/vaadin/server/SystemError.java b/server/src/main/java/com/vaadin/server/SystemError.java
index 834055e1e1..b792320f15 100644
--- a/server/src/main/java/com/vaadin/server/SystemError.java
+++ b/server/src/main/java/com/vaadin/server/SystemError.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
@@ -20,11 +20,11 @@ package com.vaadin.server;
  * <code>SystemError</code> is an error message for a problem caused by error in
  * system, not the user application code. The system error can contain technical
  * information such as stack trace and exception.
- * 
+ *
  * SystemError does not support HTML in error messages or stack traces. If HTML
  * messages are required, use {@link UserError} or a custom implementation of
  * {@link ErrorMessage}.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -33,7 +33,7 @@ public class SystemError extends AbstractErrorMessage {
 
     /**
      * Constructor for SystemError with error message specified.
-     * 
+     *
      * @param message
      *            the Textual error description.
      */
@@ -46,7 +46,7 @@ public class SystemError extends AbstractErrorMessage {
 
     /**
      * Constructor for SystemError with causing exception and error message.
-     * 
+     *
      * @param message
      *            the Textual error description.
      * @param cause
@@ -59,7 +59,7 @@ public class SystemError extends AbstractErrorMessage {
 
     /**
      * Constructor for SystemError with cause.
-     * 
+     *
      * @param cause
      *            the throwable causing the system error.
      */
@@ -69,7 +69,7 @@ public class SystemError extends AbstractErrorMessage {
 
     /**
      * Returns the message of the error in HTML.
-     * 
+     *
      * Note that this API may change in future versions.
      */
     protected String getHtmlMessage() {
diff --git a/server/src/main/java/com/vaadin/server/SystemMessageException.java b/server/src/main/java/com/vaadin/server/SystemMessageException.java
index 854d8001f6..f7d90d69e3 100644
--- a/server/src/main/java/com/vaadin/server/SystemMessageException.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessageException.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 @@ public class SystemMessageException extends RuntimeException {
     /**
      * Constructs a new <code>SystemMessageException</code> with the specified
      * detail message.
-     * 
+     *
      * @param msg
      *            the detail message.
      */
@@ -37,7 +37,7 @@ public class SystemMessageException extends RuntimeException {
     /**
      * Constructs a new <code>SystemMessageException</code> with the specified
      * detail message and cause.
-     * 
+     *
      * @param msg
      *            the detail message.
      * @param cause
@@ -50,7 +50,7 @@ public class SystemMessageException extends RuntimeException {
     /**
      * Constructs a new <code>SystemMessageException</code> from another
      * exception.
-     * 
+     *
      * @param cause
      *            the cause of the exception.
      */
diff --git a/server/src/main/java/com/vaadin/server/SystemMessages.java b/server/src/main/java/com/vaadin/server/SystemMessages.java
index e61b9cfb1e..ee9254a583 100644
--- a/server/src/main/java/com/vaadin/server/SystemMessages.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessages.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
@@ -52,7 +52,7 @@ import java.io.Serializable;
  * again.</li>
  * </ul>
  * </p>
- * 
+ *
  */
 public class SystemMessages implements Serializable {
     protected String sessionExpiredURL = null;
@@ -216,7 +216,7 @@ public class SystemMessages implements Serializable {
     /**
      * Returns the URL the user should be redirected to after dismissing the
      * "you have to enable your cookies" message. Typically null.
-     * 
+     *
      * @return A URL the user should be redirected to after dismissing the
      *         message or null to reload the current URL.
      */
@@ -228,7 +228,7 @@ public class SystemMessages implements Serializable {
      * Determines if "cookies disabled" messages should be shown to the end user
      * or not. If the notification is disabled the user will be immediately
      * redirected to the URL returned by {@link #getCookiesDisabledURL()}.
-     * 
+     *
      * @return true to show "cookies disabled" messages to the end user, false
      *         to redirect to the given URL directly
      */
@@ -239,7 +239,7 @@ public class SystemMessages implements Serializable {
     /**
      * Returns the caption of the message shown to the user when cookies are
      * disabled in the browser.
-     * 
+     *
      * @return The caption of the "cookies disabled" message
      */
     public String getCookiesDisabledCaption() {
@@ -250,7 +250,7 @@ public class SystemMessages implements Serializable {
     /**
      * Returns the message shown to the user when cookies are disabled in the
      * browser.
-     * 
+     *
      * @return The "cookies disabled" message
      */
     public String getCookiesDisabledMessage() {
diff --git a/server/src/main/java/com/vaadin/server/SystemMessagesInfo.java b/server/src/main/java/com/vaadin/server/SystemMessagesInfo.java
index 195cf3c711..5b410b5486 100644
--- a/server/src/main/java/com/vaadin/server/SystemMessagesInfo.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessagesInfo.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 @@ public class SystemMessagesInfo implements Serializable {
 
     /**
      * The locale of the UI related to the {@link SystemMessages} request.
-     * 
+     *
      * @return The Locale or null if the locale is not known
      */
     public Locale getLocale() {
@@ -39,7 +39,7 @@ public class SystemMessagesInfo implements Serializable {
 
     /**
      * Gets the request currently in progress.
-     * 
+     *
      * @return The request currently in progress or null if no request is in
      *         progress.
      */
@@ -53,7 +53,7 @@ public class SystemMessagesInfo implements Serializable {
 
     /**
      * Returns the service this SystemMessages request comes from.
-     * 
+     *
      * @return The service which triggered this request or null of not triggered
      *         from a service.
      */
diff --git a/server/src/main/java/com/vaadin/server/SystemMessagesProvider.java b/server/src/main/java/com/vaadin/server/SystemMessagesProvider.java
index a69cc0b159..fda3090350 100644
--- a/server/src/main/java/com/vaadin/server/SystemMessagesProvider.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessagesProvider.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.UI;
 /**
  * Gives out system messages based on Locale. Registered using
  * {@link VaadinService#setSystemMessagesProvider(SystemMessagesProvider)}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -34,7 +34,7 @@ public interface SystemMessagesProvider extends Serializable {
      * most cases some or both of {@link VaadinSession#getCurrent()} and
      * {@link UI#getCurrent()} can also be used to find more information to help
      * the decision.
-     * 
+     *
      * @param systemMessagesInfo
      *            Locale, current request and other information available.
      * @return a system messages object
diff --git a/server/src/main/java/com/vaadin/server/ThemeResource.java b/server/src/main/java/com/vaadin/server/ThemeResource.java
index 45a2736bf3..889e5365d6 100644
--- a/server/src/main/java/com/vaadin/server/ThemeResource.java
+++ b/server/src/main/java/com/vaadin/server/ThemeResource.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
@@ -23,7 +23,7 @@ import com.vaadin.util.FileTypeResolver;
  * managed by a theme. The actual resource contents are dynamically resolved to
  * comply with the used theme by the terminal adapter. This is commonly used to
  * provide static images, flash, java-applets, etc for the terminals.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -37,7 +37,7 @@ public class ThemeResource implements Resource {
 
     /**
      * Creates a resource.
-     * 
+     *
      * @param resourceId
      *            the Id of the resource.
      */
@@ -58,7 +58,7 @@ public class ThemeResource implements Resource {
 
     /**
      * Tests if the given object equals this Resource.
-     * 
+     *
      * @param obj
      *            the object to be tested for equality.
      * @return <code>true</code> if the given object equals this Icon,
@@ -89,7 +89,7 @@ public class ThemeResource implements Resource {
 
     /**
      * Gets the resource id.
-     * 
+     *
      * @return the resource id.
      */
     public String getResourceId() {
diff --git a/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.java b/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.java
index 9c9bbe5bc9..013e4037f4 100644
--- a/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.java
+++ b/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.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
@@ -20,7 +20,7 @@ package com.vaadin.server;
  * Contains information used by
  * {@link UIProvider#getUIClass(UIClassSelectionEvent)} to choose a UI class to
  * use in a specific situation.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -28,7 +28,7 @@ public class UIClassSelectionEvent extends UIProviderEvent {
 
     /**
      * Creates a new event for a specific request.
-     * 
+     *
      * @param request
      *            the Vaadin request for which a UI class is wanted.
      */
diff --git a/server/src/main/java/com/vaadin/server/UICreateEvent.java b/server/src/main/java/com/vaadin/server/UICreateEvent.java
index 1688416ba5..f7819c5d9f 100644
--- a/server/src/main/java/com/vaadin/server/UICreateEvent.java
+++ b/server/src/main/java/com/vaadin/server/UICreateEvent.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
@@ -21,7 +21,7 @@ import com.vaadin.ui.UI;
 /**
  * Contains data used by various methods in {@link UIProvider} for determining
  * information about a new UI that is about to be created.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -33,7 +33,7 @@ public class UICreateEvent extends UIProviderEvent {
     /**
      * Creates a new UI create event for a given VaadinRequest and UI class but
      * without a UI id.
-     * 
+     *
      * @param request
      *            the request for which the UI will be created
      * @param uiClass
@@ -46,7 +46,7 @@ public class UICreateEvent extends UIProviderEvent {
     /**
      * Creates a new UI create event for a given VaadinRequest, UI class and UI
      * id
-     * 
+     *
      * @param request
      *            the request for which the UI will be created
      * @param uiClass
@@ -64,7 +64,7 @@ public class UICreateEvent extends UIProviderEvent {
 
     /**
      * Gets the UI class that will be created.
-     * 
+     *
      * @return the UI class
      */
     public Class<? extends UI> getUIClass() {
@@ -77,7 +77,7 @@ public class UICreateEvent extends UIProviderEvent {
      * <p>
      * The UI id is generally only available in
      * {@link UIProvider#createInstance(UICreateEvent)}
-     * 
+     *
      * @return the UI id; or <code>null</code> if the UI id is not yet known.
      */
     public Integer getUiId() {
diff --git a/server/src/main/java/com/vaadin/server/UIProviderEvent.java b/server/src/main/java/com/vaadin/server/UIProviderEvent.java
index 1fcc0a3ddc..5eee93808e 100644
--- a/server/src/main/java/com/vaadin/server/UIProviderEvent.java
+++ b/server/src/main/java/com/vaadin/server/UIProviderEvent.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
@@ -21,9 +21,9 @@ import java.util.EventObject;
 
 /**
  * Base class for the events that are sent to various methods in UIProvider.
- * 
+ *
  * @see UIProvider
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -33,7 +33,7 @@ public class UIProviderEvent extends EventObject implements Serializable {
 
     /**
      * Creates a new UI provider event.
-     * 
+     *
      * @param request
      *            the request for which the event is UI provider is invoked
      */
@@ -44,7 +44,7 @@ public class UIProviderEvent extends EventObject implements Serializable {
 
     /**
      * Gets the Vaadin service from which the event originates.
-     * 
+     *
      * @return the Vaadin service
      */
     public VaadinService getService() {
@@ -53,7 +53,7 @@ public class UIProviderEvent extends EventObject implements Serializable {
 
     /**
      * Gets the request associated with this event.
-     * 
+     *
      * @return the Vaadin request
      */
     public VaadinRequest getRequest() {
diff --git a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java
index 56615faa08..42a7d29efd 100644
--- a/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java
+++ b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.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
@@ -21,7 +21,7 @@ import java.io.Writer;
 /**
  * A {@link RequestHandler} that presents an informative page if the browser in
  * use is unsupported. Recognizes Chrome Frame and allow it to be used.
- * 
+ *
  * <p>
  * This handler is usually added to the application by
  * {@link LegacyCommunicationManager}.
@@ -54,7 +54,7 @@ public class UnsupportedBrowserHandler extends SynchronizedRequestHandler {
 
     /**
      * Writes a page encouraging the user to upgrade to a more current browser.
-     * 
+     *
      * @param request
      * @param response
      * @throws IOException
diff --git a/server/src/main/java/com/vaadin/server/UploadException.java b/server/src/main/java/com/vaadin/server/UploadException.java
index 1f1073b435..ad4027ca1a 100644
--- a/server/src/main/java/com/vaadin/server/UploadException.java
+++ b/server/src/main/java/com/vaadin/server/UploadException.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/server/src/main/java/com/vaadin/server/UserError.java b/server/src/main/java/com/vaadin/server/UserError.java
index ec1ac042f8..6ffc04d0d7 100644
--- a/server/src/main/java/com/vaadin/server/UserError.java
+++ b/server/src/main/java/com/vaadin/server/UserError.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
@@ -19,7 +19,7 @@ package com.vaadin.server;
 /**
  * <code>UserError</code> is a controlled error occurred in application. User
  * errors are occur in normal usage of the application and guide the user.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -46,7 +46,7 @@ public class UserError extends AbstractErrorMessage {
 
     /**
      * Creates a textual error message of level ERROR.
-     * 
+     *
      * @param textErrorMessage
      *            the text of the error message.
      */
@@ -56,7 +56,7 @@ public class UserError extends AbstractErrorMessage {
 
     /**
      * Creates an error message with level and content mode.
-     * 
+     *
      * @param message
      *            the error message.
      * @param contentMode
diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java
index 8f4299e350..1072313f56 100644
--- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.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
@@ -52,7 +52,7 @@ import com.vaadin.util.CurrentInstance;
 /**
  * Portlet 2.0 base class. This replaces the servlet in servlet/portlet 1.0
  * deployments and handles various portlet requests from the browser.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class VaadinPortlet extends GenericPortlet
@@ -67,7 +67,7 @@ public class VaadinPortlet extends GenericPortlet
 
         /**
          * Constructs a new {@link VaadinHttpAndPortletRequest}.
-         * 
+         *
          * @since 7.2
          * @param request
          *            {@link PortletRequest} to be wrapped
@@ -83,7 +83,7 @@ public class VaadinPortlet extends GenericPortlet
 
         /**
          * Returns the original HTTP servlet request for this portlet request.
-         * 
+         *
          * @since 7.2
          * @param request
          *            {@link PortletRequest} used to
@@ -203,15 +203,15 @@ public class VaadinPortlet extends GenericPortlet
          * Simplified version of what Liferay PortalClassInvoker did. This is
          * used because the API of PortalClassInvoker has changed in Liferay
          * 6.2.
-         * 
+         *
          * This simply uses reflection with Liferay class loader. Parameters are
          * Strings to avoid static dependencies and to load all classes with
          * Liferay's own class loader. Only static utility methods are
          * supported.
-         * 
+         *
          * This method is for internal use only and may change in future
          * versions.
-         * 
+         *
          * @param className
          *            name of the Liferay class to call
          * @param methodName
@@ -388,7 +388,7 @@ public class VaadinPortlet extends GenericPortlet
     /**
      * This portlet parameter is used to add styles to the main element. E.g
      * "height:500px" generates a style="height:500px" to the main element.
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -398,7 +398,7 @@ public class VaadinPortlet extends GenericPortlet
     /**
      * This portal parameter is used to define the name of the Vaadin theme that
      * is used for all Vaadin applications in the portal.
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -476,7 +476,7 @@ public class VaadinPortlet extends GenericPortlet
 
     /**
      * @author Vaadin Ltd
-     * 
+     *
      * @deprecated As of 7.0. This is no longer used and only provided for
      *             backwards compatibility. Each {@link RequestHandler} can
      *             individually decide whether it wants to handle a request or
@@ -490,7 +490,7 @@ public class VaadinPortlet extends GenericPortlet
     /**
      * @param vaadinRequest
      * @return
-     * 
+     *
      * @deprecated As of 7.0. This is no longer used and only provided for
      *             backwards compatibility. Each {@link RequestHandler} can
      *             individually decide whether it wants to handle a request or
@@ -535,7 +535,7 @@ public class VaadinPortlet extends GenericPortlet
      * @param response
      * @throws PortletException
      * @throws IOException
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -554,7 +554,7 @@ public class VaadinPortlet extends GenericPortlet
 
     /**
      * Wraps the request in a (possibly portal specific) Vaadin portlet request.
-     * 
+     *
      * @param request
      *            The original PortletRequest
      * @return A wrapped version of the PortletRequest
@@ -651,10 +651,10 @@ public class VaadinPortlet extends GenericPortlet
      * <p>
      * The current portlet is derived from the current service using
      * {@link VaadinService#getCurrent()}
-     * 
+     *
      * @return the current vaadin portlet instance if available, otherwise
      *         <code>null</code>
-     * 
+     *
      * @since 7.0
      */
     public static VaadinPortlet getCurrent() {
diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java
index 9b11444158..658d653dad 100644
--- a/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.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
@@ -33,10 +33,10 @@ import com.vaadin.shared.ApplicationConstants;
 
 /**
  * Wrapper for {@link PortletRequest} and its subclasses.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
- * 
+ *
  * @see VaadinRequest
  * @see VaadinPortletResponse
  */
@@ -47,7 +47,7 @@ public class VaadinPortletRequest extends PortletRequestWrapper
 
     /**
      * Wraps a portlet request and an associated vaadin service
-     * 
+     *
      * @param request
      *            the portlet request to wrap
      * @param vaadinService
@@ -123,7 +123,7 @@ public class VaadinPortletRequest extends PortletRequestWrapper
 
     /**
      * Gets the original, unwrapped portlet request.
-     * 
+     *
      * @return the unwrapped portlet request
      */
     public PortletRequest getPortletRequest() {
@@ -182,7 +182,7 @@ public class VaadinPortletRequest extends PortletRequestWrapper
 
     /**
      * Reads a portal property from the portal context of the Vaadin request.
-     * 
+     *
      * @param name
      *            a string with the name of the portal property to get
      * @return a string with the value of the property, or <code>null</code> if
@@ -194,11 +194,11 @@ public class VaadinPortletRequest extends PortletRequestWrapper
 
     /**
      * Reads a portlet preference from the portlet of the request.
-     * 
+     *
      * @param name
      *            The name of the portlet preference. Cannot be
      *            <code>null</code>.
-     * 
+     *
      * @return The value of the portlet preference, <code>null</code> if the
      *         preference is not defined.
      */
@@ -244,7 +244,7 @@ public class VaadinPortletRequest extends PortletRequestWrapper
      * is automatically defined when the request is started. The current portlet
      * request can not be used in e.g. background threads because of the way
      * server implementations reuse request instances.
-     * 
+     *
      * @return the current portlet request instance if available, otherwise
      *         <code>null</code>
      * @since 7.3
@@ -259,7 +259,7 @@ public class VaadinPortletRequest extends PortletRequestWrapper
      * is automatically defined when the request is started. The current request
      * can not be used in e.g. background threads because of the way server
      * implementations reuse request instances.
-     * 
+     *
      * @return the current Vaadin portlet request instance if available,
      *         otherwise <code>null</code>
      * @since 7.3
diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java
index a8d2cf3368..0ea8150122 100644
--- a/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.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
@@ -32,10 +32,10 @@ import javax.servlet.http.Cookie;
 
 /**
  * Wrapper for {@link PortletResponse} and its subclasses.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
- * 
+ *
  * @see VaadinResponse
  * @see VaadinPortletRequest
  */
@@ -51,7 +51,7 @@ public class VaadinPortletResponse implements VaadinResponse {
 
     /**
      * Wraps a portlet response and an associated vaadin service
-     * 
+     *
      * @param response
      *            the portlet response to wrap
      * @param vaadinService
@@ -76,7 +76,7 @@ public class VaadinPortletResponse implements VaadinResponse {
 
     /**
      * Gets the original, unwrapped portlet response.
-     * 
+     *
      * @return the unwrapped portlet response
      */
     public PortletResponse getPortletResponse() {
diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletService.java b/server/src/main/java/com/vaadin/server/VaadinPortletService.java
index 7d0d2227ea..0e53337edb 100644
--- a/server/src/main/java/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletService.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
@@ -65,7 +65,7 @@ public class VaadinPortletService extends VaadinService {
 
     /**
      * Retrieves a reference to the portlet associated with this service.
-     * 
+     *
      * @return A reference to the VaadinPortlet this service is using
      */
     public VaadinPortlet getPortlet() {
@@ -222,11 +222,11 @@ public class VaadinPortletService extends VaadinService {
 
     /**
      * Gets the request type for the request.
-     * 
+     *
      * @param request
      *            the request to get a request type for
      * @return the request type
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -246,10 +246,10 @@ public class VaadinPortletService extends VaadinService {
      * is automatically defined when the request is started. The current portlet
      * request can not be used in e.g. background threads because of the way
      * server implementations reuse request instances.
-     * 
+     *
      * @return the current portlet request instance if available, otherwise
      *         <code>null</code>
-     * 
+     *
      */
     public static PortletRequest getCurrentPortletRequest() {
         VaadinPortletRequest currentRequest = getCurrentRequest();
@@ -265,10 +265,10 @@ public class VaadinPortletService extends VaadinService {
      * is automatically defined when the request is started. The current request
      * can not be used in e.g. background threads because of the way server
      * implementations reuse request instances.
-     * 
+     *
      * @return the current Vaadin portlet request instance if available,
      *         otherwise <code>null</code>
-     * 
+     *
      */
     public static VaadinPortletRequest getCurrentRequest() {
         return (VaadinPortletRequest) VaadinService.getCurrentRequest();
@@ -279,10 +279,10 @@ public class VaadinPortletService extends VaadinService {
      * response is automatically defined when the request is started. The
      * current response can not be used in e.g. background threads because of
      * the way server implementations reuse response instances.
-     * 
+     *
      * @return the current Vaadin portlet response instance if available,
      *         otherwise <code>null</code>
-     * 
+     *
      */
     public static VaadinPortletResponse getCurrentResponse() {
         return (VaadinPortletResponse) VaadinService.getCurrentResponse();
@@ -333,7 +333,7 @@ public class VaadinPortletService extends VaadinService {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.server.VaadinService#handleSessionExpired(com.vaadin.server
      * .VaadinRequest, com.vaadin.server.VaadinResponse)
diff --git a/server/src/main/java/com/vaadin/server/VaadinPortletSession.java b/server/src/main/java/com/vaadin/server/VaadinPortletSession.java
index 5634924634..f7f9bd56a3 100644
--- a/server/src/main/java/com/vaadin/server/VaadinPortletSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletSession.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
@@ -47,18 +47,18 @@ import com.vaadin.util.CurrentInstance;
 
 /**
  * An implementation of {@link VaadinSession} for JSR-286 portlet environments.
- * 
+ *
  * This is automatically registered as a {@link HttpSessionBindingListener} when
  * {@link PortletSession#setAttribute()} is called with the context as value.
- * 
+ *
  * Only the documented parts of this class should be considered as stable public
  * API.
- * 
+ *
  * Note also that some methods and/or nested interfaces might move to
  * {@link VaadinPortletService} in future minor or major versions of Vaadin. In
  * these cases, a deprecated redirection for backwards compatibility will be
  * used in VaadinPortletSession for a transition period.
- * 
+ *
  * @since 7.0
  */
 @SuppressWarnings("serial")
@@ -74,7 +74,7 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Create a portlet service session for the given portlet service
-     * 
+     *
      * @param service
      *            the portlet service to which the new session belongs
      */
@@ -84,7 +84,7 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Returns the underlying portlet session.
-     * 
+     *
      * @return portlet session
      */
     public PortletSession getPortletSession() {
@@ -108,7 +108,7 @@ public class VaadinPortletSession extends VaadinSession {
     /**
      * Returns the JSR-286 portlet configuration that provides access to the
      * portlet context and init parameters.
-     * 
+     *
      * @return portlet configuration
      */
     public PortletConfig getPortletConfig() {
@@ -119,7 +119,7 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Adds a listener for various types of portlet requests.
-     * 
+     *
      * @param listener
      *            to add
      */
@@ -130,7 +130,7 @@ public class VaadinPortletSession extends VaadinSession {
     /**
      * Removes a portlet request listener registered with
      * {@link #addPortletListener(PortletListener)}.
-     * 
+     *
      * @param listener
      *            to remove
      */
@@ -207,11 +207,11 @@ public class VaadinPortletSession extends VaadinSession {
      * {@link PortletListenerNotifier} after the session is locked and the
      * corresponding UI has been found (if already created) but before other
      * request processing takes place.
-     * 
+     *
      * Direct rendering of output is not possible in a portlet listener and the
      * JSR-286 limitations on allowed operations in each phase or portlet
      * request processing must be respected by the listeners.
-     * 
+     *
      * Note that internal action requests used by the framework to trigger
      * events or set shared parameters do not call the action request listener
      * but will result in a later event or render request that will trigger the
@@ -234,11 +234,11 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Creates a new action URL.
-     * 
+     *
      * Creating an action URL is only supported when processing a suitable
      * request (render or resource request, including normal Vaadin UIDL
      * processing) and will return null if not processing a suitable request.
-     * 
+     *
      * @param action
      *            the action parameter (javax.portlet.action parameter value in
      *            JSR-286)
@@ -259,18 +259,18 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Sends a portlet event to the indicated destination.
-     * 
+     *
      * Internally, an action may be created and opened, as an event cannot be
      * sent directly from all types of requests.
-     * 
+     *
      * Sending portlet events from background threads is not supported.
-     * 
+     *
      * The event destinations and values need to be kept in the context until
      * sent. Any memory leaks if the action fails are limited to the session.
-     * 
+     *
      * Event names for events sent and received by a portlet need to be declared
      * in portlet.xml .
-     * 
+     *
      * @param uI
      *            a window in which a temporary action URL can be opened if
      *            necessary
@@ -309,19 +309,19 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Sets a shared portlet parameter.
-     * 
+     *
      * Internally, an action may be created and opened, as shared parameters
      * cannot be set directly from all types of requests.
-     * 
+     *
      * Setting shared render parameters from background threads is not
      * supported.
-     * 
+     *
      * The parameters and values need to be kept in the context until sent. Any
      * memory leaks if the action fails are limited to the session.
-     * 
+     *
      * Shared parameters set or read by a portlet need to be declared in
      * portlet.xml .
-     * 
+     *
      * @param uI
      *            a window in which a temporary action URL can be opened if
      *            necessary
@@ -359,13 +359,13 @@ public class VaadinPortletSession extends VaadinSession {
 
     /**
      * Sets the portlet mode. This may trigger a new render request.
-     * 
+     *
      * Currently, this is only supported when working with a
      * {@link StateAwareResponse} (an action request or an event request).
      * Portlet mode change in background threads is not supported.
-     * 
+     *
      * Portlet modes used by a portlet need to be declared in portlet.xml .
-     * 
+     *
      * @param uI
      *            a window in which the render URL can be opened if necessary
      * @param portletMode
diff --git a/server/src/main/java/com/vaadin/server/VaadinRequest.java b/server/src/main/java/com/vaadin/server/VaadinRequest.java
index 5b7e16ac46..87d4a07b45 100644
--- a/server/src/main/java/com/vaadin/server/VaadinRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinRequest.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
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * A generic request to the server, wrapping a more specific request type, e.g.
  * HttpServletReqest or PortletRequest.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -44,10 +44,10 @@ public interface VaadinRequest extends Serializable {
      * Gets the named request parameter This is typically a HTTP GET or POST
      * parameter, though other request types might have other ways of
      * representing parameters.
-     * 
+     *
      * @see javax.servlet.ServletRequest#getParameter(String)
      * @see javax.portlet.PortletRequest#getParameter(String)
-     * 
+     *
      * @param parameter
      *            the name of the parameter
      * @return The paramter value, or <code>null</code> if no parameter with the
@@ -59,12 +59,12 @@ public interface VaadinRequest extends Serializable {
      * Gets all the parameters of the request. Framework's internal init
      * parameters have prefix "v-" (does not include such parameters as "theme"
      * and "debug").
-     * 
+     *
      * @see #getParameter(String)
-     * 
+     *
      * @see javax.servlet.ServletRequest#getParameterMap()
      * @see javax.portlet.PortletRequest#getParameter(String)
-     * 
+     *
      * @return A mapping of parameter names to arrays of parameter values
      */
     public Map<String, String[]> getParameterMap();
@@ -72,10 +72,10 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the length of the request content that can be read from the input
      * stream returned by {@link #getInputStream()}.
-     * 
+     *
      * @see javax.servlet.ServletRequest#getContentLength()
      * @see javax.portlet.ClientDataRequest#getContentLength()
-     * 
+     *
      * @return content length in bytes
      */
     public int getContentLength();
@@ -84,10 +84,10 @@ public interface VaadinRequest extends Serializable {
      * Returns an input stream from which the request content can be read. The
      * request content length can be obtained with {@link #getContentLength()}
      * without reading the full stream contents.
-     * 
+     *
      * @see javax.servlet.ServletRequest#getInputStream()
      * @see javax.portlet.ClientDataRequest#getPortletInputStream()
-     * 
+     *
      * @return the input stream from which the contents of the request can be
      *         read
      * @throws IOException
@@ -97,12 +97,12 @@ public interface VaadinRequest extends Serializable {
 
     /**
      * Gets a request attribute.
-     * 
+     *
      * @param name
      *            the name of the attribute
      * @return the value of the attribute, or <code>null</code> if there is no
      *         attribute with the given name
-     * 
+     *
      * @see javax.servlet.ServletRequest#getAttribute(String)
      * @see javax.portlet.PortletRequest#getAttribute(String)
      */
@@ -110,12 +110,12 @@ public interface VaadinRequest extends Serializable {
 
     /**
      * Defines a request attribute.
-     * 
+     *
      * @param name
      *            the name of the attribute
      * @param value
      *            the attribute value
-     * 
+     *
      * @see javax.servlet.ServletRequest#setAttribute(String, Object)
      * @see javax.portlet.PortletRequest#setAttribute(String, Object)
      */
@@ -125,9 +125,9 @@ public interface VaadinRequest extends Serializable {
      * Gets the path of the requested resource relative to the application. The
      * path is <code>null</code> if no path information is available. Does
      * always start with / if the path isn't <code>null</code>.
-     * 
+     *
      * @return a string with the path relative to the application.
-     * 
+     *
      * @see javax.servlet.http.HttpServletRequest#getPathInfo()
      */
     public String getPathInfo();
@@ -135,10 +135,10 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the portion of the request URI that indicates the context of the
      * request. The context path always comes first in a request URI.
-     * 
+     *
      * @see HttpServletRequest#getContextPath()
      * @see PortletRequest#getContextPath()
-     * 
+     *
      * @return a String specifying the portion of the request URI that indicates
      *         the context of the request
      */
@@ -147,11 +147,11 @@ public interface VaadinRequest extends Serializable {
     /**
      * Gets the session associated with this request, creating a new if there is
      * no session.
-     * 
+     *
      * @see WrappedSession
      * @see HttpServletRequest#getSession()
      * @see PortletRequest#getPortletSession()
-     * 
+     *
      * @return the wrapped session for this request
      */
     public WrappedSession getWrappedSession();
@@ -159,16 +159,16 @@ public interface VaadinRequest extends Serializable {
     /**
      * Gets the session associated with this request, optionally creating a new
      * if there is no session.
-     * 
+     *
      * @param allowSessionCreation
      *            <code>true</code> to create a new session for this request if
      *            necessary; <code>false</code> to return <code>null</code> if
      *            there's no current session
-     * 
+     *
      * @see WrappedSession
      * @see HttpServletRequest#getSession(boolean)
      * @see PortletRequest#getPortletSession(boolean)
-     * 
+     *
      * @return the wrapped session for this request
      */
     public WrappedSession getWrappedSession(boolean allowSessionCreation);
@@ -176,22 +176,22 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the MIME type of the body of the request, or null if the type is
      * not known.
-     * 
+     *
      * @return a string containing the name of the MIME type of the request, or
      *         null if the type is not known
-     * 
+     *
      * @see javax.servlet.ServletRequest#getContentType()
      * @see javax.portlet.ResourceRequest#getContentType()
-     * 
+     *
      */
     public String getContentType();
 
     /**
      * Gets locale information from the query, e.g. using the Accept-Language
      * header.
-     * 
+     *
      * @return the preferred Locale
-     * 
+     *
      * @see ServletRequest#getLocale()
      * @see PortletRequest#getLocale()
      */
@@ -200,10 +200,10 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the IP address from which the request came. This might also be
      * the address of a proxy between the server and the original requester.
-     * 
+     *
      * @return a string containing the IP address, or <code>null</code> if the
      *         address is not available
-     * 
+     *
      * @see ServletRequest#getRemoteAddr()
      */
     public String getRemoteAddr();
@@ -211,9 +211,9 @@ public interface VaadinRequest extends Serializable {
     /**
      * Checks whether the request was made using a secure channel, e.g. using
      * https.
-     * 
+     *
      * @return a boolean indicating if the request is secure
-     * 
+     *
      * @see ServletRequest#isSecure()
      * @see PortletRequest#isSecure()
      */
@@ -222,21 +222,21 @@ public interface VaadinRequest extends Serializable {
     /**
      * Gets the value of a request header, e.g. a http header for a
      * {@link HttpServletRequest}.
-     * 
+     *
      * @param headerName
      *            the name of the header
      * @return the header value, or <code>null</code> if the header is not
      *         present in the request
-     * 
+     *
      * @see HttpServletRequest#getHeader(String)
      */
     public String getHeader(String headerName);
 
     /**
      * Gets the vaadin service for the context of this request.
-     * 
+     *
      * @return the vaadin service
-     * 
+     *
      * @see VaadinService
      */
     public VaadinService getService();
@@ -245,10 +245,10 @@ public interface VaadinRequest extends Serializable {
      * Returns an array containing all of the <code>Cookie</code> objects the
      * client sent with this request. This method returns <code>null</code> if
      * no cookies were sent.
-     * 
+     *
      * @return an array of all the <code>Cookies</code> included with this
      *         request, or <code>null</code> if the request has no cookies
-     * 
+     *
      * @see HttpServletRequest#getCookies()
      * @see PortletRequest#getCookies()
      */
@@ -259,10 +259,10 @@ public interface VaadinRequest extends Serializable {
      * between client and server, for example, <code>BASIC_AUTH</code>,
      * <code>CLIENT_CERT_AUTH</code>, a custom one or <code>null</code> if there
      * was no authentication.
-     * 
+     *
      * @return a string indicating the authentication scheme, or
      *         <code>null</code> if the request was not authenticated.
-     * 
+     *
      * @see HttpServletRequest#getAuthType()
      * @see PortletRequest#getAuthType()
      */
@@ -273,10 +273,10 @@ public interface VaadinRequest extends Serializable {
      * authenticated, or null if the user has not been authenticated. Whether
      * the user name is sent with each subsequent request depends on the browser
      * and type of authentication.
-     * 
+     *
      * @return a String specifying the login of the user making this request, or
      *         <code>null</code> if the user login is not known.
-     * 
+     *
      * @see HttpServletRequest#getRemoteUser()
      * @see PortletRequest#getRemoteUser()
      */
@@ -286,11 +286,11 @@ public interface VaadinRequest extends Serializable {
      * Returns a <code>java.security.Principal</code> object containing the name
      * of the current authenticated user. If the user has not been
      * authenticated, the method returns <code>null</code>.
-     * 
+     *
      * @return a <code>java.security.Principal</code> containing the name of the
      *         user making this request; <code>null</code> if the user has not
      *         been authenticated
-     * 
+     *
      * @see HttpServletRequest#getUserPrincipal()
      * @see PortletRequest#getUserPrincipal()
      */
@@ -301,13 +301,13 @@ public interface VaadinRequest extends Serializable {
      * in the specified logical "role". Roles and role membership can be defined
      * using deployment descriptors. If the user has not been authenticated, the
      * method returns <code>false</code>.
-     * 
+     *
      * @param role
      *            a String specifying the name of the role
      * @return a boolean indicating whether the user making this request belongs
      *         to a given role; <code>false</code> if the user has not been
      *         authenticated
-     * 
+     *
      * @see HttpServletRequest#isUserInRole(String)
      * @see PortletRequest#isUserInRole(String)
      */
@@ -317,10 +317,10 @@ public interface VaadinRequest extends Serializable {
      * Removes an attribute from this request. This method is not generally
      * needed as attributes only persist as long as the request is being
      * handled.
-     * 
+     *
      * @param name
      *            a String specifying the name of the attribute to remove
-     * 
+     *
      * @see ServletRequest#removeAttribute(String)
      * @see PortletRequest#removeAttribute(String)
      */
@@ -330,10 +330,10 @@ public interface VaadinRequest extends Serializable {
      * Returns an Enumeration containing the names of the attributes available
      * to this request. This method returns an empty Enumeration if the request
      * has no attributes available to it.
-     * 
+     *
      * @return an Enumeration of strings containing the names of the request's
      *         attributes
-     * 
+     *
      * @see ServletRequest#getAttributeNames()
      * @see PortletRequest#getAttributeNames()
      */
@@ -345,9 +345,9 @@ public interface VaadinRequest extends Serializable {
      * the client based on the Accept-Language header. If the client request
      * doesn't provide an Accept-Language header, this method returns an
      * Enumeration containing one Locale, the default locale for the server.
-     * 
+     *
      * @return an Enumeration of preferred Locale objects for the client
-     * 
+     *
      * @see HttpServletRequest#getLocales()
      * @see PortletRequest#getLocales()
      */
@@ -358,10 +358,10 @@ public interface VaadinRequest extends Serializable {
      * sent the request. If the engine cannot or chooses not to resolve the
      * hostname (to improve performance), this method returns the dotted-string
      * form of the IP address.
-     * 
+     *
      * @return a String containing the fully qualified name of the client, or
      *         <code>null</code> if the information is not available.
-     * 
+     *
      * @see HttpServletRequest#getRemoteHost()
      */
     public String getRemoteHost();
@@ -369,10 +369,10 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the Internet Protocol (IP) source port of the client or last
      * proxy that sent the request.
-     * 
+     *
      * @return an integer specifying the port number, or -1 if the information
      *         is not available.
-     * 
+     *
      * @see ServletRequest#getRemotePort()
      */
     public int getRemotePort();
@@ -381,10 +381,10 @@ public interface VaadinRequest extends Serializable {
      * Returns the name of the character encoding used in the body of this
      * request. This method returns <code>null</code> if the request does not
      * specify a character encoding.
-     * 
+     *
      * @return a String containing the name of the character encoding, or null
      *         if the request does not specify a character encoding
-     * 
+     *
      * @see ServletRequest#getCharacterEncoding()
      * @see ClientDataRequest#getCharacterEncoding()
      */
@@ -395,9 +395,9 @@ public interface VaadinRequest extends Serializable {
      * <code>BufferedReader</code>. The reader translates the character data
      * according to the character encoding used on the body. Either this method
      * or {@link #getInputStream()} may be called to read the body, not both.
-     * 
+     *
      * @return a BufferedReader containing the body of the request
-     * 
+     *
      * @throws UnsupportedEncodingException
      *             - if the character set encoding used is not supported and the
      *             text cannot be decoded
@@ -406,7 +406,7 @@ public interface VaadinRequest extends Serializable {
      *             request
      * @throws IOException
      *             if an input or output exception occurred
-     * 
+     *
      * @see ServletRequest#getReader()
      * @see ClientDataRequest#getReader()
      */
@@ -415,10 +415,10 @@ public interface VaadinRequest extends Serializable {
     /**
      * Returns the name of the HTTP method with which this request was made, for
      * example, GET, POST, or PUT.
-     * 
+     *
      * @return a String specifying the name of the method with which this
      *         request was made
-     * 
+     *
      * @see HttpServletRequest#getMethod()
      * @see ClientDataRequest#getMethod()
      */
@@ -435,7 +435,7 @@ public interface VaadinRequest extends Serializable {
      * If the request did not have a header of the specified name, this method
      * returns -1. If the header can't be converted to a date, the method throws
      * an IllegalArgumentException.
-     * 
+     *
      * @param name
      *            a String specifying the name of the header
      * @return a long value representing the date specified in the header
@@ -453,7 +453,7 @@ public interface VaadinRequest extends Serializable {
      * <p>
      * Some implementations do not allow access headers using this method, in
      * which case this method returns <code>null</code>
-     * 
+     *
      * @return an enumeration of all the header names sent with this request; if
      *         the request has no headers, an empty enumeration; if the
      *         implementation does not allow this method, <code>null</code>
@@ -475,8 +475,8 @@ public interface VaadinRequest extends Serializable {
      * <p>
      * The header name is case insensitive. You can use this method with any
      * request header.
-     * 
-     * 
+     *
+     *
      * @param name
      *            a String specifying the header name
      * @return an Enumeration containing the values of the requested header. If
diff --git a/server/src/main/java/com/vaadin/server/VaadinResponse.java b/server/src/main/java/com/vaadin/server/VaadinResponse.java
index c31c6c05d8..de33279814 100644
--- a/server/src/main/java/com/vaadin/server/VaadinResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinResponse.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,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * A generic response from the server, wrapping a more specific response type,
  * e.g. HttpServletResponse or PortletResponse.
- * 
+ *
  * @since 7.0
  */
 public interface VaadinResponse extends Serializable {
@@ -40,11 +40,11 @@ public interface VaadinResponse extends Serializable {
      * Sets the (http) status code for the response. If you want to include an
      * error message along the status code, use {@link #sendError(int, String)}
      * instead.
-     * 
+     *
      * @param statusCode
      *            the status code to set
      * @see HttpServletResponse#setStatus(int)
-     * 
+     *
      * @see ResourceResponse#HTTP_STATUS_CODE
      */
     public void setStatus(int statusCode);
@@ -53,10 +53,10 @@ public interface VaadinResponse extends Serializable {
      * Sets the content type of this response. If the content type including a
      * charset is set before {@link #getWriter()} is invoked, the returned
      * PrintWriter will automatically use the defined charset.
-     * 
+     *
      * @param contentType
      *            a string specifying the MIME type of the content
-     * 
+     *
      * @see ServletResponse#setContentType(String)
      * @see MimeResponse#setContentType(String)
      */
@@ -65,12 +65,12 @@ public interface VaadinResponse extends Serializable {
     /**
      * Sets the value of a generic response header. If the header had already
      * been set, the new value overwrites the previous one.
-     * 
+     *
      * @param name
      *            the name of the header
      * @param value
      *            the header value.
-     * 
+     *
      * @see HttpServletResponse#setHeader(String, String)
      * @see PortletResponse#setProperty(String, String)
      */
@@ -79,12 +79,12 @@ public interface VaadinResponse extends Serializable {
     /**
      * Properly formats a timestamp as a date header. If the header had already
      * been set, the new value overwrites the previous one.
-     * 
+     *
      * @param name
      *            the name of the header
      * @param timestamp
      *            the number of milliseconds since epoch
-     * 
+     *
      * @see HttpServletResponse#setDateHeader(String, long)
      */
     public void setDateHeader(String name, long timestamp);
@@ -95,11 +95,11 @@ public interface VaadinResponse extends Serializable {
      * <p>
      * Either this method or getWriter() may be called to write the response,
      * not both.
-     * 
+     *
      * @return a <code>OutputStream</code> for writing binary data
      * @throws IOException
      *             if an input or output exception occurred
-     * 
+     *
      * @see #getWriter()
      * @see ServletResponse#getOutputStream()
      * @see MimeResponse#getPortletOutputStream()
@@ -113,11 +113,11 @@ public interface VaadinResponse extends Serializable {
      * <p>
      * Either this method or getOutputStream() may be called to write the
      * response, not both.
-     * 
+     *
      * @return a <code>PrintWriter</code> for writing character text
      * @throws IOException
      *             if an input or output exception occurred
-     * 
+     *
      * @see #getOutputStream()
      * @see ServletResponse#getWriter()
      * @see MimeResponse#getWriter()
@@ -127,7 +127,7 @@ public interface VaadinResponse extends Serializable {
     /**
      * Sets cache time in milliseconds, -1 means no cache at all. All required
      * headers related to caching in the response are set based on the time.
-     * 
+     *
      * @param milliseconds
      *            Cache time in milliseconds
      */
@@ -137,23 +137,23 @@ public interface VaadinResponse extends Serializable {
      * Sends an error response to the client using the specified status code and
      * clears the buffer. In some configurations, this can cause a predefined
      * error page to be displayed.
-     * 
+     *
      * @param errorCode
      *            the HTTP status code
      * @param message
      *            a message to accompany the error
      * @throws IOException
      *             if an input or output exception occurs
-     * 
+     *
      * @see HttpServletResponse#sendError(int, String)
      */
     public void sendError(int errorCode, String message) throws IOException;
 
     /**
      * Gets the vaadin service for the context of this response.
-     * 
+     *
      * @return the vaadin service
-     * 
+     *
      * @see VaadinService
      */
     public VaadinService getService();
@@ -161,10 +161,10 @@ public interface VaadinResponse extends Serializable {
     /**
      * Adds the specified cookie to the response. This method can be called
      * multiple times to set more than one cookie.
-     * 
+     *
      * @param cookie
      *            the Cookie to return to the client
-     * 
+     *
      * @see HttpServletResponse#addCookie(Cookie)
      * @see PortletResponse#addProperty(Cookie)
      */
diff --git a/server/src/main/java/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java
index f638047aff..e453332f02 100644
--- a/server/src/main/java/com/vaadin/server/VaadinService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinService.java
@@ -1095,7 +1095,7 @@ public abstract class VaadinService implements Serializable {
      *
      * Finds the given theme resource from the web content folder or using the
      * class loader and returns a stream for it
-     * 
+     *
      * @param ui
      *            The ui for which to find the resource
      * @param themeName
@@ -1668,7 +1668,7 @@ public abstract class VaadinService implements Serializable {
 
     /**
      * Checks whether Atmosphere is avilable for use
-     * 
+     *
      * @since 7.6
      * @return true if Atmosphere is available, false otherwise
      */
@@ -1793,7 +1793,7 @@ public abstract class VaadinService implements Serializable {
          * If no thread is currently holding the lock, pending changes for UIs
          * with automatic push would not be processed and pushed until the next
          * time there is a request or someone does an explicit push call.
-         * 
+         *
          * To remedy this, we try to get the lock at this point. If the lock is
          * currently held by another thread, we just back out as the queue will
          * get purged once it is released. If the lock is held by the current
@@ -1909,10 +1909,10 @@ public abstract class VaadinService implements Serializable {
      * this {@link VaadinService} if found. If current security policy disallows
      * acquiring class loader instance it will log a message and re-throw
      * {@link SecurityException}
-     * 
+     *
      * @throws SecurityException
      *             If current security policy forbids acquiring class loader
-     * 
+     *
      * @since 7.3.5
      */
     protected void setDefaultClassLoader() {
@@ -1930,7 +1930,7 @@ public abstract class VaadinService implements Serializable {
      * Called when the VaadinSession should be stored.
      * <p>
      * By default stores the VaadinSession in the underlying HTTP session.
-     * 
+     *
      * @since 7.6
      * @param session
      *            the VaadinSession to store
@@ -1949,7 +1949,7 @@ public abstract class VaadinService implements Serializable {
      * session after sanity checks have been performed.
      * <p>
      * Called by {@link #storeSession(VaadinSession, WrappedSession)}
-     * 
+     *
      * @since 7.6
      * @param wrappedSession
      *            the underlying HTTP session
@@ -1964,7 +1964,7 @@ public abstract class VaadinService implements Serializable {
     /**
      * Called when the VaadinSession should be loaded from the underlying HTTP
      * session
-     * 
+     *
      * @since 7.6
      * @param wrappedSession
      *            the underlying HTTP session
@@ -1986,7 +1986,7 @@ public abstract class VaadinService implements Serializable {
      * session after sanity checks have been performed.
      * <p>
      * Called by {@link #loadSession(WrappedSession)}.
-     * 
+     *
      * @param wrappedSession
      *            the underlying HTTP session
      * @since 7.6
@@ -2000,7 +2000,7 @@ public abstract class VaadinService implements Serializable {
     /**
      * Called when the VaadinSession should be removed from the underlying HTTP
      * session
-     * 
+     *
      * @since 7.6
      * @param wrappedSession
      *            the underlying HTTP session
@@ -2013,7 +2013,7 @@ public abstract class VaadinService implements Serializable {
     /**
      * Performs the actual removal of the VaadinSession from the underlying HTTP
      * session after sanity checks have been performed
-     * 
+     *
      * @since 7.6
      * @param wrappedSession
      *            the underlying HTTP session
@@ -2026,7 +2026,7 @@ public abstract class VaadinService implements Serializable {
     /**
      * Returns the name used for storing the VaadinSession in the underlying
      * HTTP session
-     * 
+     *
      * @since 7.6
      * @return the attribute name used for storing the VaadinSession
      */
diff --git a/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java
index 16f4cb7fd7..5b9d0a9237 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.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
@@ -20,7 +20,7 @@ import java.security.PrivilegedAction;
 
 /**
  * Utility class used by {@link VaadinService#setDefaultClassLoader()}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -41,7 +41,7 @@ class VaadinServiceClassLoaderUtil {
      * appropriate message. The code for this method is modeled after
      * recommendations laid out by JEE 5 specification sections EE.6.2.4.7 and
      * EE.8.2.5
-     * 
+     *
      * @return Instance of {@link ClassLoader} that should be used by this
      *         instance of {@link VaadinService}
      * @throws SecurityException
diff --git a/server/src/main/java/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index 73403f155c..b48063f972 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.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
@@ -186,7 +186,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Called by the servlet container to indicate to a servlet that the servlet
      * is being placed into service.
-     * 
+     *
      * @param servletConfig
      *            the object containing the servlet's configuration and
      *            initialization parameters
@@ -294,10 +294,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * <p>
      * The current servlet is derived from the current service using
      * {@link VaadinService#getCurrent()}
-     * 
+     *
      * @return the current Vaadin servlet instance if available, otherwise
      *         <code>null</code>
-     * 
+     *
      * @since 7.0
      */
     public static VaadinServlet getCurrent() {
@@ -327,7 +327,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Receives standard HTTP requests from the public service method and
      * dispatches them.
-     * 
+     *
      * @param request
      *            the object that contains the request the client made of the
      *            servlet.
@@ -378,7 +378,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * Invoked for every request to this servlet to potentially send a redirect
      * to avoid problems with requests to the context root with no trailing
      * slash.
-     * 
+     *
      * @param request
      *            the processed request
      * @param response
@@ -430,7 +430,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * related to /bar.
      * <p>
      * For http://myhost.com/foo;a=1/bar;b=1 this method will return ;b=1
-     * 
+     *
      * @since 7.2
      * @param uri
      *            a URI
@@ -462,7 +462,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Create a Vaadin request for a http servlet request. This method can be
      * overridden if the Vaadin request should have special properties.
-     * 
+     *
      * @param request
      *            the original http servlet request
      * @return a Vaadin request for the original request
@@ -474,7 +474,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Gets a the vaadin service for this servlet.
-     * 
+     *
      * @return the vaadin service
      */
     protected VaadinServletService getService() {
@@ -484,7 +484,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Check that cookie support is enabled in the browser. Only checks UIDL
      * requests.
-     * 
+     *
      * @param requestType
      *            Type of the request as returned by
      *            {@link #getRequestType(HttpServletRequest)}
@@ -522,7 +522,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * Send a notification to client-side widgetset. Used to notify client of
      * critical errors, session expiration and more. Server has no knowledge of
      * what UI client refers to.
-     * 
+     *
      * @param request
      *            the HTTP request instance.
      * @param response
@@ -541,7 +541,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *            the current page.
      * @throws IOException
      *             if the writing failed due to input/output error.
-     * 
+     *
      * @deprecated As of 7.0. This method is retained only for backwards
      *             compatibility and for {@link GAEVaadinServlet}.
      */
@@ -585,7 +585,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Writes the response in {@code output} using the contentType given in
      * {@code contentType} to the provided {@link HttpServletResponse}
-     * 
+     *
      * @param response
      * @param contentType
      * @param output
@@ -608,12 +608,12 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * Gets resource path using different implementations. Required to
      * supporting different servlet container implementations (application
      * servers).
-     * 
+     *
      * @param servletContext
      * @param path
      *            the resource path.
      * @return the resource path.
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -641,10 +641,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * A helper method to strip away characters that might somehow be used for
      * XSS attacks. Leaves at least alphanumeric characters intact. Also removes
      * e.g. '(' and ')', so values should be safe in javascript too.
-     * 
+     *
      * @param themeName
      * @return
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -689,7 +689,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Returns the default theme. Must never return null.
-     * 
+     *
      * @return
      */
     public static String getDefaultTheme() {
@@ -699,7 +699,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Check if this is a request for a static resource and, if it is, serve the
      * resource to the client.
-     * 
+     *
      * @param request
      * @param response
      * @return true if a file was served and the request has been handled, false
@@ -737,7 +737,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Serve resources from VAADIN directory.
-     * 
+     *
      * @param filename
      *            The filename to serve. Should always start with /VAADIN/.
      * @param request
@@ -839,18 +839,18 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * default filenames containing ".nocache." return 0, filenames containing
      * ".cache." return one year, all other return the value defined in the
      * web.xml using resourceCacheTime (defaults to 1 hour).
-     * 
+     *
      * @param filename
      * @return cache lifetime for the given filename in seconds
      */
     protected int getCacheTime(String filename) {
         /*
          * GWT conventions:
-         * 
+         *
          * - files containing .nocache. will not be cached.
-         * 
+         *
          * - files containing .cache. will be cached for one year.
-         * 
+         *
          * https://developers.google.com/web-toolkit/doc/latest/
          * DevGuideCompilingAndDebugging#perfect_caching
          */
@@ -874,7 +874,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Writes the contents of the given resourceUrl in the response. Can be
      * overridden to add/modify response headers and similar.
-     * 
+     *
      * @param request
      *            The request for the resource
      * @param response
@@ -943,13 +943,13 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * is served if it exists. It is assumed that the compression method used is
      * gzip. If this method returns false or a compressed version is not found,
      * the original URL is used.
-     * 
+     *
      * The base implementation of this method returns true if and only if the
      * request indicates that the client accepts gzip compressed responses and
      * the filename extension of the requested resource is .js, .css, or .html.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param request
      *            the request for the resource
      * @param url
@@ -977,7 +977,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Finds the given resource from the web content folder or using the class
      * loader.
-     * 
+     *
      * @since 7.7
      * @param filename
      *            The file to find, starting with a "/"
@@ -1128,19 +1128,19 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Check whether a URL obtained from a classloader refers to a valid static
      * resource in the directory VAADIN.
-     * 
+     *
      * Warning: Overriding of this method is not recommended, but is possible to
      * support non-default classloaders or servers that may produce URLs
      * different from the normal ones. The method prototype may change in the
      * future. Care should be taken not to expose class files or other resources
      * outside the VAADIN directory if the method is overridden.
-     * 
+     *
      * @param request
      * @param resourceUrl
      * @return
-     * 
+     *
      * @since 6.6.7
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -1190,7 +1190,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * Checks if the browser has an up to date cached version of requested
      * resource. Currently the check is performed using the "If-Modified-Since"
      * header. Could be expanded if needed.
-     * 
+     *
      * @param request
      *            The HttpServletRequest from the browser.
      * @param resourceLastModifiedTimestamp
@@ -1229,10 +1229,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
     }
 
     /**
-     * 
+     *
      * @author Vaadin Ltd
      * @since 7.0
-     * 
+     *
      * @deprecated As of 7.0. This is no longer used and only provided for
      *             backwards compatibility. Each {@link RequestHandler} can
      *             individually decide whether it wants to handle a request or
@@ -1246,7 +1246,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * @param request
      * @return
-     * 
+     *
      * @deprecated As of 7.0. This is no longer used and only provided for
      *             backwards compatibility. Each {@link RequestHandler} can
      *             individually decide whether it wants to handle a request or
@@ -1280,7 +1280,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Remove any heading or trailing "what" from the "string".
-     * 
+     *
      * @param string
      * @param what
      * @return
@@ -1299,7 +1299,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Write a redirect response to the main page of the application.
-     * 
+     *
      * @param request
      * @param response
      * @throws IOException
@@ -1314,13 +1314,13 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /**
      * Gets the current application URL from request.
-     * 
+     *
      * @param request
      *            the HTTP request.
      * @throws MalformedURLException
      *             if the application is denied access to the persistent data
      *             store represented by the given URL.
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
@@ -1358,7 +1358,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see javax.servlet.GenericServlet#destroy()
      */
     @Override
@@ -1433,10 +1433,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
     /**
      * Escapes characters to html entities. An exception is made for some "safe
      * characters" to keep the text somewhat readable.
-     * 
+     *
      * @param unsafe
      * @return a safe string to be added inside an html tag
-     * 
+     *
      * @deprecated As of 7.0. Will likely change or be removed in a future
      *             version
      */
diff --git a/server/src/main/java/com/vaadin/server/VaadinServletRequest.java b/server/src/main/java/com/vaadin/server/VaadinServletRequest.java
index b575614721..9aec546cba 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServletRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletRequest.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
@@ -22,10 +22,10 @@ import javax.servlet.http.HttpSession;
 
 /**
  * Wrapper for {@link HttpServletRequest}.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
- * 
+ *
  * @see VaadinRequest
  * @see VaadinServletResponse
  */
@@ -36,7 +36,7 @@ public class VaadinServletRequest extends HttpServletRequestWrapper
 
     /**
      * Wraps a http servlet request and associates with a vaadin service
-     * 
+     *
      * @param request
      *            the http servlet request to wrap
      * @param vaadinService
@@ -65,7 +65,7 @@ public class VaadinServletRequest extends HttpServletRequestWrapper
 
     /**
      * Gets the original, unwrapped HTTP servlet request.
-     * 
+     *
      * @return the servlet request
      */
     public HttpServletRequest getHttpServletRequest() {
diff --git a/server/src/main/java/com/vaadin/server/VaadinServletResponse.java b/server/src/main/java/com/vaadin/server/VaadinServletResponse.java
index 721532c2ab..74f522b777 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServletResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletResponse.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
@@ -21,10 +21,10 @@ import javax.servlet.http.HttpServletResponseWrapper;
 
 /**
  * Wrapper for {@link HttpServletResponse}.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 7.0
- * 
+ *
  * @see VaadinResponse
  * @see VaadinServletRequest
  */
@@ -35,7 +35,7 @@ public class VaadinServletResponse extends HttpServletResponseWrapper
 
     /**
      * Wraps a http servlet response and an associated vaadin service
-     * 
+     *
      * @param response
      *            the http servlet response to wrap
      * @param vaadinService
@@ -49,7 +49,7 @@ public class VaadinServletResponse extends HttpServletResponseWrapper
 
     /**
      * Gets the original unwrapped <code>HttpServletResponse</code>
-     * 
+     *
      * @return the unwrapped response
      */
     public HttpServletResponse getHttpServletResponse() {
diff --git a/server/src/main/java/com/vaadin/server/VaadinServletService.java b/server/src/main/java/com/vaadin/server/VaadinServletService.java
index f09b0b92d0..5091aac9a4 100644
--- a/server/src/main/java/com/vaadin/server/VaadinServletService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletService.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
@@ -66,7 +66,7 @@ public class VaadinServletService extends VaadinService {
 
     /**
      * Retrieves a reference to the servlet associated with this service.
-     * 
+     *
      * @return A reference to the VaadinServlet this service is using
      */
     public VaadinServlet getServlet() {
@@ -99,7 +99,7 @@ public class VaadinServletService extends VaadinService {
     /**
      * Gets a relative path that cancels the provided path. This essentially
      * adds one .. for each part of the path to cancel.
-     * 
+     *
      * @param pathToCancel
      *            the path that should be canceled
      * @return a relative path that cancels out the provided path segment
diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java
index b7ce79d0da..151e3f79ee 100644
--- a/server/src/main/java/com/vaadin/server/VaadinSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinSession.java
@@ -115,7 +115,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
              * deadlocks unless implemented very carefully. get(long, TimeUnit)
              * does not have the same detection since a sensible timeout should
              * avoid completely locking up the application.
-             * 
+             *
              * Even though no deadlock could occur after the runnable has been
              * run, the check is always done as the deterministic behavior makes
              * it easier to detect potential problems.
@@ -1469,7 +1469,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * date.
      * <p>
      * Called internally by the framework.
-     * 
+     *
      * @since 7.6
      * @param wrappedSession
      *            the session this VaadinSession is stored in
diff --git a/server/src/main/java/com/vaadin/server/VariableOwner.java b/server/src/main/java/com/vaadin/server/VariableOwner.java
index 87a820e8b7..5588a40b29 100644
--- a/server/src/main/java/com/vaadin/server/VariableOwner.java
+++ b/server/src/main/java/com/vaadin/server/VariableOwner.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.LegacyComponent;
  * application, and the components owning those variables may then process those
  * changes.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  * @deprecated As of 7.0. Only provided to ease porting of Vaadin 6 components.
@@ -42,7 +42,7 @@ public interface VariableOwner extends Serializable {
     /**
      * Called when one or more variables handled by the implementing class are
      * changed.
-     * 
+     *
      * @param source
      *            the Source of the variable change. This is the origin of the
      *            event. For example in Web Adapter this is the request.
@@ -56,7 +56,7 @@ public interface VariableOwner extends Serializable {
      * Tests if the variable owner is enabled or not. The terminal should not
      * send any variable changes to disabled variable owners.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the variable owner is enabled,
      *         <code>false</code> if not
      */
@@ -68,7 +68,7 @@ public interface VariableOwner extends Serializable {
      * immediate mode means that all variable changes are required to be sent
      * back from the terminal immediately when they occur.
      * </p>
-     * 
+     *
      * <p>
      * <strong>Note:</strong> <code>VariableOwner</code> does not include a set-
      * method for the immediateness property. This is because not all
@@ -76,7 +76,7 @@ public interface VariableOwner extends Serializable {
      * never in the immediate mode, thus they always return <code>false</code>
      * in {@link #isImmediate()}.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the component is in immediate mode,
      *         <code>false</code> if not.
      */
diff --git a/server/src/main/java/com/vaadin/server/ViewportGenerator.java b/server/src/main/java/com/vaadin/server/ViewportGenerator.java
index 33cc1341af..852b2b55dc 100644
--- a/server/src/main/java/com/vaadin/server/ViewportGenerator.java
+++ b/server/src/main/java/com/vaadin/server/ViewportGenerator.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
@@ -19,17 +19,17 @@ import java.io.Serializable;
 
 /**
  * Callback for generating a viewport tag content based on a request.
- * 
+ *
  * @see ViewportGenerator
- * 
+ *
  * @since 7.4
- * 
+ *
  * @author Vaadin Ltd
  */
 public interface ViewportGenerator extends Serializable {
     /**
      * Generates a viewport tag based on a request.
-     * 
+     *
      * @param request
      *            the request for which to generate a viewport tag
      * @return the viewport tag content
diff --git a/server/src/main/java/com/vaadin/server/WebBrowser.java b/server/src/main/java/com/vaadin/server/WebBrowser.java
index f07034ea83..cb2f7686d9 100644
--- a/server/src/main/java/com/vaadin/server/WebBrowser.java
+++ b/server/src/main/java/com/vaadin/server/WebBrowser.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
@@ -27,7 +27,7 @@ import com.vaadin.shared.VBrowserDetails;
  * Class that provides information about the web browser the user is using.
  * Provides information such as browser name and version, screen resolution and
  * IP address.
- * 
+ *
  * @author Vaadin Ltd.
  */
 public class WebBrowser implements Serializable {
@@ -50,7 +50,7 @@ public class WebBrowser implements Serializable {
     /**
      * Gets the height of the screen in pixels. This is the full screen
      * resolution and not the height available for the application.
-     * 
+     *
      * @return the height of the screen in pixels.
      */
     public int getScreenHeight() {
@@ -60,7 +60,7 @@ public class WebBrowser implements Serializable {
     /**
      * Gets the width of the screen in pixels. This is the full screen
      * resolution and not the width available for the application.
-     * 
+     *
      * @return the width of the screen in pixels.
      */
     public int getScreenWidth() {
@@ -69,7 +69,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Get the browser user-agent string.
-     * 
+     *
      * @return The raw browser userAgent string
      */
     public String getBrowserApplication() {
@@ -79,7 +79,7 @@ public class WebBrowser implements Serializable {
     /**
      * Gets the IP-address of the web browser. If the application is running
      * inside a portlet, this method will return null.
-     * 
+     *
      * @return IP-address in 1.12.123.123 -format
      */
     public String getAddress() {
@@ -98,7 +98,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Firefox.
-     * 
+     *
      * @return true if the user is using Firefox, false if the user is not using
      *         Firefox or if no information on the browser is present
      */
@@ -112,7 +112,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Internet Explorer.
-     * 
+     *
      * @return true if the user is using Internet Explorer, false if the user is
      *         not using Internet Explorer or if no information on the browser
      *         is present
@@ -127,7 +127,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Edge.
-     * 
+     *
      * @since 7.5.3
      * @return true if the user is using Edge, false if the user is not using
      *         Edge or if no information on the browser is present
@@ -142,7 +142,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Safari.
-     * 
+     *
      * @return true if the user is using Safari, false if the user is not using
      *         Safari or if no information on the browser is present
      */
@@ -156,7 +156,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Opera.
-     * 
+     *
      * @return true if the user is using Opera, false if the user is not using
      *         Opera or if no information on the browser is present
      */
@@ -170,7 +170,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Chrome.
-     * 
+     *
      * @return true if the user is using Chrome, false if the user is not using
      *         Chrome or if no information on the browser is present
      */
@@ -184,7 +184,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Chrome Frame.
-     * 
+     *
      * @return true if the user is using Chrome Frame, false if the user is not
      *         using Chrome or if no information on the browser is present
      */
@@ -198,7 +198,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user's browser is Chrome Frame capable.
-     * 
+     *
      * @return true if the user can use Chrome Frame, false if the user can not
      *         or if no information on the browser is present
      */
@@ -212,12 +212,12 @@ public class WebBrowser implements Serializable {
 
     /**
      * Gets the major version of the browser the user is using.
-     * 
+     *
      * <p>
      * Note that Internet Explorer in IE7 compatibility mode might return 8 in
      * some cases even though it should return 7.
      * </p>
-     * 
+     *
      * @return The major version of the browser or -1 if not known.
      */
     public int getBrowserMajorVersion() {
@@ -230,9 +230,9 @@ public class WebBrowser implements Serializable {
 
     /**
      * Gets the minor version of the browser the user is using.
-     * 
+     *
      * @see #getBrowserMajorVersion()
-     * 
+     *
      * @return The minor version of the browser or -1 if not known.
      */
     public int getBrowserMinorVersion() {
@@ -245,7 +245,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Linux.
-     * 
+     *
      * @return true if the user is using Linux, false if the user is not using
      *         Linux or if no information on the browser is present
      */
@@ -255,7 +255,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Mac OS X.
-     * 
+     *
      * @return true if the user is using Mac OS X, false if the user is not
      *         using Mac OS X or if no information on the browser is present
      */
@@ -265,7 +265,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Windows.
-     * 
+     *
      * @return true if the user is using Windows, false if the user is not using
      *         Windows or if no information on the browser is present
      */
@@ -275,7 +275,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests whether the user is using Windows Phone.
-     * 
+     *
      * @return true if the user is using Windows Phone, false if the user is not
      *         using Windows Phone or if no information on the browser is
      *         present
@@ -287,7 +287,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests if the browser is run on Android.
-     * 
+     *
      * @return true if run on Android false if the user is not using Android or
      *         if no information on the browser is present
      */
@@ -297,7 +297,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests if the browser is run in iOS.
-     * 
+     *
      * @return true if run in iOS false if the user is not using iOS or if no
      *         information on the browser is present
      */
@@ -307,7 +307,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests if the browser is run on IPhone.
-     * 
+     *
      * @return true if run on IPhone false if the user is not using IPhone or if
      *         no information on the browser is present
      * @since 7.3.3
@@ -318,7 +318,7 @@ public class WebBrowser implements Serializable {
 
     /**
      * Tests if the browser is run on IPad.
-     * 
+     *
      * @return true if run on IPad false if the user is not using IPad or if no
      *         information on the browser is present
      * @since 7.3.3
@@ -332,7 +332,7 @@ public class WebBrowser implements Serializable {
      * This includes possible daylight saving adjustments, to figure out which
      * TimeZone the user actually might be in, see
      * {@link #getRawTimezoneOffset()}.
-     * 
+     *
      * @see WebBrowser#getRawTimezoneOffset()
      * @return timezone offset in milliseconds, 0 if not available
      */
@@ -354,7 +354,7 @@ public class WebBrowser implements Serializable {
      * currently have daylight saving time, or in a zone that never has daylight
      * saving time.
      * </p>
-     * 
+     *
      * @return timezone offset in milliseconds excluding DST, 0 if not available
      */
     public int getRawTimezoneOffset() {
@@ -364,7 +364,7 @@ public class WebBrowser implements Serializable {
     /**
      * Returns the offset in milliseconds between the browser's GMT TimeZone and
      * DST.
-     * 
+     *
      * @return the number of milliseconds that the TimeZone shifts when DST is
      *         in effect
      */
@@ -375,7 +375,7 @@ public class WebBrowser implements Serializable {
     /**
      * Returns whether daylight saving time (DST) is currently in effect in the
      * region of the browser or not.
-     * 
+     *
      * @return true if the browser resides at a location that currently is in
      *         DST
      */
@@ -391,7 +391,7 @@ public class WebBrowser implements Serializable {
      * <p>
      * To get the actual date and time shown in the end users computer, you can
      * do something like:
-     * 
+     *
      * <pre>
      * WebBrowser browser = ...;
      * SimpleTimeZone timeZone = new SimpleTimeZone(browser.getTimezoneOffset(), "Fake client time zone");
@@ -399,7 +399,7 @@ public class WebBrowser implements Serializable {
      * format.setTimeZone(timeZone);
      * myLabel.setValue(format.format(browser.getCurrentDate()));
      * </pre>
-     * 
+     *
      * @return the current date and time of the browser.
      * @see #isDSTInEffect()
      * @see #getDSTSavings()
@@ -419,7 +419,7 @@ public class WebBrowser implements Serializable {
     /**
      * For internal use by VaadinServlet/VaadinPortlet only. Updates all
      * properties in the class according to the given information.
-     * 
+     *
      * @param sw
      *            Screen width
      * @param sh
@@ -489,7 +489,7 @@ public class WebBrowser implements Serializable {
     /**
      * For internal use by VaadinServlet/VaadinPortlet only. Updates all
      * properties in the class according to the given information.
-     * 
+     *
      * @param request
      *            the Vaadin request to read the information from
      */
@@ -521,11 +521,11 @@ public class WebBrowser implements Serializable {
      * Checks if the browser is so old that it simply won't work with a Vaadin
      * application. Can be used to redirect to an alternative page, show
      * alternative content or similar.
-     * 
+     *
      * When this method returns true chances are very high that the browser
      * won't work and it does not make sense to direct the user to the Vaadin
      * application.
-     * 
+     *
      * @return true if the browser won't work, false if not the browser is
      *         supported or might work
      */
diff --git a/server/src/main/java/com/vaadin/server/WrappedHttpSession.java b/server/src/main/java/com/vaadin/server/WrappedHttpSession.java
index db4318e37a..45eb18faa1 100644
--- a/server/src/main/java/com/vaadin/server/WrappedHttpSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedHttpSession.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
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession;
 
 /**
  * Wrapper for {@link HttpSession}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  * @see WrappedSession
@@ -36,7 +36,7 @@ public class WrappedHttpSession implements WrappedSession {
 
     /**
      * Creates a new wrapped http session.
-     * 
+     *
      * @param session
      *            the http session to wrap.
      */
@@ -61,7 +61,7 @@ public class WrappedHttpSession implements WrappedSession {
 
     /**
      * Gets the wrapped {@link HttpSession}.
-     * 
+     *
      * @return the wrapped http session
      */
     public HttpSession getHttpSession() {
diff --git a/server/src/main/java/com/vaadin/server/WrappedPortletSession.java b/server/src/main/java/com/vaadin/server/WrappedPortletSession.java
index bd5f3d9cc6..fa7dbe7f41 100644
--- a/server/src/main/java/com/vaadin/server/WrappedPortletSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedPortletSession.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
@@ -22,7 +22,7 @@ import javax.portlet.PortletSession;
 
 /**
  * Wrapper for {@link PortletSession}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  * @see WrappedSession
@@ -33,7 +33,7 @@ public class WrappedPortletSession implements WrappedSession {
 
     /**
      * Creates a new wrapped portlet session.
-     * 
+     *
      * @param session
      *            the portlet session to wrap.
      */
@@ -68,11 +68,11 @@ public class WrappedPortletSession implements WrappedSession {
      *                scope is unknown to the container.
      * @exception java.lang.IllegalArgumentException
      *                if name is <code>null</code>.
-     * 
+     *
      * @see PortletSession#getAttribute(String, int)
      * @see PortletSession#PORTLET_SCOPE
      * @see PortletSession#APPLICATION_SCOPE
-     * 
+     *
      * @since 7.6
      */
     public Object getAttribute(String name, int scope) {
@@ -108,11 +108,11 @@ public class WrappedPortletSession implements WrappedSession {
      * @exception java.lang.IllegalArgumentException
      *                if name is <code>null</code> or scope is unknown to the
      *                container.
-     * 
+     *
      * @see PortletSession#setAttribute(String, Object, int)
      * @see PortletSession#PORTLET_SCOPE
      * @see PortletSession#APPLICATION_SCOPE
-     * 
+     *
      * @since 7.6
      */
     public void setAttribute(String name, Object value, int scope) {
@@ -121,7 +121,7 @@ public class WrappedPortletSession implements WrappedSession {
 
     /**
      * Gets the wrapped {@link PortletSession}.
-     * 
+     *
      * @return the wrapped portlet session
      */
     public PortletSession getPortletSession() {
@@ -136,14 +136,14 @@ public class WrappedPortletSession implements WrappedSession {
     /**
      * Gets the current set of attribute names bound to this session in the
      * given scope.
-     * 
+     *
      * @param scope
      *            session scope of the attribute names
      * @return an unmodifiable set of the current attribute names in the given
      *         scope
-     * 
+     *
      * @see PortletSession#getAttributeNames()
-     * 
+     *
      * @since 7.6
      */
     public Set<String> getAttributeNames(int scope) {
@@ -185,7 +185,7 @@ public class WrappedPortletSession implements WrappedSession {
      * Removes the object bound with the specified name and the given scope from
      * this session. If the session does not have an object bound with the
      * specified name, this method does nothing.
-     * 
+     *
      * @param name
      *            the name of the object to be removed from this session
      * @param scope
@@ -199,7 +199,7 @@ public class WrappedPortletSession implements WrappedSession {
      * @see PortletSession#removeAttribute(String, int)
      * @see PortletSession#PORTLET_SCOPE
      * @see PortletSession#APPLICATION_SCOPE
-     * 
+     *
      * @since 7.6
      */
     public void removeAttribute(String name, int scope) {
diff --git a/server/src/main/java/com/vaadin/server/WrappedSession.java b/server/src/main/java/com/vaadin/server/WrappedSession.java
index b839e5d87a..b2b74a64e1 100644
--- a/server/src/main/java/com/vaadin/server/WrappedSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedSession.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
@@ -25,8 +25,8 @@ import javax.servlet.http.HttpSession;
 /**
  * A generic session, wrapping a more specific session implementation, e.g.
  * {@link HttpSession} or {@link PortletSession}.
- * 
- * 
+ *
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0.0
@@ -35,10 +35,10 @@ public interface WrappedSession extends Serializable {
     /**
      * Returns the maximum time interval, in seconds, that this session will be
      * kept open between client accesses.
-     * 
+     *
      * @return an integer specifying the number of seconds this session remains
      *         open between client requests
-     * 
+     *
      * @see javax.servlet.http.HttpSession#getMaxInactiveInterval()
      * @see javax.portlet.PortletSession#getMaxInactiveInterval()
      */
@@ -46,12 +46,12 @@ public interface WrappedSession extends Serializable {
 
     /**
      * Gets an attribute from this session.
-     * 
+     *
      * @param name
      *            the name of the attribute
      * @return the attribute value, or <code>null</code> if the attribute is not
      *         defined in the session
-     * 
+     *
      * @see javax.servlet.http.HttpSession#getAttribute(String)
      * @see javax.portlet.PortletSession#getAttribute(String)
      */
@@ -59,12 +59,12 @@ public interface WrappedSession extends Serializable {
 
     /**
      * Saves an attribute value in this session.
-     * 
+     *
      * @param name
      *            the name of the attribute
      * @param value
      *            the attribute value
-     * 
+     *
      * @see javax.servlet.http.HttpSession#setAttribute(String, Object)
      * @see javax.portlet.PortletSession#setAttribute(String, Object)
      */
@@ -72,9 +72,9 @@ public interface WrappedSession extends Serializable {
 
     /**
      * Gets the current set of attribute names stored in this session.
-     * 
+     *
      * @return an unmodifiable set of the current attribute names
-     * 
+     *
      * @see HttpSession#getAttributeNames()
      * @see PortletSession#getAttributeNames()
      */
@@ -82,7 +82,7 @@ public interface WrappedSession extends Serializable {
 
     /**
      * Invalidates this session then unbinds any objects bound to it.
-     * 
+     *
      * @see HttpSession#invalidate()
      * @see PortletSession#invalidate()
      */
@@ -90,9 +90,9 @@ public interface WrappedSession extends Serializable {
 
     /**
      * Gets a string with a unique identifier for the session.
-     * 
+     *
      * @return a unique session id string
-     * 
+     *
      * @see HttpSession#getId()
      * @see PortletSession#getId()
      */
@@ -101,10 +101,10 @@ public interface WrappedSession extends Serializable {
     /**
      * Returns the time when this session was created, measured in milliseconds
      * since midnight January 1, 1970 GMT.
-     * 
+     *
      * @return a long specifying when this session was created, expressed in
      *         milliseconds since 1/1/1970 GMT
-     * 
+     *
      * @throws IllegalStateException
      *             if this method is called on an invalidated session
      * @see HttpSession#getCreationTime()
@@ -119,14 +119,14 @@ public interface WrappedSession extends Serializable {
      * <p>
      * Actions that your application takes, such as getting or setting a value
      * associated with the session, do not affect the access time.
-     * 
+     *
      * @return a long representing the last time the client sent a request
      *         associated with this session, expressed in milliseconds since
      *         1/1/1970 GMT
-     * 
+     *
      * @throws IllegalStateException
      *             if this method is called on an invalidated session
-     * 
+     *
      * @see HttpSession#getLastAccessedTime()
      * @see PortletSession#getLastAccessedTime()
      */
@@ -137,7 +137,7 @@ public interface WrappedSession extends Serializable {
      * client chooses not to join the session. For example, if the server used
      * only cookie-based sessions, and the client had disabled the use of
      * cookies, then a session would be new on each request.
-     * 
+     *
      * @return true if the server has created a session, but the client has not
      *         yet joined
      * @throws IllegalStateException
@@ -151,7 +151,7 @@ public interface WrappedSession extends Serializable {
      * Removes the object bound with the specified name from this session. If
      * the session does not have an object bound with the specified name, this
      * method does nothing.
-     * 
+     *
      * @param name
      *            the name of the object to remove from this session
      * @throws IllegalStateException
@@ -165,7 +165,7 @@ public interface WrappedSession extends Serializable {
      * Specifies the time, in seconds, between client requests before the
      * servlet container will invalidate this session. A negative time indicates
      * the session should never timeout.
-     * 
+     *
      * @param interval
      *            An integer specifying the number of seconds
      * @see HttpSession#setMaxInactiveInterval(int)
diff --git a/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.java b/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.java
index 1f546b2489..8d7591d7bb 100644
--- a/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.java
+++ b/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.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/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java
index d8e1fae359..19f0572300 100644
--- a/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java
+++ b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.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
@@ -41,7 +41,7 @@ import com.vaadin.ui.UI;
 /**
  * A {@link PushConnection} implementation using the Atmosphere push support
  * that is by default included in Vaadin.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -83,7 +83,7 @@ public class AtmospherePushConnection implements PushConnection {
         /**
          * Appends all the data from the given Reader to this message and
          * returns whether the message was completed.
-         * 
+         *
          * @param reader
          *            The Reader from which to read.
          * @return true if this message is complete, false otherwise.
@@ -150,7 +150,7 @@ public class AtmospherePushConnection implements PushConnection {
      * Pushes pending state changes and client RPC calls to the client. If
      * {@code isConnected()} is false, defers the push until a connection is
      * established.
-     * 
+     *
      * @param async
      *            True if this push asynchronously originates from the server,
      *            false if it is a response to a client request.
@@ -176,7 +176,7 @@ public class AtmospherePushConnection implements PushConnection {
     /**
      * Sends the given message to the current client. Cannot be called if
      * {@isConnected()} is false.
-     * 
+     *
      * @param message
      *            The message to send
      */
@@ -192,7 +192,7 @@ public class AtmospherePushConnection implements PushConnection {
      * received, or if the call resulted in the completion of a partially
      * received message, returns a {@link Reader} yielding the complete message.
      * Otherwise, returns null.
-     * 
+     *
      * @param reader
      *            A Reader from which to read the (partial) message
      * @return A Reader yielding a complete message or null if the message is
@@ -233,7 +233,7 @@ public class AtmospherePushConnection implements PushConnection {
      * {@AtmosphereResource} representing an established push connection. If
      * already connected, calls {@link #disconnect()} first. If there is a
      * deferred push, carries it out via the new connection.
-     * 
+     *
      * @since 7.2
      */
     public void connect(AtmosphereResource resource) {
@@ -317,7 +317,7 @@ public class AtmospherePushConnection implements PushConnection {
 
     /**
      * Called when the connection to the client has been lost.
-     * 
+     *
      * @since 7.4.1
      */
     public void connectionLost() {
@@ -356,7 +356,7 @@ public class AtmospherePushConnection implements PushConnection {
     /**
      * Internal method used for reconfiguring loggers to show all Atmosphere log
      * messages in the console.
-     * 
+     *
      * @since 7.6
      */
     public static void enableAtmosphereDebugLogging() {
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 20bbc4754c..aaecf9f273 100644
--- a/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.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
@@ -40,7 +40,7 @@ import elemental.json.impl.JsonUtil;
 
 /**
  * Serializes {@link ClientRpc client RPC} invocations to JSON.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -49,7 +49,7 @@ public class ClientRpcWriter implements Serializable {
     /**
      * Writes a JSON object containing all pending client RPC invocations in the
      * given UI.
-     * 
+     *
      * @param ui
      *            The {@link UI} whose RPC calls to write.
      * @param writer
@@ -109,7 +109,7 @@ public class ClientRpcWriter implements Serializable {
     /**
      * Collects all pending RPC calls from listed {@link ClientConnector}s and
      * clears their RPC queues.
-     * 
+     *
      * @param rpcPendingQueue
      *            list of {@link ClientConnector} of interest
      * @return ordered list of pending RPC calls
diff --git a/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java
index e458da1960..9af4186132 100644
--- a/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.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
@@ -38,7 +38,7 @@ import elemental.json.impl.JsonUtil;
 
 /**
  * Serializes a connector hierarchy to JSON.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -47,7 +47,7 @@ public class ConnectorHierarchyWriter implements Serializable {
     /**
      * Writes a JSON object containing the connector hierarchy (parent-child
      * mappings) of the dirty connectors in the given UI.
-     * 
+     *
      * @param ui
      *            The {@link UI} whose hierarchy to write.
      * @param writer
diff --git a/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java
index 1c02eff001..c7f48b9367 100644
--- a/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.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
@@ -33,7 +33,7 @@ import elemental.json.impl.JsonUtil;
 
 /**
  * Serializes connector type mappings to JSON.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -42,7 +42,7 @@ public class ConnectorTypeWriter implements Serializable {
     /**
      * Writes a JSON object containing connector-ID-to-type-ID mappings for each
      * dirty Connector in the given UI.
-     * 
+     *
      * @param ui
      *            The {@link UI} containing dirty connectors
      * @param writer
diff --git a/server/src/main/java/com/vaadin/server/communication/DateSerializer.java b/server/src/main/java/com/vaadin/server/communication/DateSerializer.java
index 593728bac7..e10edf852a 100644
--- a/server/src/main/java/com/vaadin/server/communication/DateSerializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/DateSerializer.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 elemental.json.JsonValue;
 
 /**
  * Server side serializer/deserializer for java.util.Date
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
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 152ca4d80c..f205e28b7d 100644
--- a/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.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
@@ -42,7 +42,7 @@ import com.vaadin.ui.Upload.FailedEvent;
 
 /**
  * Handles a file upload request submitted via an Upload component.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -51,7 +51,7 @@ public class FileUploadHandler implements RequestHandler {
     /**
      * Stream that extracts content from another stream until the boundary
      * string is encountered.
-     * 
+     *
      * Public only for unit tests, should be considered private for all other
      * purposes.
      */
@@ -119,7 +119,7 @@ public class FileUploadHandler implements RequestHandler {
         /**
          * Reads the input to expect a boundary string. Expects that the first
          * character has already been matched.
-         * 
+         *
          * @return -1 if the boundary was matched, else returns the first byte
          *         from boundary
          * @throws IOException
@@ -155,7 +155,7 @@ public class FileUploadHandler implements RequestHandler {
         /**
          * Returns the partly matched boundary string and the byte following
          * that.
-         * 
+         *
          * @return
          * @throws IOException
          */
@@ -202,7 +202,7 @@ public class FileUploadHandler implements RequestHandler {
     /**
      * An UploadInterruptedException will be thrown by an ongoing upload if
      * {@link StreamVariable#isInterrupted()} returns <code>true</code>.
-     * 
+     *
      * By checking the exception of an {@link StreamingErrorEvent} or
      * {@link FailedEvent} against this class, it is possible to determine if an
      * upload was interrupted by code or aborted due to any other exception.
@@ -320,7 +320,7 @@ public class FileUploadHandler implements RequestHandler {
      * assume the caller has locked the session. This allows the session to be
      * locked only when needed and not when handling the upload data.
      * </p>
-     * 
+     *
      * @param session
      *            The session containing the stream variable
      * @param request
@@ -384,13 +384,13 @@ public class FileUploadHandler implements RequestHandler {
         /*
          * Reads bytes from the underlying stream. Compares the read bytes to
          * the boundary string and returns -1 if met.
-         * 
+         *
          * The matching happens so that if the read byte equals to the first
          * char of boundary string, the stream goes to "buffering mode". In
          * buffering mode bytes are read until the character does not match the
          * corresponding from boundary string or the full boundary string is
          * found.
-         * 
+         *
          * Note, if this is someday needed elsewhere, don't shoot yourself to
          * foot and split to a top level helper class.
          */
@@ -480,7 +480,7 @@ public class FileUploadHandler implements RequestHandler {
      * assume the caller has locked the session. This allows the session to be
      * locked only when needed and not when handling the upload data.
      * </p>
-     * 
+     *
      * @param session
      *            The session containing the stream variable
      * @param request
@@ -661,7 +661,7 @@ public class FileUploadHandler implements RequestHandler {
     /**
      * Removes any possible path information from the filename and returns the
      * filename. Separators / and \\ are used.
-     * 
+     *
      * @param name
      * @return
      */
@@ -675,7 +675,7 @@ public class FileUploadHandler implements RequestHandler {
 
     /**
      * TODO document
-     * 
+     *
      * @param request
      * @param response
      * @throws IOException
diff --git a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java
index 9b5be83f14..47671c0c5b 100644
--- a/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.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
@@ -36,7 +36,7 @@ import com.vaadin.ui.UI;
  * no UIDL requests for a prolonged period of time. UIs that do not receive
  * either heartbeat or UIDL requests are eventually removed from the session and
  * garbage collected.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -77,7 +77,7 @@ public class HeartbeatHandler extends SynchronizedRequestHandler
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.server.SessionExpiredHandler#handleSessionExpired(com.vaadin
      * .server.VaadinRequest, com.vaadin.server.VaadinResponse)
diff --git a/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java
index 7f673d01e8..dc9dcc8d79 100644
--- a/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.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
@@ -34,7 +34,7 @@ import elemental.json.JsonValue;
  * <p>
  * This is the server side interface, see
  * com.vaadin.client.communication.JSONSerializer for the client side interface.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
@@ -59,7 +59,7 @@ public interface JSONSerializer<T> {
      * Serialize the given object into JSON. Must be compatible with
      * {@link #deserialize(Type, JsonValue, ConnectorTracker)} and the client
      * side com.vaadin.client.communication.JSONSerializer
-     * 
+     *
      * @param value
      *            The object to serialize
      * @param connectorTracker
diff --git a/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java
index 3ec3424801..405aff9560 100644
--- a/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.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
@@ -43,7 +43,7 @@ import com.vaadin.server.VaadinServlet;
  * Note that {@link WebListener} is Servlet 3.0 API so this will not be run for
  * older servers (unless added to web.xml), but these servers do not support JSR
  * 356 websockets either.
- * 
+ *
  * @since 7.5.0
  * @author Vaadin Ltd
  */
@@ -132,7 +132,7 @@ public class JSR356WebsocketInitializer implements ServletContextListener {
      * <p>
      * For JSR 356 websockets to work properly, the initialization must be done
      * in the servlet context initialization phase.
-     * 
+     *
      * @param servletRegistration
      *            The servlet registration info for the servlet
      * @param servletContext
@@ -159,7 +159,7 @@ public class JSR356WebsocketInitializer implements ServletContextListener {
     /**
      * Returns the name of the attribute in the servlet context where the
      * pre-initialized Atmosphere object is stored
-     * 
+     *
      * @param servletName
      *            The name of the servlet
      * @return The attribute name which contains the initialized Atmosphere
@@ -187,7 +187,7 @@ public class JSR356WebsocketInitializer implements ServletContextListener {
     /**
      * Tries to determine if the given servlet registration refers to a Vaadin
      * servlet.
-     * 
+     *
      * @param servletRegistration
      *            The servlet registration info for the servlet
      * @return false if the servlet is definitely not a Vaadin servlet, true
diff --git a/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java
index 1df7713b1a..941d1b0c4d 100644
--- a/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.UI;
 
 /**
  * Serializes miscellaneous metadata to JSON.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -35,7 +35,7 @@ public class MetadataWriter implements Serializable {
 
     /**
      * Writes a JSON object containing metadata related to the given UI.
-     * 
+     *
      * @param ui
      *            The UI whose metadata to write.
      * @param writer
@@ -53,7 +53,7 @@ public class MetadataWriter implements Serializable {
      *            messages.
      * @throws IOException
      *             If the serialization fails.
-     * 
+     *
      */
     public void write(UI ui, Writer writer, boolean repaintAll, boolean async,
             SystemMessages messages) throws IOException {
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 db35329586..57336b8a0f 100644
--- a/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.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/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java
index e8af147559..83699a1818 100644
--- a/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.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
@@ -34,7 +34,7 @@ import com.vaadin.server.VaadinSession;
 /**
  * Request handler which provides a dummy HTML response to any resource request
  * with the resource id DUMMY.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
diff --git a/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.java b/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.java
index 3aa3426d2f..06e1d9f11c 100644
--- a/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.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
@@ -42,7 +42,7 @@ import com.vaadin.ui.UI;
 
 /**
  * Notifies {@link PortletListener}s of a received portlet request.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
diff --git a/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.java
index a1276025d8..cb8c511a92 100644
--- a/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.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
@@ -29,7 +29,7 @@ import com.vaadin.server.VaadinSession;
 /**
  * Handler which ensures that Action and Event requests are marked as handled
  * and do not cause a 404 to be sent.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -37,7 +37,7 @@ public class PortletStateAwareRequestHandler implements RequestHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.RequestHandler#handleRequest(com.vaadin.server.
      * VaadinSession, com.vaadin.server.VaadinRequest,
      * com.vaadin.server.VaadinResponse)
diff --git a/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java
index 4c25119a47..a47c59aa45 100644
--- a/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.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
@@ -41,7 +41,7 @@ public class PortletUIInitHandler extends UIInitHandler {
     /**
      * Returns the {@link ResourceRequest} for the given request or null if none
      * could be found.
-     * 
+     *
      * @param request
      *            The original request, must be a {@link VaadinPortletRequest}
      * @return The resource request from the request parameter or null
diff --git a/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java
index 9e56d739d7..7603b0f078 100644
--- a/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.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
@@ -42,7 +42,7 @@ import com.vaadin.shared.ApplicationConstants;
  * names that have explicitly been registered. Resources can currently only be
  * registered by including a {@link JavaScript} or {@link StyleSheet} annotation
  * on a Connector class.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
diff --git a/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java
index b60e113739..6e1fadca04 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java
@@ -29,7 +29,7 @@ import org.atmosphere.handler.AbstractReflectorAtmosphereHandler;
 /**
  * Handles Atmosphere requests and forwards them to logical methods in
  * {@link PushHandler}
- * 
+ *
  * @since 7.5.0
  * @author Vaadin Ltd
  */
@@ -80,7 +80,7 @@ public class PushAtmosphereHandler extends AbstractReflectorAtmosphereHandler
 
     /**
      * Called when the client sends a message through the push channel
-     * 
+     *
      * @param resource
      */
     private void onMessage(AtmosphereResource resource) {
@@ -90,7 +90,7 @@ public class PushAtmosphereHandler extends AbstractReflectorAtmosphereHandler
     /**
      * Called when the client sends the first request (to establish a push
      * connection)
-     * 
+     *
      * @param resource
      */
     private void onConnect(AtmosphereResource resource) {
diff --git a/server/src/main/java/com/vaadin/server/communication/PushConnection.java b/server/src/main/java/com/vaadin/server/communication/PushConnection.java
index d5a0d6e9bc..6e0a31b9d6 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushConnection.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushConnection.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.UI;
  * the transport mechanism.
  * <p>
  * This interface is an internal API, only meant to be used by the framework.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
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 c64a6026e3..7cc41aeda3 100644
--- a/server/src/main/java/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java
@@ -49,7 +49,7 @@ import elemental.json.JsonException;
 /**
  * Handles incoming push connections and messages and dispatches them to the
  * correct {@link UI}/ {@link AtmospherePushConnection}
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -170,7 +170,7 @@ public class PushHandler {
 
     /**
      * Suspends the given resource
-     * 
+     *
      * @since 7.6
      * @param resource
      *            the resource to suspend
@@ -185,7 +185,7 @@ public class PushHandler {
 
     /**
      * Find the UI for the atmosphere resource, lock it and invoke the callback.
-     * 
+     *
      * @param resource
      *            the atmosphere resource for the current request
      * @param callback
@@ -347,7 +347,7 @@ public class PushHandler {
                  * UI not found, could be because FF has asynchronously closed
                  * the websocket connection and Atmosphere has already done
                  * cleanup of the request attributes.
-                 * 
+                 *
                  * In that case, we still have a chance of finding the right UI
                  * by iterating through the UIs in the session looking for one
                  * using the same AtmosphereResource.
@@ -433,10 +433,10 @@ public class PushHandler {
      * two push connections which try to use the same UI. Using the
      * AtmosphereResource directly guarantees the message goes to the correct
      * recipient.
-     * 
+     *
      * @param resource
      *            The atmosphere resource to send refresh to
-     * 
+     *
      */
     private static void sendRefreshAndDisconnect(AtmosphereResource resource)
             throws IOException {
@@ -474,7 +474,7 @@ public class PushHandler {
 
     /**
      * Called when a new push connection is requested to be opened by the client
-     * 
+     *
      * @since 7.5.0
      * @param resource
      *            The related atmosphere resources
@@ -485,7 +485,7 @@ public class PushHandler {
 
     /**
      * Called when a message is received through the push connection
-     * 
+     *
      * @since 7.5.0
      * @param resource
      *            The related atmosphere resources
@@ -497,11 +497,11 @@ public class PushHandler {
 
     /**
      * Sets the timeout used for suspend calls when using long polling.
-     * 
+     *
      * If you are using a proxy with a defined idle timeout, set the suspend
      * timeout to a value smaller than the proxy timeout so that the server is
      * aware of a reconnect taking place.
-     * 
+     *
      * @since 7.6
      * @param suspendTimeout
      *            the timeout to use for suspended AtmosphereResources
@@ -512,7 +512,7 @@ public class PushHandler {
 
     /**
      * Gets the timeout used for suspend calls when using long polling.
-     * 
+     *
      * @since 7.6
      * @return the timeout to use for suspended AtmosphereResources
      */
diff --git a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
index 1d8287cbf8..e663d004f4 100644
--- a/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.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
@@ -33,7 +33,7 @@ import com.vaadin.ui.UI;
 /**
  * Serializes resources to JSON. Currently only used for {@link CustomLayout}
  * templates.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -41,7 +41,7 @@ public class ResourceWriter implements Serializable {
 
     /**
      * Writes a JSON object containing registered resources.
-     * 
+     *
      * @param ui
      *            The {@link UI} whose resources to write.
      * @param writer
diff --git a/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java
index ae41a0280f..bef9b71aef 100644
--- a/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.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/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java
index e2ac14ccb1..44eda4c35c 100644
--- a/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.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/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java
index 383ad2d541..c609610189 100644
--- a/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.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
@@ -39,10 +39,10 @@ import com.vaadin.server.VaadinSession;
  * The session is not locked during execution of the request handlers. The
  * request handler can itself decide if it needs to lock the session or not.
  * </p>
- * 
+ *
  * @see VaadinSession#addRequestHandler(RequestHandler)
  * @see RequestHandler
- * 
+ *
  * @since 7.1
  */
 public class SessionRequestHandler implements RequestHandler {
diff --git a/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java
index 012ea93cc5..ab91f6e605 100644
--- a/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.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
@@ -35,7 +35,7 @@ import elemental.json.impl.JsonUtil;
 
 /**
  * Serializes {@link SharedState shared state} changes to JSON.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -44,7 +44,7 @@ public class SharedStateWriter implements Serializable {
     /**
      * Writes a JSON object containing the pending state changes of the dirty
      * connectors of the given UI.
-     * 
+     *
      * @param ui
      *            The UI whose state changes should be written.
      * @param writer
diff --git a/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java
index 33a1e7d451..70fb97fbd1 100644
--- a/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.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/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java
index db6575b2fe..4cc0ee459f 100644
--- a/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.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/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java
index c466f2cf29..10fbbac08f 100644
--- a/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.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/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java
index 36c9f83abe..42ed8a0bb9 100644
--- a/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.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/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java
index 180a62ba03..f66dbe4107 100644
--- a/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.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
@@ -47,7 +47,7 @@ import elemental.json.impl.JsonUtil;
 
 /**
  * Handles an initial request from the client to initialize a {@link UI}.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -91,7 +91,7 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
      * Commit the JSON response. We can't write immediately to the output stream
      * as we want to write only a critical notification if something goes wrong
      * during the response handling.
-     * 
+     *
      * @param request
      *            The request that resulted in this response
      * @param response
@@ -227,13 +227,13 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
 
     /**
      * Constructs an embed id based on information in the request.
-     * 
+     *
      * @since 7.2
-     * 
+     *
      * @param request
      *            the request to get embed information from
      * @return the embed id, or <code>null</code> if id is not available.
-     * 
+     *
      * @see UI#getEmbedId()
      */
     protected String getEmbedId(VaadinRequest request) {
@@ -251,7 +251,7 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
     /**
      * Updates a UI that has already been initialized but is now loaded again,
      * e.g. because of {@link PreserveOnRefresh}.
-     * 
+     *
      * @param ui
      * @param request
      */
@@ -263,7 +263,7 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
     /**
      * Generates the initial UIDL message that can e.g. be included in a html
      * page to avoid a separate round trip just for getting the UIDL.
-     * 
+     *
      * @param request
      *            the request that caused the initialization
      * @param uI
@@ -294,7 +294,7 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler {
 
     /**
      * Gets the security key (and generates one if needed) as UIDL.
-     * 
+     *
      * @param session
      *            the vaadin session to which the security key belongs
      * @return the security key UIDL or "" if the feature is turned off
diff --git a/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java
index 69b8fb6281..a9933a0054 100644
--- a/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.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
@@ -38,11 +38,11 @@ import elemental.json.JsonException;
 
 /**
  * Processes a UIDL request from the client.
- * 
+ *
  * Uses {@link ServerRpcHandler} to execute client-to-server RPC invocations and
  * {@link UidlWriter} to write state changes and client RPC calls back to the
  * client.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -59,7 +59,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler
 
     /**
      * Creates the ServerRpcHandler to use
-     * 
+     *
      * @since 7.7
      * @return the ServerRpcHandler to use
      */
@@ -132,7 +132,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler
 
     /**
      * Writes the opening of JSON message to be sent to client.
-     * 
+     *
      * @param outWriter
      * @param response
      * @throws IOException
@@ -149,7 +149,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.server.SessionExpiredHandler#handleSessionExpired(com.vaadin
      * .server.VaadinRequest, com.vaadin.server.VaadinResponse)
@@ -176,7 +176,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler
     /**
      * Returns the JSON which should be returned to the client when a request
      * for a non-existent UI arrives.
-     * 
+     *
      * @param service
      *            The VaadinService
      * @param vaadinRequest
diff --git a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
index e6816bc9fc..c61060d95f 100644
--- a/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/UidlWriter.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
@@ -50,7 +50,7 @@ import elemental.json.impl.JsonUtil;
  * Serializes pending server-side changes to UI state to JSON. This includes
  * shared state, client RPC invocations, connector hierarchy changes, connector
  * type information among others.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -58,7 +58,7 @@ public class UidlWriter implements Serializable {
 
     /**
      * Writes a JSON object containing all pending changes to the given UI.
-     * 
+     *
      * @param ui
      *            The {@link UI} whose changes to write
      * @param writer
@@ -68,7 +68,7 @@ public class UidlWriter implements Serializable {
      * @param async
      *            True if this message is sent by the server asynchronously,
      *            false if it is a response to a client message.
-     * 
+     *
      * @throws IOException
      *             If the writing fails.
      */
@@ -265,7 +265,7 @@ public class UidlWriter implements Serializable {
             /*
              * Ensure super classes come before sub classes to get script
              * dependency order right. Sub class @JavaScript might assume that
-             * 
+             *
              * @JavaScript defined by super class is already loaded.
              */
             Collections.sort(newConnectorTypes, new Comparator<Class<?>>() {
@@ -347,7 +347,7 @@ public class UidlWriter implements Serializable {
     /**
      * Adds the performance timing data (used by TestBench 3) to the UIDL
      * response.
-     * 
+     *
      * @throws IOException
      */
     private void writePerformanceData(UI ui, Writer writer) throws IOException {
diff --git a/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java b/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
index 58ba1b3b00..2a45e05a0c 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.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 elemental.json.JsonObject;
  * <p>
  * This class also provides a way to remove any unneeded data once the data
  * object is no longer used on the client-side.
- * 
+ *
  * @since 7.6
  * @author Vaadin Ltd
  */
@@ -36,7 +36,7 @@ public interface DataGenerator extends Serializable {
 
     /**
      * Adds data to row object for given item and item id being sent to client.
-     * 
+     *
      * @param itemId
      *            item id of item
      * @param item
@@ -50,7 +50,7 @@ public interface DataGenerator extends Serializable {
      * Informs the DataGenerator that an item id has been dropped and is no
      * longer needed. This method should clean up any unneeded stored data
      * related to the item.
-     * 
+     *
      * @param itemId
      *            removed item id
      */
diff --git a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
index f10a2dec1d..fb500eb870 100644
--- a/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.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
@@ -58,7 +58,7 @@ import elemental.json.JsonObject;
  * implemented as an Extension hardcoded to support a specific connector type.
  * This will be changed once framework support for something more flexible has
  * been implemented.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -66,7 +66,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Class for keeping track of current items and ValueChangeListeners.
-     * 
+     *
      * @since 7.6
      */
     private class ActiveItemHandler implements Serializable, DataGenerator {
@@ -80,7 +80,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
          * <p>
          * Note: This method will clean up any unneeded listeners and key
          * mappings
-         * 
+         *
          * @param itemIds
          *            collection of new active item ids
          */
@@ -101,7 +101,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
         /**
          * Marks given item id as dropped. Dropped items are cleared when adding
          * new active items.
-         * 
+         *
          * @param itemId
          *            dropped item id
          */
@@ -113,7 +113,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
         /**
          * Gets a collection copy of currently active item ids.
-         * 
+         *
          * @return collection of item ids
          */
         public Collection<Object> getActiveItemIds() {
@@ -122,7 +122,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
         /**
          * Gets a collection copy of currently active ValueChangeListeners.
-         * 
+         *
          * @return collection of value change listeners
          */
         public Collection<GridValueChangeListener> getValueChangeListeners() {
@@ -163,7 +163,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * Since there's no Container-wide possibility to listen to any kind of
      * value changes, an instance of this class needs to be attached to each and
      * every Item's Property in the container.
-     * 
+     *
      * @see Grid#addValueChangeListener(Container, Object, Object)
      * @see Grid#valueChangeListeners
      */
@@ -278,7 +278,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Creates a new data provider using the given container.
-     * 
+     *
      * @param container
      *            the container to make available
      */
@@ -409,7 +409,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Makes the data source available to the given {@link Grid} component.
-     * 
+     *
      * @param component
      *            the remote data grid component to extend
      * @param columnKeys
@@ -423,7 +423,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * Adds a {@link DataGenerator} for this {@code RpcDataProviderExtension}.
      * DataGenerators are called when sending row data to client. If given
      * DataGenerator is already added, this method does nothing.
-     * 
+     *
      * @since 7.6
      * @param generator
      *            generator to add
@@ -436,7 +436,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * Removes a {@link DataGenerator} from this
      * {@code RpcDataProviderExtension}. If given DataGenerator is not added to
      * this data provider, this method does nothing.
-     * 
+     *
      * @since 7.6
      * @param generator
      *            generator to remove
@@ -448,7 +448,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
     /**
      * Informs the client side that new rows have been inserted into the data
      * source.
-     * 
+     *
      * @param index
      *            the index at which new rows have been inserted
      * @param count
@@ -479,7 +479,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Informs the client side that rows have been removed from the data source.
-     * 
+     *
      * @param index
      *            the index of the first row removed
      * @param count
@@ -508,7 +508,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
     /**
      * Informs the client side that data of a row has been modified in the data
      * source.
-     * 
+     *
      * @param itemId
      *            the item Id the row that was updated
      */
@@ -577,7 +577,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Informs all DataGenerators than an item id has been dropped.
-     * 
+     *
      * @param droppedItemIds
      *            collection of dropped item ids
      */
@@ -592,7 +592,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
     /**
      * Informs this data provider that given columns have been removed from
      * grid.
-     * 
+     *
      * @param removedColumns
      *            a list of removed columns
      */
@@ -608,7 +608,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * Informs this data provider that given columns have been added to grid.
-     * 
+     *
      * @param addedColumns
      *            a list of added columns
      */
diff --git a/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java b/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java
index add1f375c5..1414e601f5 100644
--- a/server/src/main/java/com/vaadin/server/data/BackEndDataSource.java
+++ b/server/src/main/java/com/vaadin/server/data/BackEndDataSource.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/server/src/main/java/com/vaadin/server/data/DataSource.java b/server/src/main/java/com/vaadin/server/data/DataSource.java
index aedfadc6e7..32503663c6 100644
--- a/server/src/main/java/com/vaadin/server/data/DataSource.java
+++ b/server/src/main/java/com/vaadin/server/data/DataSource.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/server/src/main/java/com/vaadin/server/data/ListDataSource.java b/server/src/main/java/com/vaadin/server/data/ListDataSource.java
index 389e836d2e..e4568809b7 100644
--- a/server/src/main/java/com/vaadin/server/data/ListDataSource.java
+++ b/server/src/main/java/com/vaadin/server/data/ListDataSource.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/server/src/main/java/com/vaadin/server/data/Query.java b/server/src/main/java/com/vaadin/server/data/Query.java
index ac2482e460..3a8e3c1895 100644
--- a/server/src/main/java/com/vaadin/server/data/Query.java
+++ b/server/src/main/java/com/vaadin/server/data/Query.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
@@ -23,7 +23,7 @@ import java.util.Set;
 /**
  * Query object used to request data from a backend. Contains index limits,
  * sorting and filtering information.
- * 
+ *
  * @since
  */
 public class Query implements Serializable {
@@ -47,7 +47,7 @@ public class Query implements Serializable {
     /**
      * Constructs a Query for all rows from 0 to {@link Integer#MAX_VALUE} with
      * filtering.
-     * 
+     *
      * @param filters
      *            set of back end filters
      */
@@ -61,7 +61,7 @@ public class Query implements Serializable {
     /**
      * Constructs a new Query object with given offset, limit, sorting and
      * filtering.
-     * 
+     *
      * @param offset
      *            first index to fetch
      * @param limit
@@ -81,7 +81,7 @@ public class Query implements Serializable {
 
     /**
      * Gets the first index of items to fetch.
-     * 
+     *
      * @return offset for data request
      */
     public int getOffset() {
@@ -93,7 +93,7 @@ public class Query implements Serializable {
      * <p>
      * <strong>Note: </strong>It is possible that
      * {@code offset + limit > item count}
-     * 
+     *
      * @return number of items to fetch
      */
     public int getLimit() {
@@ -102,7 +102,7 @@ public class Query implements Serializable {
 
     /**
      * Gets the sorting for items to fetch.
-     * 
+     *
      * @return list of sort orders
      */
     public List<SortOrder<String>> getSortOrders() {
@@ -111,7 +111,7 @@ public class Query implements Serializable {
 
     /**
      * Gets the filters for items to fetch.
-     * 
+     *
      * @return set of filters
      */
     public Set<Object> getFilters() {
diff --git a/server/src/main/java/com/vaadin/server/data/SortOrder.java b/server/src/main/java/com/vaadin/server/data/SortOrder.java
index a10c297303..ed827bca9e 100644
--- a/server/src/main/java/com/vaadin/server/data/SortOrder.java
+++ b/server/src/main/java/com/vaadin/server/data/SortOrder.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/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
index 33eba6cfab..2f8b1459b5 100644
--- a/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
+++ b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.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
@@ -36,11 +36,11 @@ import com.vaadin.server.widgetsetutils.ClassPathExplorer.LocationInfo;
  * Helper class for managing the addon imports and creating an a SCSS file for
  * importing all your addon themes. The helper method searches the classpath for
  * Vaadin addons and uses the 'Vaadin-Themes' metadata to create the imports.
- * 
+ *
  * <p>
  * The addons.scss is always overwritten when this tool is invoked.
  * </p>
- * 
+ *
  * @since 7.1
  */
 public class SASSAddonImportFileCreator {
@@ -51,7 +51,7 @@ public class SASSAddonImportFileCreator {
             + "will be overwritten from time to time.";
 
     /**
-     * 
+     *
      * @param args
      *            Theme directory where the addons.scss file should be created
      */
@@ -66,7 +66,7 @@ public class SASSAddonImportFileCreator {
 
     /**
      * Updates a themes addons.scss with the addon themes found on the classpath
-     * 
+     *
      * @param themeDirectory
      *            The target theme directory
      */
diff --git a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index 8d032d4a22..47b3ffdbe3 100644
--- a/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
+++ b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.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
@@ -49,7 +49,7 @@ import java.util.jar.Manifest;
  * appropriate monkey code for gwt directly in annotation processor and get rid
  * of {@link WidgetMapGenerator}. Using annotation processor might be a good
  * idea when dropping Java 1.5 support (integrated to javac in 6).
- * 
+ *
  */
 public class ClassPathExplorer {
 
@@ -71,7 +71,7 @@ public class ClassPathExplorer {
 
     /**
      * Contains information about widgetsets and themes found on the classpath
-     * 
+     *
      * @since 7.1
      */
     public static class LocationInfo {
@@ -128,7 +128,7 @@ public class ClassPathExplorer {
 
     /**
      * Finds the names and locations of widgetsets available on the class path.
-     * 
+     *
      * @return map from widgetset classname to widgetset location URL
      * @deprecated Use {@link #getAvailableWidgetSetsAndStylesheets()} instead
      */
@@ -140,7 +140,7 @@ public class ClassPathExplorer {
     /**
      * Finds the names and locations of widgetsets and themes available on the
      * class path.
-     * 
+     *
      * @return
      */
     public static LocationInfo getAvailableWidgetSetsAndStylesheets() {
@@ -180,13 +180,13 @@ public class ClassPathExplorer {
     /**
      * Finds all GWT modules / Vaadin widgetsets and Addon styles in a valid
      * location.
-     * 
+     *
      * If the location is a directory, all GWT modules (files with the
      * ".gwt.xml" extension) are added to widgetsets.
-     * 
+     *
      * If the location is a JAR file, the comma-separated values of the
      * "Vaadin-Widgetsets" attribute in its manifest are added to widgetsets.
-     * 
+     *
      * @param locationString
      *            an entry in {@link #classpathLocations}
      * @param widgetsets
@@ -291,9 +291,9 @@ public class ClassPathExplorer {
     /**
      * Splits the current class path into entries, and filters them accepting
      * directories, Vaadin add-on JARs with widgetsets and Vaadin JARs.
-     * 
+     *
      * Some other non-JAR entries may also be included in the result.
-     * 
+     *
      * @return filtered list of class path entries
      */
     private final static List<String> getRawClasspathEntries() {
@@ -326,9 +326,9 @@ public class ClassPathExplorer {
     /**
      * Determine every URL location defined by the current classpath, and it's
      * associated package name.
-     * 
+     *
      * See {@link #classpathLocations} for information on output format.
-     * 
+     *
      * @param rawClasspathEntries
      *            raw class path entries as split from the Java class path
      *            string
@@ -353,14 +353,14 @@ public class ClassPathExplorer {
     /**
      * Checks a class path entry to see whether it can contain widgets and
      * widgetsets.
-     * 
+     *
      * All directories are automatically accepted. JARs are accepted if they
      * have the "Vaadin-Widgetsets" attribute in their manifest or the JAR file
      * name contains "vaadin-" or ".vaadin.".
-     * 
+     *
      * Also other non-JAR entries may be accepted, the caller should be prepared
      * to handle them.
-     * 
+     *
      * @param classpathEntry
      *            class path entry string as given in the Java class path
      * @return true if the entry should be considered when looking for widgets
@@ -418,7 +418,7 @@ public class ClassPathExplorer {
     /**
      * Recursively add subdirectories and jar files to locations - see
      * {@link #classpathLocations}.
-     * 
+     *
      * @param name
      * @param file
      * @param locations
@@ -465,7 +465,7 @@ public class ClassPathExplorer {
 
     /**
      * Add a jar file to locations - see {@link #classpathLocations}.
-     * 
+     *
      * @param name
      * @param locations
      */
@@ -489,12 +489,12 @@ public class ClassPathExplorer {
     /**
      * Find and return the default source directory where to create new
      * widgetsets.
-     * 
+     *
      * Return the first directory (not a JAR file etc.) on the classpath by
      * default.
-     * 
+     *
      * TODO this could be done better...
-     * 
+     *
      * @return URL
      */
     public static URL getDefaultSourceDirectory() {
@@ -504,17 +504,17 @@ public class ClassPathExplorer {
     /**
      * Find and return the source directory which contains the given widgetset
      * file.
-     * 
+     *
      * If not applicable or widgetsetFileName is null, return the first
      * directory (not a JAR file etc.) on the classpath.
-     * 
+     *
      * TODO this could be done better...
      *
      * @since 7.6.5
-     * 
+     *
      * @param widgetsetFileName
      *            relative path for the widgetset
-     * 
+     *
      * @return URL
      */
     public static URL getWidgetsetSourceDirectory(String widgetsetFileName) {
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 08852b5394..1e211eaf3a 100644
--- a/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
+++ b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.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
@@ -36,11 +36,11 @@ import java.util.regex.Pattern;
 /**
  * Helper class to update widgetsets GWT module configuration file. Can be used
  * command line or via IDE tools.
- * 
+ *
  * <p>
  * If module definition file contains text "WS Compiler: manually edited", tool
  * will skip editing file.
- * 
+ *
  */
 public class WidgetSetBuilder {
 
diff --git a/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java
index dae8f2d28a..0be3c6cb46 100644
--- a/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.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
@@ -40,7 +40,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
  * positioning.
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class AbsoluteLayout extends AbstractLayout
@@ -90,7 +90,7 @@ public class AbsoluteLayout extends AbstractLayout
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components
      */
     @Override
@@ -112,7 +112,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui.
      * Component )
      */
@@ -129,7 +129,7 @@ public class AbsoluteLayout extends AbstractLayout
      * 10 pixels from the left and 10 pixels from the top. The identifiers:
      * "top","left","right" and "bottom" can be used to specify the position.
      * </p>
-     * 
+     *
      * @param c
      *            The component to add to the layout
      * @param cssPosition
@@ -144,7 +144,7 @@ public class AbsoluteLayout extends AbstractLayout
     /**
      * Adds the component using the given position. Ensures the position is only
      * set if the component is added correctly.
-     * 
+     *
      * @param c
      *            The component to add
      * @param position
@@ -175,7 +175,7 @@ public class AbsoluteLayout extends AbstractLayout
      * Removes the component from all internal data structures. Does not
      * actually remove the component from the layout (this is assumed to have
      * been done by the caller).
-     * 
+     *
      * @param c
      *            The component to remove
      */
@@ -203,7 +203,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.AbstractComponentContainer#removeComponent(com.vaadin.ui
      * .Component)
@@ -222,7 +222,7 @@ public class AbsoluteLayout extends AbstractLayout
      * {@link #setPosition(Component, ComponentPosition)} with the updated
      * {@link ComponentPosition} object.
      * </p>
-     * 
+     *
      * @param component
      *            The component which position is needed
      * @return An instance of ComponentPosition containing the position of the
@@ -235,7 +235,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /**
      * Sets the position of a component in the layout.
-     * 
+     *
      * @param component
      * @param position
      */
@@ -250,7 +250,7 @@ public class AbsoluteLayout extends AbstractLayout
     /**
      * Updates the position for a component. Caller must ensure component is a
      * child of this layout.
-     * 
+     *
      * @param component
      *            The component. Must be a child for this layout. Not enforced.
      * @param position
@@ -283,11 +283,11 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the position attributes using CSS syntax. Attributes not
          * included in the string are reset to their unset states.
-         * 
+         *
          * <code><pre>
          * setCSSString("top:10px;left:20%;z-index:16;");
          * </pre></code>
-         * 
+         *
          * @param css
          */
         public void setCSSString(String css) {
@@ -341,7 +341,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Converts the internal values into a valid CSS string.
-         * 
+         *
          * @return A valid CSS string
          */
         public String getCSSString() {
@@ -367,7 +367,7 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the 'top' attribute; distance from the top of the component to
          * the top edge of the layout.
-         * 
+         *
          * @param topValue
          *            The value of the 'top' attribute
          * @param topUnits
@@ -383,7 +383,7 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the 'right' attribute; distance from the right of the component
          * to the right edge of the layout.
-         * 
+         *
          * @param rightValue
          *            The value of the 'right' attribute
          * @param rightUnits
@@ -399,7 +399,7 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the 'bottom' attribute; distance from the bottom of the
          * component to the bottom edge of the layout.
-         * 
+         *
          * @param bottomValue
          *            The value of the 'bottom' attribute
          * @param units
@@ -415,7 +415,7 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the 'left' attribute; distance from the left of the component to
          * the left edge of the layout.
-         * 
+         *
          * @param leftValue
          *            The value of the 'left' attribute
          * @param units
@@ -430,7 +430,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Sets the 'z-index' attribute; the visual stacking order
-         * 
+         *
          * @param zIndex
          *            The z-index for the component.
          */
@@ -442,7 +442,7 @@ public class AbsoluteLayout extends AbstractLayout
         /**
          * Sets the value of the 'top' attribute; distance from the top of the
          * component to the top edge of the layout.
-         * 
+         *
          * @param topValue
          *            The value of the 'left' attribute
          */
@@ -453,7 +453,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the 'top' attributes value in current units.
-         * 
+         *
          * @see #getTopUnits()
          * @return The value of the 'top' attribute, null if not set
          */
@@ -463,7 +463,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the 'right' attributes value in current units.
-         * 
+         *
          * @return The value of the 'right' attribute, null if not set
          * @see #getRightUnits()
          */
@@ -475,7 +475,7 @@ public class AbsoluteLayout extends AbstractLayout
          * Sets the 'right' attribute value (distance from the right of the
          * component to the right edge of the layout). Currently active units
          * are maintained.
-         * 
+         *
          * @param rightValue
          *            The value of the 'right' attribute
          * @see #setRightUnits(int)
@@ -487,7 +487,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the 'bottom' attributes value using current units.
-         * 
+         *
          * @return The value of the 'bottom' attribute, null if not set
          * @see #getBottomUnits()
          */
@@ -499,7 +499,7 @@ public class AbsoluteLayout extends AbstractLayout
          * Sets the 'bottom' attribute value (distance from the bottom of the
          * component to the bottom edge of the layout). Currently active units
          * are maintained.
-         * 
+         *
          * @param bottomValue
          *            The value of the 'bottom' attribute
          * @see #setBottomUnits(int)
@@ -511,7 +511,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the 'left' attributes value using current units.
-         * 
+         *
          * @return The value of the 'left' attribute, null if not set
          * @see #getLeftUnits()
          */
@@ -523,7 +523,7 @@ public class AbsoluteLayout extends AbstractLayout
          * Sets the 'left' attribute value (distance from the left of the
          * component to the left edge of the layout). Currently active units are
          * maintained.
-         * 
+         *
          * @param leftValue
          *            The value of the 'left' CSS-attribute
          * @see #setLeftUnits(int)
@@ -535,7 +535,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the unit for the 'top' attribute
-         * 
+         *
          * @return See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *         available units.
          */
@@ -545,7 +545,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Sets the unit for the 'top' attribute
-         * 
+         *
          * @param topUnits
          *            See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *            available units.
@@ -557,7 +557,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the unit for the 'right' attribute
-         * 
+         *
          * @return See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *         available units.
          */
@@ -567,7 +567,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Sets the unit for the 'right' attribute
-         * 
+         *
          * @param rightUnits
          *            See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *            available units.
@@ -579,7 +579,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the unit for the 'bottom' attribute
-         * 
+         *
          * @return See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *         available units.
          */
@@ -589,7 +589,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Sets the unit for the 'bottom' attribute
-         * 
+         *
          * @param bottomUnits
          *            See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *            available units.
@@ -601,7 +601,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the unit for the 'left' attribute
-         * 
+         *
          * @return See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *         available units.
          */
@@ -611,7 +611,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Sets the unit for the 'left' attribute
-         * 
+         *
          * @param leftUnits
          *            See {@link Sizeable} UNIT_SYMBOLS for a description of the
          *            available units.
@@ -623,7 +623,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /**
          * Gets the 'z-index' attribute.
-         * 
+         *
          * @return the zIndex The z-index attribute
          */
         public int getZIndex() {
@@ -632,7 +632,7 @@ public class AbsoluteLayout extends AbstractLayout
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#toString()
          */
         @Override
@@ -677,7 +677,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Node,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -712,7 +712,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Node,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -752,7 +752,7 @@ public class AbsoluteLayout extends AbstractLayout
 
     /**
      * Private method for writing position attributes
-     * 
+     *
      * @since 7.4
      * @param node
      *            target node
diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
index 0935406d5a..ca5631c3b0 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.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
@@ -37,7 +37,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * An abstract class that defines default implementation for a color picker
  * component.
- * 
+ *
  * @since 7.0.0
  */
 public abstract class AbstractColorPicker extends AbstractComponent
@@ -61,22 +61,22 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
         /**
          * Calculate color from coordinates
-         * 
+         *
          * @param x
          *            the x-coordinate
          * @param y
          *            the y-coordinate
-         * 
+         *
          * @return the color
          */
         public Color calculate(int x, int y);
 
         /**
          * Calculate coordinates from color
-         * 
+         *
          * @param c
          *            the c
-         * 
+         *
          * @return the integer array with the coordinates
          */
         public int[] calculate(Color c);
@@ -139,7 +139,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            the caption of the popup window
      */
@@ -149,7 +149,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            the caption of the popup window
      * @param initialColor
@@ -183,7 +183,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
      * Set true if the component should show a default caption (css-code for the
      * currently selected color, e.g. #ffffff) when no other caption is
      * available.
-     * 
+     *
      * @param enabled
      */
     public void setDefaultCaptionEnabled(boolean enabled) {
@@ -200,7 +200,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Sets the position of the popup window
-     * 
+     *
      * @param x
      *            the x-coordinate
      * @param y
@@ -235,7 +235,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Fired when a color change event occurs
-     * 
+     *
      * @param event
      *            The color change event
      */
@@ -253,7 +253,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * The style for the popup window
-     * 
+     *
      * @param style
      *            The style
      */
@@ -283,7 +283,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the style for the popup window
-     * 
+     *
      * @since 7.5.0
      * @return popup window style
      */
@@ -293,7 +293,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Set the visibility of the RGB Tab
-     * 
+     *
      * @param visible
      *            The visibility
      */
@@ -311,7 +311,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the visibility of the RGB Tab
-     * 
+     *
      * @since 7.5.0
      * @return visibility of the RGB tab
      */
@@ -321,7 +321,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Set the visibility of the HSV Tab
-     * 
+     *
      * @param visible
      *            The visibility
      */
@@ -338,7 +338,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the visibility of the HSV Tab
-     * 
+     *
      * @since 7.5.0
      * @return visibility of the HSV tab
      */
@@ -348,7 +348,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Set the visibility of the Swatches Tab
-     * 
+     *
      * @param visible
      *            The visibility
      */
@@ -365,7 +365,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the visibility of the Swatches Tab
-     * 
+     *
      * @since 7.5.0
      * @return visibility of the swatches tab
      */
@@ -375,7 +375,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Sets the visibility of the Color History
-     * 
+     *
      * @param visible
      *            The visibility
      */
@@ -388,7 +388,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the visibility of the Color History
-     * 
+     *
      * @since 7.5.0
      * @return visibility of color history
      */
@@ -398,7 +398,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Sets the visibility of the CSS color code text field
-     * 
+     *
      * @param visible
      *            The visibility
      */
@@ -411,7 +411,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Gets the visibility of CSS color code text field
-     * 
+     *
      * @since 7.5.0
      * @return visibility of css color code text field
      */
@@ -431,7 +431,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Sets the default styles of the component
-     * 
+     *
      */
     abstract protected void setDefaultStyles();
 
@@ -452,7 +452,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
     /**
      * Shows or hides popup-window depending on the given parameter. If there is
      * no such window yet, one is created.
-     * 
+     *
      * @param open
      */
     protected void showPopup(boolean open) {
@@ -513,11 +513,11 @@ public abstract class AbstractColorPicker extends AbstractComponent
      * Set whether the caption text is rendered as HTML or not. You might need
      * to re-theme component to allow higher content than the original text
      * style.
-     * 
+     *
      * If set to true, the captions are passed to the browser as html and the
      * developer is responsible for ensuring no harmful html is used. If set to
      * false, the content is passed to the browser as plain text.
-     * 
+     *
      * @param htmlContentAllowed
      *            <code>true</code> if caption is rendered as HTML,
      *            <code>false</code> otherwise
@@ -530,7 +530,7 @@ public abstract class AbstractColorPicker extends AbstractComponent
 
     /**
      * Return HTML rendering setting
-     * 
+     *
      * @return <code>true</code> if the caption text is to be rendered as HTML,
      *         <code>false</code> otherwise
      * @deprecated as of , use {@link #isCaptionAsHtml()} instead
diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
index fcaa765767..2257d02a7c 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
@@ -69,7 +69,7 @@ import com.vaadin.util.ReflectTools;
  * {@link Component} interface. Basic UI components that are not derived from an
  * external component can inherit this class to easily qualify as Vaadin
  * components. Most components in Vaadin do just that.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -134,7 +134,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#setId(java.lang.String)
      */
     @Override
@@ -144,7 +144,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#getId()
      */
     @Override
@@ -254,14 +254,14 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Adds or removes a style name. Multiple styles can be specified as a
      * space-separated list of style names.
-     * 
+     *
      * If the {@code add} parameter is true, the style name is added to the
      * component. If the {@code add} parameter is false, the style name is
      * removed from the component.
      * <p>
      * Functionally this is equivalent to using {@link #addStyleName(String)} or
      * {@link #removeStyleName(String)}
-     * 
+     *
      * @since 7.5
      * @param style
      *            the style name to be added or removed
@@ -292,7 +292,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Sets the component's caption <code>String</code>. Caption is the visible
      * name of the component. This method will trigger a
      * {@link RepaintRequestEvent}.
-     * 
+     *
      * @param caption
      *            the new caption <code>String</code> for the component.
      */
@@ -309,7 +309,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * false, the caption is rendered in the browser as plain text.
      * <p>
      * The default is false, i.e. to render that caption as plain text.
-     * 
+     *
      * @param captionAsHtml
      *            true if the captions are rendered as HTML, false if rendered
      *            as plain text
@@ -322,7 +322,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Checks whether captions are rendered as HTML
      * <p>
      * The default is false, i.e. to render that caption as plain text.
-     * 
+     *
      * @return true if the captions are rendered as HTML, false if rendered as
      *         plain text
      */
@@ -352,20 +352,20 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Sets the locale of this component.
-     * 
+     *
      * <pre>
      * // Component for which the locale is meaningful
      * InlineDateField date = new InlineDateField(&quot;Datum&quot;);
-     * 
+     *
      * // German language specified with ISO 639-1 language
      * // code and ISO 3166-1 alpha-2 country code.
      * date.setLocale(new Locale(&quot;de&quot;, &quot;DE&quot;));
-     * 
+     *
      * date.setResolution(DateField.RESOLUTION_DAY);
      * layout.addComponent(date);
      * </pre>
-     * 
-     * 
+     *
+     *
      * @param locale
      *            the locale to become this component's locale.
      */
@@ -391,7 +391,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Sets the component's icon. This method will trigger a
      * {@link RepaintRequestEvent}.
-     * 
+     *
      * @param icon
      *            the icon to be shown with the component's caption.
      */
@@ -402,7 +402,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#isEnabled()
      */
     @Override
@@ -412,7 +412,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#setEnabled(boolean)
      */
     @Override
@@ -422,7 +422,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.client.Connector#isConnectorEnabled()
      */
     @Override
@@ -443,7 +443,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Returns the explicitly set immediate value.
-     * 
+     *
      * @return the explicitly set immediate value or null if
      *         {@link #setImmediate(boolean)} has not been explicitly invoked
      */
@@ -455,7 +455,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Returns the immediate mode of the component.
      * <p>
      * Since Vaadin 8, the default mode is immediate.
-     * 
+     *
      * @return true if the component is in immediate mode (explicitly or
      *         implicitly set), false if the component if not in immediate mode
      */
@@ -469,7 +469,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Sets the component's immediate mode to the specified status.
-     * 
+     *
      * @param immediate
      *            the boolean value specifying if the component should be in the
      *            immediate mode after the call.
@@ -481,7 +481,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#isVisible()
      */
     @Override
@@ -491,7 +491,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#setVisible(boolean)
      */
     @Override
@@ -518,7 +518,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#getDescription()
      */
     @Override
@@ -530,11 +530,11 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Sets the component's description. See {@link #getDescription()} for more
      * information on what the description is. This method will trigger a
      * {@link RepaintRequestEvent}.
-     * 
+     *
      * The description is displayed as HTML in tooltips or directly in certain
      * components so care should be taken to avoid creating the possibility for
      * HTML injection and possibly XSS vulnerabilities.
-     * 
+     *
      * @param description
      *            the new description string for the component.
      */
@@ -583,7 +583,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * To find the Window that contains the component, use {@code Window w =
      * getParent(Window.class);}
      * </p>
-     * 
+     *
      * @param <T>
      *            The type of the ancestor
      * @param parentType
@@ -604,7 +604,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Gets the error message for this component.
-     * 
+     *
      * @return ErrorMessage containing the description of the error state of the
      *         component or null, if the component contains no errors. Extending
      *         classes should override this method if they support other error
@@ -617,9 +617,9 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Gets the component's error message.
-     * 
+     *
      * @link Terminal.ErrorMessage#ErrorMessage(String, int)
-     * 
+     *
      * @return the component's error message.
      */
     public ErrorMessage getComponentError() {
@@ -629,9 +629,9 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Sets the component's error message. The message may contain certain XML
      * tags, for more information see
-     * 
+     *
      * @link Component.ErrorMessage#ErrorMessage(String, int)
-     * 
+     *
      * @param componentError
      *            the new <code>ErrorMessage</code> of the component.
      */
@@ -708,7 +708,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Build CSS compatible string representation of height.
-     * 
+     *
      * @return CSS height
      */
     private String getCSSHeight() {
@@ -717,7 +717,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Build CSS compatible string representation of width.
-     * 
+     *
      * @return CSS width
      */
     private String getCSSWidth() {
@@ -727,12 +727,12 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Returns the shared state bean with information to be sent from the server
      * to the client.
-     * 
+     *
      * Subclasses should override this method and set any relevant fields of the
      * state returned by super.getState().
-     * 
+     *
      * @since 7.0
-     * 
+     *
      * @return updated component shared state
      */
     @Override
@@ -821,7 +821,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Sets the data object, that can be used for any application specific data.
      * The component does not use or modify this data.
-     * 
+     *
      * @param data
      *            the Application specific data.
      * @since 3.1
@@ -832,7 +832,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Gets the application specific data. See {@link #setData(Object)}.
-     * 
+     *
      * @return the Application specific data set with setData function.
      * @since 3.1
      */
@@ -844,7 +844,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.Sizeable#getHeight()
      */
     @Override
@@ -854,7 +854,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#getHeightUnits()
      */
     @Override
@@ -864,7 +864,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#getWidth()
      */
     @Override
@@ -874,7 +874,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#getWidthUnits()
      */
     @Override
@@ -884,7 +884,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setHeight(float, Unit)
      */
     @Override
@@ -900,7 +900,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setSizeFull()
      */
     @Override
@@ -911,7 +911,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setSizeUndefined()
      */
     @Override
@@ -922,7 +922,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setWidthUndefined()
      */
     @Override
@@ -932,7 +932,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setHeightUndefined()
      */
     @Override
@@ -942,7 +942,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setWidth(float, Unit)
      */
     @Override
@@ -958,7 +958,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setWidth(java.lang.String)
      */
     @Override
@@ -973,7 +973,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Sizeable#setHeight(java.lang.String)
      */
     @Override
@@ -988,7 +988,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#readDesign(org.jsoup.nodes.Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -1046,7 +1046,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * consist of one, two or three parts with '_' between the different parts
      * if there is more than one part. The first part specifies the language,
      * the second part the country and the third part the variant of the locale.
-     * 
+     *
      * @param localeString
      *            the locale specified as a string
      * @return the Locale object corresponding to localeString
@@ -1072,7 +1072,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Toggles responsiveness of this component.
-     * 
+     *
      * @since 7.5.0
      * @param responsive
      *            boolean enables responsiveness, false disables
@@ -1097,7 +1097,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Returns true if the component is responsive
-     * 
+     *
      * @since 7.5.0
      * @return true if the component is responsive
      */
@@ -1114,7 +1114,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Reads the size of this component from the given design attributes. If the
      * attributes do not contain relevant size information, defaults is
      * consulted.
-     * 
+     *
      * @param attributes
      *            the design attributes
      * @param defaultInstance
@@ -1146,7 +1146,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Writes the size related attributes for the component if they differ from
      * the defaults
-     * 
+     *
      * @param component
      *            the component
      * @param attributes
@@ -1203,7 +1203,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Test if the given component has equal width with this instance
-     * 
+     *
      * @param component
      *            the component for the width comparison
      * @return true if the widths are equal
@@ -1215,7 +1215,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Test if the given component has equal height with this instance
-     * 
+     *
      * @param component
      *            the component for the height comparison
      * @return true if the heights are equal
@@ -1227,7 +1227,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * Test if the given components has equal size with this instance
-     * 
+     *
      * @param component
      *            the component for the size comparison
      * @return true if the sizes are equal
@@ -1241,7 +1241,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * when reading or writing design. These are typically attributes of some
      * primitive type. The default implementation searches setters with
      * primitive values
-     * 
+     *
      * @return a collection of attributes that can be read and written using the
      *         default approach.
      */
@@ -1257,9 +1257,9 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * basic implementation of the {@link readDesign} and {@link writeDesign}
      * methods. Typically these are handled in a custom way in the overridden
      * versions of the above methods
-     * 
+     *
      * @since 7.4
-     * 
+     *
      * @return the collection of attributes that are not handled by the basic
      *         implementation
      */
@@ -1280,7 +1280,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component#writeDesign(org.jsoup.nodes.Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -1335,7 +1335,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Gets the {@link ActionManager} used to manage the
      * {@link ShortcutListener}s added to this {@link LegacyField}.
-     * 
+     *
      * @return the ActionManager in use
      */
     protected ActionManager getActionManager() {
@@ -1377,7 +1377,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /**
      * Determine whether a <code>content</code> component is equal to, or the
      * ancestor of this component.
-     * 
+     *
      * @param content
      *            the potential ancestor element
      * @return <code>true</code> if the relationship holds
diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
index f3405a8a1c..ac331761d5 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.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.server.ComponentSizeValidator;
  * implementation for the methods in {@link ComponentContainer}. Basic UI
  * components that need to contain other components inherit this class to easily
  * qualify as a component container.
- * 
+ *
  * @author Vaadin Ltd
  * @since 3.0
  */
@@ -45,7 +45,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.ComponentContainer#addComponents(com.vaadin.ui.Component[])
      */
@@ -171,7 +171,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * Fires the component attached event. This should be called by the
      * addComponent methods after the component have been added to this
      * container.
-     * 
+     *
      * @param component
      *            the component that has been added to this container.
      */
@@ -183,7 +183,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * Fires the component detached event. This should be called by the
      * removeComponent methods after the component have been removed from this
      * container.
-     * 
+     *
      * @param component
      *            the component that has been removed from this container.
      */
@@ -195,7 +195,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * This only implements the events and component parent calls. The extending
      * classes must implement component list maintenance and call this method
      * after component list maintenance.
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#addComponent(Component)
      */
     @Override
@@ -220,7 +220,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * This only implements the events and component parent calls. The extending
      * classes must implement component list maintenance and call this method
      * before component list maintenance.
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#removeComponent(Component)
      */
     @Override
@@ -346,7 +346,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @deprecated As of 7.0, use {@link #iterator()} instead.
      */
     @Deprecated
diff --git a/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java
index 4bfebe7cf5..de48b73539 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.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.ui.declarative.DesignContext;
 
 /**
  * Abstract base for embedding components.
- * 
+ *
  * @author Vaadin Ltd.
  * @version @VERSION@
  * @since 7.0
@@ -47,7 +47,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
     /**
      * Sets the object source resource. The dimensions are assumed if possible.
      * The type is guessed from resource.
-     * 
+     *
      * @param source
      *            the source to set.
      */
@@ -57,7 +57,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
 
     /**
      * Get the object source resource.
-     * 
+     *
      * @return the source
      */
     public Resource getSource() {
@@ -67,7 +67,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
     /**
      * Sets this component's alternate text that can be presented instead of the
      * component's normal content for accessibility purposes.
-     * 
+     *
      * @param altText
      *            A short, human-readable description of this component's
      *            content.
@@ -79,7 +79,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
     /**
      * Gets this component's alternate text that can be presented instead of the
      * component's normal content for accessibility purposes.
-     * 
+     *
      * @returns Alternate text
      */
     public String getAlternateText() {
diff --git a/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java
index 9821c598e7..415ad2dcc9 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.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
@@ -117,7 +117,7 @@ import elemental.json.JsonValue;
  * field.</li>
  * </ul>
  * <p>
- * 
+ *
  * Values in the Shared State and in RPC calls are converted between Java and
  * JavaScript using the following conventions:
  * <ul>
@@ -144,7 +144,7 @@ import elemental.json.JsonValue;
  * here. Please refer to the documentation for specific types for serialization
  * information.</li>
  * </ul>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -166,7 +166,7 @@ public abstract class AbstractJavaScriptComponent extends AbstractComponent {
      * available as <code>this</code>). Calling that JavaScript function will
      * cause the call method in the registered {@link JavaScriptFunction} to be
      * invoked with the same arguments.
-     * 
+     *
      * @param functionName
      *            the name that should be used for client-side function
      * @param function
@@ -187,7 +187,7 @@ public abstract class AbstractJavaScriptComponent extends AbstractComponent {
      * before sending. This can be done either with
      * {@link JsonCodec#encode(Object, JsonValue, java.lang.reflect.Type, com.vaadin.ui.ConnectorTracker)}
      * or using the factory methods in {@link Json}.
-     * 
+     *
      * @param name
      *            the name of the function
      * @param arguments
diff --git a/server/src/main/java/com/vaadin/ui/AbstractLayout.java b/server/src/main/java/com/vaadin/ui/AbstractLayout.java
index 547e1122d5..1804c2d135 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractLayout.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.ui.declarative.DesignContext;
 /**
  * An abstract class that defines default implementation for the {@link Layout}
  * interface.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.0
  */
@@ -43,9 +43,9 @@ public abstract class AbstractLayout extends AbstractComponentContainer
      * helper method should be called from the
      * {@link #readDesign(Element, DesignContext) readDesign} method of layouts
      * that implement {@link MarginHandler}.
-     * 
+     *
      * @since 7.5
-     * 
+     *
      * @param design
      *            the design from which to read
      * @param defMargin
@@ -85,10 +85,10 @@ public abstract class AbstractLayout extends AbstractComponentContainer
      * helper method should be called from the
      * {@link #readDesign(Element, DesignContext) writeDesign} method of layouts
      * that implement {@link MarginHandler}.
-     * 
-     * 
+     *
+     *
      * @since 7.5
-     * 
+     *
      * @param design
      *            the design to write to
      * @param margin
diff --git a/server/src/main/java/com/vaadin/ui/AbstractMedia.java b/server/src/main/java/com/vaadin/ui/AbstractMedia.java
index 1d961832f7..a2f2c74d26 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractMedia.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractMedia.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
@@ -44,7 +44,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Abstract base class for the HTML5 media components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public abstract class AbstractMedia extends AbstractComponent {
@@ -61,7 +61,7 @@ public abstract class AbstractMedia extends AbstractComponent {
 
     /**
      * Sets a single media file as the source of the media component.
-     * 
+     *
      * @param source
      */
     public void setSource(Resource source) {
@@ -81,7 +81,7 @@ public abstract class AbstractMedia extends AbstractComponent {
      * supports. See
      * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a>
      * for a table of formats supported by different browsers.
-     * 
+     *
      * @param source
      */
     public void addSource(Resource source) {
@@ -138,7 +138,7 @@ public abstract class AbstractMedia extends AbstractComponent {
      * the browser depending on which file formats it supports. See
      * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a>
      * for a table of formats supported by different browsers.
-     * 
+     *
      * @param sources
      */
     public void setSources(Resource... sources) {
@@ -161,7 +161,7 @@ public abstract class AbstractMedia extends AbstractComponent {
 
     /**
      * Sets whether or not the browser should show native media controls.
-     * 
+     *
      * @param showControls
      */
     public void setShowControls(boolean showControls) {
@@ -183,7 +183,7 @@ public abstract class AbstractMedia extends AbstractComponent {
      * flash-based player, see the <a href=
      * "https://developer.mozilla.org/En/Using_audio_and_video_in_Firefox#Using_Flash"
      * >Mozilla Developer Network</a> for details.
-     * 
+     *
      * @param altText
      */
     public void setAltText(String altText) {
@@ -201,7 +201,7 @@ public abstract class AbstractMedia extends AbstractComponent {
     /**
      * Set whether the alternative text ({@link #setAltText(String)}) is
      * rendered as HTML or not.
-     * 
+     *
      * @param htmlContentAllowed
      */
     public void setHtmlContentAllowed(boolean htmlContentAllowed) {
@@ -219,7 +219,7 @@ public abstract class AbstractMedia extends AbstractComponent {
     /**
      * Sets whether the media is to automatically start playback when enough
      * data has been loaded.
-     * 
+     *
      * @param autoplay
      */
     public void setAutoplay(boolean autoplay) {
@@ -235,7 +235,7 @@ public abstract class AbstractMedia extends AbstractComponent {
 
     /**
      * Set whether to mute the audio or not.
-     * 
+     *
      * @param muted
      */
     public void setMuted(boolean muted) {
diff --git a/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java
index c239990292..0a555152cb 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.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
@@ -84,7 +84,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
     /**
      * Add a component into this container. The component is added to the right
      * or under the previous component.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -105,7 +105,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
     /**
      * Adds a component into this container. The component is added to the left
      * or on top of the other components.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -128,7 +128,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /**
      * Adds a component into indexed position in this container.
-     * 
+     *
      * @param c
      *            the component to be added.
      * @param index
@@ -168,7 +168,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /**
      * Removes the component from this container.
-     * 
+     *
      * @param c
      *            the component to be removed.
      */
@@ -182,7 +182,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
     /**
      * Gets the component container iterator for going trough all the components
      * in the container.
-     * 
+     *
      * @return the Iterator of the components inside the container.
      */
     @Override
@@ -193,7 +193,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components
      */
     @Override
@@ -267,7 +267,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com
      * .vaadin.ui.Component)
      */
@@ -284,7 +284,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean)
      */
     @Override
@@ -294,7 +294,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     @Override
@@ -307,26 +307,26 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
      * This method is used to control how excess space in layout is distributed
      * among components. Excess space may exist if layout is sized and contained
      * non relatively sized components don't consume all available space.
-     * 
+     *
      * <p>
      * Example how to distribute 1:3 (33%) for component1 and 2:3 (67%) for
      * component2 :
-     * 
+     *
      * <code>
      * layout.setExpandRatio(component1, 1);<br>
      * layout.setExpandRatio(component2, 2);
      * </code>
-     * 
+     *
      * <p>
      * If no ratios have been set, the excess space is distributed evenly among
      * all components.
-     * 
+     *
      * <p>
      * Note, that width or height (depending on orientation) needs to be defined
      * for this method to have any effect.
-     * 
+     *
      * @see Sizeable
-     * 
+     *
      * @param component
      *            the component in this layout which expand ratio is to be set
      * @param ratio
@@ -351,7 +351,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /**
      * Returns the expand ratio of given component.
-     * 
+     *
      * @param component
      *            which expand ratios is requested
      * @return expand ratio of given component, 0.0f by default.
@@ -401,7 +401,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /**
      * Returns the index of the given component.
-     * 
+     *
      * @param component
      *            The component to look up.
      * @return The index of the component or -1 if the component is not a child.
@@ -412,7 +412,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /**
      * Returns the component at the given position.
-     * 
+     *
      * @param index
      *            The position of the component.
      * @return The component at the given index.
@@ -430,7 +430,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.MarginHandler#getMargin()
      */
     @Override
@@ -440,7 +440,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.MarginHandler#setMargin(MarginInfo)
      */
     @Override
@@ -450,7 +450,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.AlignmentHandler#getDefaultComponentAlignment()
      */
     @Override
@@ -460,7 +460,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.Layout.AlignmentHandler#setDefaultComponentAlignment(com
      * .vaadin.ui.Alignment)
@@ -478,7 +478,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -517,7 +517,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
@@ -564,7 +564,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#getCustomAttributes()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
index 40d0dec5a2..957ab48eda 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.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
@@ -67,13 +67,13 @@ import com.vaadin.ui.declarative.DesignFormatter;
  * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
  * {@link com.vaadin.data.Container}.
  * </p>
- * 
+ *
  * <p>
  * A <code>Select</code> component may be in single- or multiselect mode.
  * Multiselect mode means that more than one item can be selected
  * simultaneously.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.0
  */
@@ -94,7 +94,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Item caption mode: Item's ID's <code>String</code> representation is
          * used as caption.
-         * 
+         *
          * @since 7.5.6
          */
         ID_TOSTRING,
@@ -202,7 +202,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         /**
          * Sets the option filtering mode.
-         * 
+         *
          * @param filteringMode
          *            the filtering mode to use
          */
@@ -210,7 +210,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         /**
          * Gets the current filtering mode.
-         * 
+         *
          * @return the filtering mode in use
          */
         public FilteringMode getFilteringMode();
@@ -269,7 +269,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Item id that represents null selection of this select.
-     * 
+     *
      * <p>
      * Data interface does not support nulls as item ids. Selecting the item
      * identified by this id is the same as selecting no items at all. This
@@ -304,7 +304,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Creates a new select that is connected to a data-source.
-     * 
+     *
      * @param caption
      *            the Caption of the component.
      * @param dataSource
@@ -317,7 +317,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Creates a new select that is filled from a collection of option values.
-     * 
+     *
      * @param caption
      *            the Caption of this field.
      * @param options
@@ -341,7 +341,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Paints the content of this component.
-     * 
+     *
      * @param target
      *            the Paint Event.
      * @throws PaintException
@@ -443,7 +443,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Invoked when the value of a variable has changed.
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
@@ -551,7 +551,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * TODO refine doc Setter for new item handler that is called when user adds
      * new item in newItemAllowed mode.
-     * 
+     *
      * @param newItemHandler
      */
     public void setNewItemHandler(NewItemHandler newItemHandler) {
@@ -560,7 +560,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * TODO refine doc
-     * 
+     *
      * @return
      */
     public NewItemHandler getNewItemHandler() {
@@ -576,13 +576,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * TODO refine doc
-     * 
+     *
      * This is a default class that handles adding new items that are typed by
      * user to selects container.
-     * 
+     *
      * By extending this class one may implement some logic on new item addition
      * like database inserts.
-     * 
+     *
      */
     public class DefaultNewItemHandler implements NewItemHandler {
         @Override
@@ -628,7 +628,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * <code>setValue</code> methods must be compatible with this type: one can
      * safely cast <code>getValue</code> to given type and pass any variable
      * assignable to this type as a parameter to <code>setValue</code>.
-     * 
+     *
      * @return the Type of the property.
      */
     @Override
@@ -642,7 +642,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the selected item id or in multiselect mode a set of selected ids.
-     * 
+     *
      * @see com.vaadin.legacy.ui.LegacyAbstractField#getValue()
      */
     @Override
@@ -674,13 +674,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the visible value of the property.
-     * 
+     *
      * <p>
      * The value of the select is the selected item id. If the select is in
      * multiselect-mode, the value is a set of selected item keys. In
      * multiselect mode all collections of id:s can be assigned.
      * </p>
-     * 
+     *
      * @param newValue
      *            the New selected item or collection of selected items.
      * @see com.vaadin.legacy.ui.LegacyAbstractField#setValue(java.lang.Object)
@@ -696,13 +696,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the visible value of the property.
-     * 
+     *
      * <p>
      * The value of the select is the selected item id. If the select is in
      * multiselect-mode, the value is a set of selected item keys. In
      * multiselect mode all collections of id:s can be assigned.
      * </p>
-     * 
+     *
      * @since 7.5.7
      * @param newValue
      *            the New selected item or collection of selected items.
@@ -739,7 +739,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the item from the container with given id. If the container does not
      * contain the requested item, null is returned.
-     * 
+     *
      * @param itemId
      *            the item id.
      * @return the item from the container.
@@ -751,7 +751,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the item Id collection from the container.
-     * 
+     *
      * @return the Collection of item ids.
      */
     @Override
@@ -761,7 +761,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the property Id collection from the container.
-     * 
+     *
      * @return the Collection of property ids.
      */
     @Override
@@ -771,7 +771,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the property type.
-     * 
+     *
      * @param propertyId
      *            the Id identifying the property.
      * @see com.vaadin.data.Container#getType(java.lang.Object)
@@ -783,9 +783,9 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /*
      * Gets the number of items in the container.
-     * 
+     *
      * @return the Number of items in the container.
-     * 
+     *
      * @see com.vaadin.data.Container#size()
      */
     @Override
@@ -797,7 +797,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Tests, if the collection contains an item with given id.
-     * 
+     *
      * @param itemId
      *            the Id the of item to be tested.
      */
@@ -813,7 +813,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the Property identified by the given itemId and propertyId from the
      * Container
-     * 
+     *
      * @see com.vaadin.data.Container#getContainerProperty(Object, Object)
      */
     @Override
@@ -824,10 +824,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Adds the new property to all items. Adds a property with given id, type
      * and default value to all items in the container.
-     * 
+     *
      * This functionality is optional. If the function is unsupported, it always
      * returns false.
-     * 
+     *
      * @return True if the operation succeeded.
      * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      *      java.lang.Class, java.lang.Object)
@@ -846,10 +846,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Removes all items from the container.
-     * 
+     *
      * This functionality is optional. If the function is unsupported, it always
      * returns false.
-     * 
+     *
      * @return True if the operation succeeded.
      * @see com.vaadin.data.Container#removeAllItems()
      */
@@ -871,7 +871,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Creates a new item into container with container managed id. The id of
      * the created new item is returned. The item can be fetched with getItem()
      * method. if the creation fails, null is returned.
-     * 
+     *
      * @return the Id of the created item or null in case of failure.
      * @see com.vaadin.data.Container#addItem()
      */
@@ -891,10 +891,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * ready for setting property values. if the creation fails, null is
      * returned. In case the container already contains the item, null is
      * returned.
-     * 
+     *
      * This functionality is optional. If the function is unsupported, it always
      * returns null.
-     * 
+     *
      * @param itemId
      *            the Identification of the item to be created.
      * @return the Created item with the given id, or null in case of failure.
@@ -913,7 +913,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Adds given items with given item ids to container.
-     * 
+     *
      * @since 7.2
      * @param itemId
      *            item identifiers to be added to underlying container
@@ -930,7 +930,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Adds given items with given item ids to container.
-     * 
+     *
      * @since 7.2
      * @param itemIds
      *            item identifiers to be added to underlying container
@@ -945,7 +945,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     @Override
@@ -1000,10 +1000,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Removes the property from all items. Removes a property with given id
      * from all the items in the container.
-     * 
+     *
      * This functionality is optional. If the function is unsupported, it always
      * returns false.
-     * 
+     *
      * @return True if the operation succeeded.
      * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object)
      */
@@ -1022,12 +1022,12 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the Container that serves as the data source of the viewer.
-     * 
+     *
      * As a side-effect the fields value (selection) is set to null due old
      * selection not necessary exists in new Container.
-     * 
+     *
      * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
-     * 
+     *
      * @param newDataSource
      *            the new data source.
      */
@@ -1084,7 +1084,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the viewing data-source container.
-     * 
+     *
      * @see com.vaadin.data.Container.Viewer#getContainerDataSource()
      */
     @Override
@@ -1096,7 +1096,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Is the select in multiselect mode? In multiselect mode
-     * 
+     *
      * @return the Value of property multiSelect.
      */
     public boolean isMultiSelect() {
@@ -1107,10 +1107,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Sets the multiselect mode. Setting multiselect mode false may lose
      * selection information: if selected items set contains one or more
      * selected items, only one of the selected items is kept as selected.
-     * 
+     *
      * Subclasses of AbstractSelect can choose not to support changing the
      * multiselect mode, and may throw {@link UnsupportedOperationException}.
-     * 
+     *
      * @param multiSelect
      *            the New value of property multiSelect.
      */
@@ -1152,7 +1152,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Does the select allow adding new options by the user. If true, the new
      * options can be added to the Container. The text entered by the user is
      * used as id. Note that data-source must allow adding new items.
-     * 
+     *
      * @return True if additions are allowed.
      */
     public boolean isNewItemsAllowed() {
@@ -1161,7 +1161,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Enables or disables possibility to add new options by the user.
-     * 
+     *
      * @param allowNewOptions
      *            the New value of property allowNewOptions.
      */
@@ -1179,7 +1179,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Override the caption of an item. Setting caption explicitly overrides id,
      * item and index captions.
-     * 
+     *
      * @param itemId
      *            the id of the item to be recaptioned.
      * @param caption
@@ -1196,7 +1196,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Gets the caption of an item. The caption is generated as specified by the
      * item caption mode. See <code>setItemCaptionMode()</code> for more
      * details.
-     * 
+     *
      * @param itemId
      *            the id of the item to be queried.
      * @return the caption for specified item.
@@ -1275,7 +1275,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the icon for an item.
-     * 
+     *
      * @param itemId
      *            the id of the item to be assigned an icon.
      * @param icon
@@ -1294,7 +1294,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the item icon.
-     * 
+     *
      * @param itemId
      *            the id of the item to be assigned an icon.
      * @return the icon for the item or null, if not specified.
@@ -1324,12 +1324,12 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the item caption mode.
-     * 
+     *
      * See {@link ItemCaptionMode} for a description of the modes.
      * <p>
      * {@link ItemCaptionMode#EXPLICIT_DEFAULTS_ID} is the default mode.
      * </p>
-     * 
+     *
      * @param mode
      *            the One of the modes listed above.
      */
@@ -1342,7 +1342,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the item caption mode.
-     * 
+     *
      * <p>
      * The mode can be one of the following ones:
      * <ul>
@@ -1365,7 +1365,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * The <code>ITEM_CAPTION_MODE_EXPLICIT_DEFAULTS_ID</code> is the default
      * mode.
      * </p>
-     * 
+     *
      * @return the One of the modes listed above.
      */
     public ItemCaptionMode getItemCaptionMode() {
@@ -1374,7 +1374,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the item caption property.
-     * 
+     *
      * <p>
      * Setting the id to a existing property implicitly sets the item caption
      * mode to <code>ITEM_CAPTION_MODE_PROPERTY</code>. If the object is in
@@ -1390,10 +1390,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * default
      * </p>
      * .
-     * 
+     *
      * @param propertyId
      *            the id of the property.
-     * 
+     *
      */
     public void setItemCaptionPropertyId(Object propertyId) {
         if (propertyId != null) {
@@ -1411,7 +1411,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the item caption property.
-     * 
+     *
      * @return the Id of the property used as item caption source.
      */
     public Object getItemCaptionPropertyId() {
@@ -1420,24 +1420,24 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the item icon property.
-     * 
+     *
      * <p>
      * If the property id is set to a valid value, each item is given an icon
      * got from the given property of the items. The type of the property must
      * be assignable to Resource.
      * </p>
-     * 
+     *
      * <p>
      * Note : The icons set with <code>setItemIcon</code> function override the
      * icons from the property.
      * </p>
-     * 
+     *
      * <p>
      * Setting the property id to null disables this feature. The id is null by
      * default
      * </p>
      * .
-     * 
+     *
      * @param propertyId
      *            the id of the property that specifies icons for items or null
      * @throws IllegalArgumentException
@@ -1462,24 +1462,24 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Gets the item icon property.
-     * 
+     *
      * <p>
      * If the property id is set to a valid value, each item is given an icon
      * got from the given property of the items. The type of the property must
      * be assignable to Icon.
      * </p>
-     * 
+     *
      * <p>
      * Note : The icons set with <code>setItemIcon</code> function override the
      * icons from the property.
      * </p>
-     * 
+     *
      * <p>
      * Setting the property id to null disables this feature. The id is null by
      * default
      * </p>
      * .
-     * 
+     *
      * @return the Id of the property containing the item icons.
      */
     public Object getItemIconPropertyId() {
@@ -1488,18 +1488,18 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Tests if an item is selected.
-     * 
+     *
      * <p>
      * In single select mode testing selection status of the item identified by
      * {@link #getNullSelectionItemId()} returns true if the value of the
      * property is null.
      * </p>
-     * 
+     *
      * @param itemId
      *            the Id the of the item to be tested.
      * @see #getNullSelectionItemId()
      * @see #setNullSelectionItemId(Object)
-     * 
+     *
      */
     public boolean isSelected(Object itemId) {
         if (itemId == null) {
@@ -1516,17 +1516,17 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Selects an item.
-     * 
+     *
      * <p>
      * In single select mode selecting item identified by
      * {@link #getNullSelectionItemId()} sets the value of the property to null.
      * </p>
-     * 
+     *
      * @param itemId
      *            the identifier of Item to be selected.
      * @see #getNullSelectionItemId()
      * @see #setNullSelectionItemId(Object)
-     * 
+     *
      */
     public void select(Object itemId) {
         if (!isMultiSelect()) {
@@ -1541,12 +1541,12 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Unselects an item.
-     * 
+     *
      * @param itemId
      *            the identifier of the Item to be unselected.
      * @see #getNullSelectionItemId()
      * @see #setNullSelectionItemId(Object)
-     * 
+     *
      */
     public void unselect(Object itemId) {
         if (isSelected(itemId)) {
@@ -1562,7 +1562,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Notifies this listener that the Containers contents has changed.
-     * 
+     *
      * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
      */
     @Override
@@ -1573,7 +1573,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Adds a new Property set change listener for this Container.
-     * 
+     *
      * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     @Override
@@ -1597,7 +1597,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Removes a previously registered Property set change listener.
-     * 
+     *
      * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     @Override
@@ -1623,7 +1623,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Adds an Item set change listener for the object.
-     * 
+     *
      * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     @Override
@@ -1647,7 +1647,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Removes the Item set change listener from the object.
-     * 
+     *
      * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     @Override
@@ -1695,7 +1695,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Lets the listener know a Containers Item set has changed.
-     * 
+     *
      * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
      */
     @Override
@@ -1752,7 +1752,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         /**
          * Gets the Property where the event occurred.
-         * 
+         *
          * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
          */
         @Override
@@ -1774,7 +1774,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         /**
          * Retrieves the Container whose contents have been modified.
-         * 
+         *
          * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer()
          */
         @Override
@@ -1787,7 +1787,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * For multi-selectable fields, also an empty collection of values is
      * considered to be an empty field.
-     * 
+     *
      * @see LegacyAbstractField#isEmpty().
      */
     @Override
@@ -1806,7 +1806,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * single-select mode, you can make an item represent the empty selection by
      * calling <code>setNullSelectionItemId()</code>. This way you can for
      * instance set an icon and caption for the null selection item.
-     * 
+     *
      * @param nullSelectionAllowed
      *            whether or not to allow empty selection
      * @see #setNullSelectionItemId(Object)
@@ -1821,7 +1821,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Checks if null empty selection is allowed by the user.
-     * 
+     *
      * @return whether or not empty selection is allowed
      * @see #setNullSelectionAllowed(boolean)
      */
@@ -1832,13 +1832,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Returns the item id that represents null value of this select in single
      * select mode.
-     * 
+     *
      * <p>
      * Data interface does not support nulls as item ids. Selecting the item
      * identified by this id is the same as selecting no items at all. This
      * setting only affects the single select mode.
      * </p>
-     * 
+     *
      * @return the Object Null value item id.
      * @see #setNullSelectionItemId(Object)
      * @see #isSelected(Object)
@@ -1850,13 +1850,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Sets the item id that represents null value of this select.
-     * 
+     *
      * <p>
      * Data interface does not support nulls as item ids. Selecting the item
      * identified by this id is the same as selecting no items at all. This
      * setting only affects the single select mode.
      * </p>
-     * 
+     *
      * @param nullSelectionItemId
      *            the nullSelectionItemId to set.
      * @see #getNullSelectionItemId()
@@ -1873,7 +1873,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Notifies the component that it is connected to an application.
-     * 
+     *
      * @see com.vaadin.legacy.ui.LegacyAbstractField#attach()
      */
     @Override
@@ -1883,7 +1883,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Detaches the component from application.
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#detach()
      */
     @Override
@@ -1907,9 +1907,9 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * "lazyloading" components should take care to add and remove listeners as
      * appropriate. Call addNotifierForItem() for each painted item (and
      * remember to clear).
-     * 
+     *
      * NOTE: singleton, use getCaptionChangeListener().
-     * 
+     *
      */
     protected class CaptionChangeListener implements
             Item.PropertySetChangeListener, Property.ValueChangeListener {
@@ -2004,7 +2004,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * given Item identifier(s). Criterion can be used only on a drop targets
      * that extends AbstractSelect like {@link Table} and {@link Tree}. The
      * target and identifiers of valid Items are given in constructor.
-     * 
+     *
      * @since 6.3
      */
     public static class TargetItemIs extends AbstractItemSetCriterion {
@@ -2033,11 +2033,11 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * Abstract helper class to implement item id based criterion.
-     * 
+     *
      * Note, inner class used not to open itemIdMapper for public access.
-     * 
+     *
      * @since 6.3
-     * 
+     *
      */
     private static abstract class AbstractItemSetCriterion
             extends ClientSideCriterion {
@@ -2072,7 +2072,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * This criterion accepts a only a {@link Transferable} that contains given
      * Item (practically its identifier) from a specific AbstractSelect.
-     * 
+     *
      * @since 6.3
      */
     public static class AcceptItem extends AbstractItemSetCriterion {
@@ -2111,7 +2111,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * TargetDetails implementation for subclasses of {@link AbstractSelect}
      * that implement {@link DropTarget}.
-     * 
+     *
      * @since 6.3
      */
     public class AbstractSelectTargetDetails extends TargetDetailsImpl {
@@ -2124,7 +2124,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Constructor that automatically converts itemIdOver key to
          * corresponding item Id
-         * 
+         *
          */
         protected AbstractSelectTargetDetails(
                 Map<String, Object> rawVariables) {
@@ -2139,7 +2139,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * If the drag operation is currently over an {@link Item}, this method
          * returns the identifier of that {@link Item}.
-         * 
+         *
          */
         public Object getItemIdOver() {
             return idOver;
@@ -2188,7 +2188,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Called by Table when a cell (and row) is painted or a item is painted
          * in Tree
-         * 
+         *
          * @param source
          *            The source of the generator, the Tree or Table the
          *            generator is attached to
@@ -2232,7 +2232,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Reads an Item from a design and inserts it into the data source.
      * Hierarchical select components should override this method to recursively
      * recursively read any child items as well.
-     * 
+     *
      * @since 7.5.0
      * @param child
      *            a child element representing the item
@@ -2242,7 +2242,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * @param context
      *            the DesignContext instance used in parsing
      * @return the item id of the new item
-     * 
+     *
      * @throws DesignException
      *             if the tag name of the {@code child} element is not
      *             {@code option}.
@@ -2290,7 +2290,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Writes the data source items to a design. Hierarchical select components
      * should override this method to only write the root items.
-     * 
+     *
      * @since 7.5.0
      * @param design
      *            the element into which to insert the items
@@ -2306,7 +2306,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Writes a data source Item to a design. Hierarchical select components
      * should override this method to recursively write any child items as well.
-     * 
+     *
      * @since 7.5.0
      * @param design
      *            the element into which to insert the item
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
index 6064d307bf..07a0da9a68 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.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
@@ -30,10 +30,10 @@ import com.vaadin.ui.declarative.DesignException;
 /**
  * Abstract base class for component containers that have only one child
  * component.
- * 
+ *
  * For component containers that support multiple children, inherit
  * {@link AbstractComponentContainer} instead of this class.
- * 
+ *
  * @since 7.0
  */
 public abstract class AbstractSingleComponentContainer extends AbstractComponent
@@ -90,7 +90,7 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
      * Fires the component attached event. This is called by the
      * {@link #setContent(Component)} method after the component has been set as
      * the content.
-     * 
+     *
      * @param component
      *            the component that has been added to this container.
      */
@@ -102,7 +102,7 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
      * Fires the component detached event. This is called by the
      * {@link #setContent(Component)} method after the content component has
      * been replaced by other content.
-     * 
+     *
      * @param component
      *            the component that has been removed from this container.
      */
@@ -118,13 +118,13 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
     /**
      * Sets the content of this container. The content is a component that
      * serves as the outermost item of the visual contents.
-     * 
+     *
      * The content must always be set, either with a constructor parameter or by
      * calling this method.
-     * 
+     *
      * Previous versions of Vaadin used a {@link VerticalLayout} with margins
      * enabled as the default content but that is no longer the case.
-     * 
+     *
      * @param content
      *            a component (typically a layout) to use as content
      */
@@ -158,7 +158,7 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
 
     /**
      * Utility method for removing a component from its parent (if possible).
-     * 
+     *
      * @param content
      *            component to remove
      */
@@ -285,7 +285,7 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -302,14 +302,14 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
      * contains multiple child elements, a DesignException is thrown. This
      * method should be overridden by subclasses whose design may contain
      * non-content child elements.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param children
      *            the child elements of the design that is being read
      * @param context
      *            the DesignContext instance used to parse the design
-     * 
+     *
      * @throws DesignException
      *             if there are multiple child elements
      * @throws DesignException
@@ -328,7 +328,7 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java
index c2fd23cf63..2bf93219fb 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.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
@@ -39,10 +39,10 @@ import com.vaadin.util.ReflectTools;
 
 /**
  * AbstractSplitPanel.
- * 
+ *
  * <code>AbstractSplitPanel</code> is base class for a component container that
  * can contain two components. The components are split by a divider element.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 6.5
  */
@@ -125,7 +125,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Add a component into this container. The component is added to the right
      * or under the previous component.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -145,7 +145,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Sets the first component of this split panel. Depending on the direction
      * the first component is shown at the top or to the left.
-     * 
+     *
      * @param c
      *            The component to use as first component
      */
@@ -168,7 +168,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Sets the second component of this split panel. Depending on the direction
      * the second component is shown at the bottom or to the right.
-     * 
+     *
      * @param c
      *            The component to use as second component
      */
@@ -191,7 +191,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Gets the first component of this split panel. Depending on the direction
      * this is either the component shown at the top or to the left.
-     * 
+     *
      * @return the first component of this split panel
      */
     public Component getFirstComponent() {
@@ -201,7 +201,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Gets the second component of this split panel. Depending on the direction
      * this is either the component shown at the top or to the left.
-     * 
+     *
      * @return the second component of this split panel
      */
     public Component getSecondComponent() {
@@ -210,7 +210,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Removes the component from this container.
-     * 
+     *
      * @param c
      *            the component to be removed.
      */
@@ -227,7 +227,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
 
@@ -239,7 +239,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components (zero, one or two)
      */
 
@@ -269,7 +269,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Moves the position of the splitter.
-     * 
+     *
      * @param pos
      *            the new size of the first region in the unit that was last
      *            used (default is percentage). Fractions are only allowed when
@@ -281,12 +281,12 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Moves the position of the splitter.
-     * 
+     *
      * @param pos
      *            the new size of the region in the unit that was last used
      *            (default is percentage). Fractions are only allowed when unit
      *            is percentage.
-     * 
+     *
      * @param reverse
      *            if set to true the split splitter position is measured by the
      *            second region else it is measured by the first region
@@ -297,7 +297,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Moves the position of the splitter with given position and unit.
-     * 
+     *
      * @param pos
      *            the new size of the first region. Fractions are only allowed
      *            when unit is percentage.
@@ -310,7 +310,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Moves the position of the splitter with given position and unit.
-     * 
+     *
      * @param pos
      *            the new size of the first region. Fractions are only allowed
      *            when unit is percentage.
@@ -319,7 +319,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      * @param reverse
      *            if set to true the split splitter position is measured by the
      *            second region else it is measured by the first region
-     * 
+     *
      */
     public void setSplitPosition(float pos, Unit unit, boolean reverse) {
         if (unit != Unit.PERCENTAGE && unit != Unit.PIXELS) {
@@ -341,7 +341,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Returns the current position of the splitter, in
      * {@link #getSplitPositionUnit()} units.
-     * 
+     *
      * @return position of the splitter
      */
     public float getSplitPosition() {
@@ -350,7 +350,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Returns the unit of position of the splitter
-     * 
+     *
      * @return unit of position of the splitter
      * @see #setSplitPosition(float, Unit)
      */
@@ -362,7 +362,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      * Is the split position reversed. By default the split position is measured
      * by the first region, but if split position is reversed the measuring is
      * done by the second region instead.
-     * 
+     *
      * @since 7.3.6
      * @return {@code true} if reversed, {@code false} otherwise.
      * @see #setSplitPosition(float, boolean)
@@ -374,7 +374,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Sets the minimum split position to the given position and unit. If the
      * split position is reversed, maximum and minimum are also reversed.
-     * 
+     *
      * @param pos
      *            the minimum position of the split
      * @param unit
@@ -389,7 +389,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Returns the current minimum position of the splitter, in
      * {@link #getMinSplitPositionUnit()} units.
-     * 
+     *
      * @return the minimum position of the splitter
      */
     public float getMinSplitPosition() {
@@ -398,7 +398,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Returns the unit of the minimum position of the splitter.
-     * 
+     *
      * @return the unit of the minimum position of the splitter
      */
     public Unit getMinSplitPositionUnit() {
@@ -408,7 +408,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Sets the maximum split position to the given position and unit. If the
      * split position is reversed, maximum and minimum are also reversed.
-     * 
+     *
      * @param pos
      *            the maximum position of the split
      * @param unit
@@ -423,7 +423,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Returns the current maximum position of the splitter, in
      * {@link #getMaxSplitPositionUnit()} units.
-     * 
+     *
      * @return the maximum position of the splitter
      */
     public float getMaxSplitPosition() {
@@ -432,7 +432,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Returns the unit of the maximum position of the splitter
-     * 
+     *
      * @return the unit of the maximum position of the splitter
      */
     public Unit getMaxSplitPositionUnit() {
@@ -442,7 +442,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Sets the maximum and minimum position of the splitter. If the split
      * position is reversed, maximum and minimum are also reversed.
-     * 
+     *
      * @param minPos
      *            the new minimum position
      * @param minPosUnit
@@ -477,7 +477,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Lock the SplitPanels position, disabling the user from dragging the split
      * handle.
-     * 
+     *
      * @param locked
      *            Set <code>true</code> if locked, <code>false</code> otherwise.
      */
@@ -488,7 +488,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Is the SplitPanel handle locked (user not allowed to change split
      * position by dragging).
-     * 
+     *
      * @return <code>true</code> if locked, <code>false</code> otherwise.
      */
     public boolean isLocked() {
@@ -498,7 +498,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * <code>SplitterClickListener</code> interface for listening for
      * <code>SplitterClickEvent</code> fired by a <code>SplitPanel</code>.
-     * 
+     *
      * @see SplitterClickEvent
      * @since 6.2
      */
@@ -510,7 +510,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
         /**
          * SplitPanel splitter has been clicked
-         * 
+         *
          * @param event
          *            SplitterClickEvent event.
          */
@@ -529,7 +529,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
     /**
      * Interface for listening for {@link SplitPositionChangeEvent}s fired by a
      * SplitPanel.
-     * 
+     *
      * @since 7.5.0
      */
     public interface SplitPositionChangeListener
@@ -541,7 +541,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
         /**
          * SplitPanel splitter position has been changed.
-         * 
+         *
          * @param event
          *            SplitPositionChangeEvent event.
          */
@@ -550,7 +550,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Event that indicates a change in SplitPanel's splitter position.
-     * 
+     *
      * @since 7.5.0
      */
     public static class SplitPositionChangeEvent extends Component.Event {
@@ -605,7 +605,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Register a listener to handle {@link SplitPositionChangeEvent}s.
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            {@link SplitPositionChangeListener} to be registered.
@@ -618,7 +618,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /**
      * Removes a {@link SplitPositionChangeListener}.
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            SplitPositionChangeListener to be removed.
@@ -649,7 +649,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/AbstractTextField.java
index a52ff79760..01bc04ae04 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractTextField.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
@@ -34,7 +34,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Abstract base class for text input components.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 8.0
  */
@@ -78,7 +78,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Returns the maximum number of characters in the field. Value -1 is
      * considered unlimited. Terminal may however have some technical limits.
-     * 
+     *
      * @return the maxLength
      */
     public int getMaxLength() {
@@ -88,7 +88,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Sets the maximum number of characters in the field. Value -1 is
      * considered unlimited. Terminal may however have some technical limits.
-     * 
+     *
      * @param maxLength
      *            the maxLength to set
      */
@@ -98,7 +98,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
 
     /**
      * Returns the current placeholder text.
-     * 
+     *
      * @see #setPlaceholder(String)
      * @return the placeholder text
      */
@@ -109,7 +109,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Sets the placeholder text. The placeholder is text that is displayed when
      * the field would otherwise be empty, to prompt the user for input.
-     * 
+     *
      * @param placeholder
      *            the placeholder text to set
      */
@@ -131,9 +131,9 @@ public abstract class AbstractTextField extends AbstractField<String> {
 
     /**
      * Sets the range of text to be selected.
-     * 
+     *
      * As a side effect the field will become focused.
-     * 
+     *
      * @param pos
      *            the position of the first character to be selected
      * @param length
@@ -148,7 +148,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Sets the cursor position in the field. As a side effect the field will
      * become focused.
-     * 
+     *
      * @param pos
      *            the position for the cursor
      */
@@ -159,7 +159,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
 
     /**
      * Returns the last known cursor position of the field.
-     * 
+     *
      */
     public int getCursorPosition() {
         return getState(false).cursorPosition;
@@ -168,11 +168,11 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Adds a {@link FocusListener} to this component, which gets fired when
      * this component receives keyboard focus.
-     * 
+     *
      * @param listener
      *            the focus listener
      * @return a registration for the listener
-     * 
+     *
      * @see Registration
      */
     public Registration addFocusListener(FocusListener listener) {
@@ -185,11 +185,11 @@ public abstract class AbstractTextField extends AbstractField<String> {
     /**
      * Adds a {@link BlurListener} to this component, which gets fired when this
      * component loses keyboard focus.
-     * 
+     *
      * @param listener
      *            the blur listener
      * @return a registration for the listener
-     * 
+     *
      * @see Registration
      */
     public Registration addBlurListener(BlurListener listener) {
@@ -203,7 +203,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
      * Gets the number of columns in the editor. If the number of columns is set
      * 0, the actual number of displayed columns is determined implicitly by the
      * adapter.
-     * 
+     *
      * @return the number of columns in the editor.
      */
     public int getColumns() {
@@ -214,7 +214,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
      * Sets the number of columns in the editor. If the number of columns is set
      * 0, the actual number of displayed columns is determined implicitly by the
      * adapter.
-     * 
+     *
      * @param columns
      *            the number of columns to set.
      */
@@ -239,9 +239,9 @@ public abstract class AbstractTextField extends AbstractField<String> {
 
     /**
      * Returns the currently set {@link ValueChangeMode}.
-     * 
+     *
      * @return the mode used to trigger {@link ValueChange}s.
-     * 
+     *
      * @see ValueChangeMode
      */
     public ValueChangeMode getValueChangeMode() {
@@ -272,7 +272,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
      * {@link ValueChange}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 ValueChange}s are
      *         triggered.
      */
@@ -314,7 +314,7 @@ public abstract class AbstractTextField extends AbstractField<String> {
 
     /**
      * Checks if the field is empty.
-     * 
+     *
      * @return true if the field value is an empty string, false otherwise
      */
     public boolean isEmpty() {
diff --git a/server/src/main/java/com/vaadin/ui/Accordion.java b/server/src/main/java/com/vaadin/ui/Accordion.java
index 1d53937d24..331c503d17 100644
--- a/server/src/main/java/com/vaadin/ui/Accordion.java
+++ b/server/src/main/java/com/vaadin/ui/Accordion.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
@@ -20,12 +20,12 @@ import com.vaadin.shared.ui.accordion.AccordionState;
 /**
  * An accordion is a component similar to a {@link TabSheet}, but with a
  * vertical orientation and the selected component presented between tabs.
- * 
+ *
  * Closable tabs are not supported by the accordion.
- * 
+ *
  * The {@link Accordion} can be styled with the .v-accordion, .v-accordion-item,
  * .v-accordion-item-first and .v-accordion-item-caption styles.
- * 
+ *
  * @see TabSheet
  */
 public class Accordion extends TabSheet {
@@ -38,7 +38,7 @@ public class Accordion extends TabSheet {
 
     /**
      * Constructs a new accordion containing the given components.
-     * 
+     *
      * @param components
      *            The components to add to the accordion. Each component will be
      *            added to a separate tab.
@@ -50,7 +50,7 @@ public class Accordion extends TabSheet {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.TabSheet#getState()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/Alignment.java b/server/src/main/java/com/vaadin/ui/Alignment.java
index 5810c153b8..06183ec927 100644
--- a/server/src/main/java/com/vaadin/ui/Alignment.java
+++ b/server/src/main/java/com/vaadin/ui/Alignment.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
@@ -54,7 +54,7 @@ public final class Alignment implements Serializable {
     /**
      * Returns a bitmask representation of the alignment value. Used internally
      * by terminal.
-     * 
+     *
      * @return the bitmask representation of the alignment value
      */
     public int getBitMask() {
@@ -63,7 +63,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Checks if component is aligned to the top of the available space.
-     * 
+     *
      * @return true if aligned top
      */
     public boolean isTop() {
@@ -72,7 +72,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Checks if component is aligned to the bottom of the available space.
-     * 
+     *
      * @return true if aligned bottom
      */
     public boolean isBottom() {
@@ -81,7 +81,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Checks if component is aligned to the left of the available space.
-     * 
+     *
      * @return true if aligned left
      */
     public boolean isLeft() {
@@ -90,7 +90,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Checks if component is aligned to the right of the available space.
-     * 
+     *
      * @return true if aligned right
      */
     public boolean isRight() {
@@ -100,7 +100,7 @@ public final class Alignment implements Serializable {
     /**
      * Checks if component is aligned middle (vertically center) of the
      * available space.
-     * 
+     *
      * @return true if aligned bottom
      */
     public boolean isMiddle() {
@@ -111,7 +111,7 @@ public final class Alignment implements Serializable {
     /**
      * Checks if component is aligned center (horizontally) of the available
      * space.
-     * 
+     *
      * @return true if aligned center
      */
     public boolean isCenter() {
@@ -121,7 +121,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Returns string representation of vertical alignment.
-     * 
+     *
      * @return vertical alignment as CSS value
      */
     public String getVerticalAlignment() {
@@ -135,7 +135,7 @@ public final class Alignment implements Serializable {
 
     /**
      * Returns string representation of horizontal alignment.
-     * 
+     *
      * @return horizontal alignment as CSS value
      */
     public String getHorizontalAlignment() {
diff --git a/server/src/main/java/com/vaadin/ui/Audio.java b/server/src/main/java/com/vaadin/ui/Audio.java
index 2ba7b447fd..056bde4280 100644
--- a/server/src/main/java/com/vaadin/ui/Audio.java
+++ b/server/src/main/java/com/vaadin/ui/Audio.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,19 +24,19 @@ import com.vaadin.shared.ui.audio.AudioState;
  * such is only supported in browsers that support HTML5 media markup. Browsers
  * that do not support HTML5 display the text or HTML set by calling
  * {@link #setAltText(String)}.
- * 
+ *
  * A flash-player fallback can be implemented by setting HTML content allowed (
  * {@link #setHtmlContentAllowed(boolean)} and calling
  * {@link #setAltText(String)} with the flash player markup. An example of flash
  * fallback can be found at the <a href=
  * "https://developer.mozilla.org/En/Using_audio_and_video_in_Firefox#Using_Flash"
  * >Mozilla Developer Network</a>.
- * 
+ *
  * Multiple sources can be specified. Which of the sources is used is selected
  * by the browser depending on which file formats it supports. See
  * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a
  * table of formats supported by different browsers.
- * 
+ *
  * @author Vaadin Ltd
  * @since 6.7.0
  */
diff --git a/server/src/main/java/com/vaadin/ui/BrowserFrame.java b/server/src/main/java/com/vaadin/ui/BrowserFrame.java
index 8a2e8e6cfa..cbb346db30 100644
--- a/server/src/main/java/com/vaadin/ui/BrowserFrame.java
+++ b/server/src/main/java/com/vaadin/ui/BrowserFrame.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
@@ -21,7 +21,7 @@ import com.vaadin.shared.ui.browserframe.BrowserFrameState;
 /**
  * A component displaying an embedded web page. Implemented as a HTML
  * <code>iframe</code> element.
- * 
+ *
  * @author Vaadin Ltd.
  * @version @VERSION@
  * @since 7.0
@@ -37,7 +37,7 @@ public class BrowserFrame extends AbstractEmbedded {
 
     /**
      * Creates a new empty browser frame with the given caption.
-     * 
+     *
      * @param caption
      *            The caption for the component
      */
@@ -47,7 +47,7 @@ public class BrowserFrame extends AbstractEmbedded {
 
     /**
      * Creates a new browser frame with the given caption and content.
-     * 
+     *
      * @param caption
      *            The caption for the component.
      * @param source
diff --git a/server/src/main/java/com/vaadin/ui/Button.java b/server/src/main/java/com/vaadin/ui/Button.java
index 1c35cf91a6..80b8bdfd32 100644
--- a/server/src/main/java/com/vaadin/ui/Button.java
+++ b/server/src/main/java/com/vaadin/ui/Button.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
@@ -39,7 +39,7 @@ import com.vaadin.util.ReflectTools;
 
 /**
  * A generic button component.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -74,7 +74,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Creates a new push button with the given caption.
-     * 
+     *
      * @param caption
      *            the Button caption.
      */
@@ -85,7 +85,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Creates a new push button with the given icon.
-     * 
+     *
      * @param icon
      *            the icon
      */
@@ -96,7 +96,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Creates a new push button with the given caption and icon.
-     * 
+     *
      * @param caption
      *            the caption
      * @param icon
@@ -110,7 +110,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Creates a new push button with a click listener.
-     * 
+     *
      * @param caption
      *            the Button caption.
      * @param listener
@@ -123,7 +123,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Click event. This event is thrown, when the button is clicked.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -133,7 +133,7 @@ public class Button extends AbstractFocusable
 
         /**
          * New instance of text change event.
-         * 
+         *
          * @param source
          *            the Source of the event.
          */
@@ -144,7 +144,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Constructor with mouse details
-         * 
+         *
          * @param source
          *            The source where the click took place
          * @param details
@@ -157,7 +157,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Gets the Button where the event occurred.
-         * 
+         *
          * @return the Source of the event.
          */
         public Button getButton() {
@@ -167,7 +167,7 @@ public class Button extends AbstractFocusable
         /**
          * Returns the mouse position (x coordinate) when the click took place.
          * The position is relative to the browser client area.
-         * 
+         *
          * @return The mouse cursor x position or -1 if unknown
          */
         public int getClientX() {
@@ -181,7 +181,7 @@ public class Button extends AbstractFocusable
         /**
          * Returns the mouse position (y coordinate) when the click took place.
          * The position is relative to the browser client area.
-         * 
+         *
          * @return The mouse cursor y position or -1 if unknown
          */
         public int getClientY() {
@@ -195,7 +195,7 @@ public class Button extends AbstractFocusable
         /**
          * Returns the relative mouse position (x coordinate) when the click
          * took place. The position is relative to the clicked component.
-         * 
+         *
          * @return The mouse cursor x position relative to the clicked layout
          *         component or -1 if no x coordinate available
          */
@@ -210,7 +210,7 @@ public class Button extends AbstractFocusable
         /**
          * Returns the relative mouse position (y coordinate) when the click
          * took place. The position is relative to the clicked component.
-         * 
+         *
          * @return The mouse cursor y position relative to the clicked layout
          *         component or -1 if no y coordinate available
          */
@@ -224,7 +224,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Checks if the Alt key was down when the mouse event took place.
-         * 
+         *
          * @return true if Alt was down when the event occured, false otherwise
          *         or if unknown
          */
@@ -238,7 +238,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Checks if the Ctrl key was down when the mouse event took place.
-         * 
+         *
          * @return true if Ctrl was pressed when the event occured, false
          *         otherwise or if unknown
          */
@@ -252,7 +252,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Checks if the Meta key was down when the mouse event took place.
-         * 
+         *
          * @return true if Meta was pressed when the event occured, false
          *         otherwise or if unknown
          */
@@ -266,7 +266,7 @@ public class Button extends AbstractFocusable
 
         /**
          * Checks if the Shift key was down when the mouse event took place.
-         * 
+         *
          * @return true if Shift was pressed when the event occured, false
          *         otherwise or if unknown
          */
@@ -282,7 +282,7 @@ public class Button extends AbstractFocusable
     /**
      * Interface for listening for a {@link ClickEvent} fired by a
      * {@link Component}.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -295,7 +295,7 @@ public class Button extends AbstractFocusable
         /**
          * Called when a {@link Button} has been clicked. A reference to the
          * button is given by {@link ClickEvent#getButton()}.
-         * 
+         *
          * @param event
          *            An event containing information about the click.
          */
@@ -305,7 +305,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Adds the button click listener.
-     * 
+     *
      * @param listener
      *            the Listener to be added.
      */
@@ -325,7 +325,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Removes the button click listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -345,7 +345,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Simulates a button click, notifying all server-side listeners.
-     * 
+     *
      * No action is taken is the button is disabled.
      */
     public void click() {
@@ -356,7 +356,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Fires a click event to all listeners without any event details.
-     * 
+     *
      * In subclasses, override {@link #fireClick(MouseEventDetails)} instead of
      * this method.
      */
@@ -366,7 +366,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Fires a click event to all listeners.
-     * 
+     *
      * @param details
      *            MouseEventDetails from which keyboard modifiers and other
      *            information about the mouse click can be obtained. If the
@@ -387,7 +387,7 @@ public class Button extends AbstractFocusable
      * Makes it possible to invoke a click on this button by pressing the given
      * {@link KeyCode} and (optional) {@link ModifierKey}s.<br/>
      * The shortcut is global (bound to the containing Window).
-     * 
+     *
      * @param keyCode
      *            the keycode for invoking the shortcut
      * @param modifiers
@@ -418,7 +418,7 @@ public class Button extends AbstractFocusable
     /**
      * A {@link ShortcutListener} specifically made to define a keyboard
      * shortcut that invokes a click on the given button.
-     * 
+     *
      */
     public static class ClickShortcut extends ShortcutListener {
         protected Button button;
@@ -426,7 +426,7 @@ public class Button extends AbstractFocusable
         /**
          * Creates a keyboard shortcut for clicking the given button using the
          * shorthand notation defined in {@link ShortcutAction}.
-         * 
+         *
          * @param button
          *            to be clicked when the shortcut is invoked
          * @param shorthandCaption
@@ -440,7 +440,7 @@ public class Button extends AbstractFocusable
         /**
          * Creates a keyboard shortcut for clicking the given button using the
          * given {@link KeyCode} and {@link ModifierKey}s.
-         * 
+         *
          * @param button
          *            to be clicked when the shortcut is invoked
          * @param keyCode
@@ -456,7 +456,7 @@ public class Button extends AbstractFocusable
         /**
          * Creates a keyboard shortcut for clicking the given button using the
          * given {@link KeyCode}.
-         * 
+         *
          * @param button
          *            to be clicked when the shortcut is invoked
          * @param keyCode
@@ -475,7 +475,7 @@ public class Button extends AbstractFocusable
     /**
      * Determines if a button is automatically disabled when clicked. See
      * {@link #setDisableOnClick(boolean)} for details.
-     * 
+     *
      * @return true if the button is disabled when clicked, false otherwise
      */
     public boolean isDisableOnClick() {
@@ -491,7 +491,7 @@ public class Button extends AbstractFocusable
      * calling {@link #click()} method programmatically. Also, if developer
      * wants to re-enable the button, it needs to be done programmatically.
      * </p>
-     * 
+     *
      * @param disableOnClick
      *            true to disable button when it is clicked, false otherwise
      */
@@ -511,10 +511,10 @@ public class Button extends AbstractFocusable
 
     /**
      * Sets the component's icon and alt text.
-     * 
+     *
      * An alt text is shown when an image could not be loaded, and read by
      * assisitve devices.
-     * 
+     *
      * @param icon
      *            the icon to be shown with the component's caption.
      * @param iconAltText
@@ -527,7 +527,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Returns the icon's alt text.
-     * 
+     *
      * @return String with the alt text
      */
     public String getIconAlternateText() {
@@ -541,11 +541,11 @@ public class Button extends AbstractFocusable
     /**
      * Set whether the caption text is rendered as HTML or not. You might need
      * to re-theme button to allow higher content than the original text style.
-     * 
+     *
      * If set to true, the captions are passed to the browser as html and the
      * developer is responsible for ensuring no harmful html is used. If set to
      * false, the content is passed to the browser as plain text.
-     * 
+     *
      * @param htmlContentAllowed
      *            <code>true</code> if caption is rendered as HTML,
      *            <code>false</code> otherwise
@@ -556,7 +556,7 @@ public class Button extends AbstractFocusable
 
     /**
      * Return HTML rendering setting
-     * 
+     *
      * @return <code>true</code> if the caption text is to be rendered as HTML,
      *         <code>false</code> otherwise
      */
@@ -566,7 +566,7 @@ public class Button extends AbstractFocusable
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -602,7 +602,7 @@ public class Button extends AbstractFocusable
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#getCustomAttributes()
      */
     @Override
@@ -620,7 +620,7 @@ public class Button extends AbstractFocusable
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/Calendar.java b/server/src/main/java/com/vaadin/ui/Calendar.java
index 41f99049dc..741e2bb45a 100644
--- a/server/src/main/java/com/vaadin/ui/Calendar.java
+++ b/server/src/main/java/com/vaadin/ui/Calendar.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
@@ -97,21 +97,21 @@ import com.vaadin.ui.declarative.DesignContext;
  * be visualized in the variable length view depending on the start and end
  * dates.
  * </p>
- * 
+ *
  * <li>You can set the viewable date range with the {@link #setStartDate(Date)}
  * and {@link #setEndDate(Date)} methods. Calendar has a default date range of
  * one week</li>
- * 
+ *
  * <li>Calendar has two kind of views: monthly and weekly view</li>
- * 
+ *
  * <li>If date range is seven days or shorter, the weekly view is used.</li>
- * 
+ *
  * <li>Calendar queries its events by using a
  * {@link com.vaadin.addon.calendar.event.CalendarEventProvider
  * CalendarEventProvider}. By default, a
  * {@link com.vaadin.addon.calendar.event.BasicEventProvider BasicEventProvider}
  * is used.</li>
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -216,7 +216,7 @@ public class Calendar extends AbstractComponent
     private KeyMapper<Action> actionMapper = null;
 
     /**
-     * 
+     *
      */
     private CalendarServerRpcImpl rpc = new CalendarServerRpcImpl();
 
@@ -240,7 +240,7 @@ public class Calendar extends AbstractComponent
     /**
      * Construct a Vaadin Calendar with a BasicEventProvider and the provided
      * caption. Default date range is one week.
-     * 
+     *
      * @param caption
      */
     public Calendar(String caption) {
@@ -253,13 +253,13 @@ public class Calendar extends AbstractComponent
      * obligatory, because calendar component will query active events through
      * it.
      * </p>
-     * 
+     *
      * <p>
      * By default, Vaadin Calendar will show dates from the start of the current
      * week to the end of the current week. Use {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)} to change this.
      * </p>
-     * 
+     *
      * @param eventProvider
      *            Event provider, cannot be null.
      */
@@ -273,13 +273,13 @@ public class Calendar extends AbstractComponent
      * provider is obligatory, because calendar component will query active
      * events through it.
      * </p>
-     * 
+     *
      * <p>
      * By default, Vaadin Calendar will show dates from the start of the current
      * week to the end of the current week. Use {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)} to change this.
      * </p>
-     * 
+     *
      * @param eventProvider
      *            Event provider, cannot be null.
      */
@@ -337,7 +337,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Gets the calendar's start date.
-     * 
+     *
      * @return First visible date.
      */
     public Date getStartDate() {
@@ -357,7 +357,7 @@ public class Calendar extends AbstractComponent
      * Sets start date for the calendar. This and {@link #setEndDate(Date)}
      * control the range of dates visible on the component. The default range is
      * one week.
-     * 
+     *
      * @param date
      *            First visible date to show.
      */
@@ -370,7 +370,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Gets the calendar's end date.
-     * 
+     *
      * @return Last visible date.
      */
     public Date getEndDate() {
@@ -389,10 +389,10 @@ public class Calendar extends AbstractComponent
     /**
      * Sets end date for the calendar. Starting from startDate, only six weeks
      * will be shown if duration to endDate is longer than six weeks.
-     * 
+     *
      * This and {@link #setStartDate(Date)} control the range of dates visible
      * on the component. The default range is one week.
-     * 
+     *
      * @param date
      *            Last visible date to show.
      */
@@ -408,7 +408,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Sets the locale to be used in the Calendar component.
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#setLocale(java.util.Locale)
      */
     @Override
@@ -673,7 +673,7 @@ public class Calendar extends AbstractComponent
     /**
      * Gets currently active time format. Value is either TimeFormat.Format12H
      * or TimeFormat.Format24H.
-     * 
+     *
      * @return TimeFormat Format for the time.
      */
     public TimeFormat getTimeFormat() {
@@ -698,7 +698,7 @@ public class Calendar extends AbstractComponent
     /**
      * Example: <code>setTimeFormat(TimeFormat.Format12H);</code></br>
      * Set to null, if you want the format being defined by the locale.
-     * 
+     *
      * @param format
      *            Set 12h or 24h format. Default is defined by the locale.
      */
@@ -709,7 +709,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Returns a time zone that is currently used by this component.
-     * 
+     *
      * @return Component's Time zone
      */
     public TimeZone getTimeZone() {
@@ -722,7 +722,7 @@ public class Calendar extends AbstractComponent
     /**
      * Set time zone that this component will use. Null value sets the default
      * time zone.
-     * 
+     *
      * @param zone
      *            Time zone to use
      */
@@ -742,7 +742,7 @@ public class Calendar extends AbstractComponent
      * Get the internally used Calendar instance. This is the currently used
      * instance of {@link java.util.Calendar} but is bound to change during the
      * lifetime of the component.
-     * 
+     *
      * @return the currently used java calendar
      */
     public java.util.Calendar getInternalCalendar() {
@@ -755,13 +755,13 @@ public class Calendar extends AbstractComponent
      * monthly and the weekly view. The general contract is that <b>firstDay <
      * lastDay</b>.
      * </p>
-     * 
+     *
      * <p>
      * Note that this only affects the rendering process. Events are still
      * requested by the dates set by {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)}.
      * </p>
-     * 
+     *
      * @param firstDay
      *            the first day of the week to show, between 1 and 7
      */
@@ -776,7 +776,7 @@ public class Calendar extends AbstractComponent
     /**
      * Get the first visible day of the week. Returns the weekdays as integers
      * represented by {@link java.util.Calendar#DAY_OF_WEEK}
-     * 
+     *
      * @return An integer representing the week day according to
      *         {@link java.util.Calendar#DAY_OF_WEEK}
      */
@@ -790,13 +790,13 @@ public class Calendar extends AbstractComponent
      * monthly and the weekly view. The general contract is that <b>firstDay <
      * lastDay</b>.
      * </p>
-     * 
+     *
      * <p>
      * Note that this only affects the rendering process. Events are still
      * requested by the dates set by {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)}.
      * </p>
-     * 
+     *
      * @param lastDay
      *            the first day of the week to show, between 1 and 7
      */
@@ -811,7 +811,7 @@ public class Calendar extends AbstractComponent
     /**
      * Get the last visible day of the week. Returns the weekdays as integers
      * represented by {@link java.util.Calendar#DAY_OF_WEEK}
-     * 
+     *
      * @return An integer representing the week day according to
      *         {@link java.util.Calendar#DAY_OF_WEEK}
      */
@@ -824,13 +824,13 @@ public class Calendar extends AbstractComponent
      * This method restricts the hours that are shown per day. This affects the
      * weekly view. The general contract is that <b>firstHour < lastHour</b>.
      * </p>
-     * 
+     *
      * <p>
      * Note that this only affects the rendering process. Events are still
      * requested by the dates set by {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)}.
      * </p>
-     * 
+     *
      * @param firstHour
      *            the first hour of the day to show, between 0 and 23
      */
@@ -845,7 +845,7 @@ public class Calendar extends AbstractComponent
     /**
      * Returns the first visible hour in the week view. Returns the hour using a
      * 24h time format
-     * 
+     *
      */
     public int getFirstVisibleHourOfDay() {
         return firstHour;
@@ -856,13 +856,13 @@ public class Calendar extends AbstractComponent
      * This method restricts the hours that are shown per day. This affects the
      * weekly view. The general contract is that <b>firstHour < lastHour</b>.
      * </p>
-     * 
+     *
      * <p>
      * Note that this only affects the rendering process. Events are still
      * requested by the dates set by {@link #setStartDate(Date)} and
      * {@link #setEndDate(Date)}.
      * </p>
-     * 
+     *
      * @param lastHour
      *            the first hour of the day to show, between 0 and 23
      */
@@ -877,7 +877,7 @@ public class Calendar extends AbstractComponent
     /**
      * Returns the last visible hour in the week view. Returns the hour using a
      * 24h time format
-     * 
+     *
      */
     public int getLastVisibleHourOfDay() {
         return lastHour;
@@ -885,7 +885,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Gets the date caption format for the weekly view.
-     * 
+     *
      * @return The pattern used in caption of dates in weekly view.
      */
     public String getWeeklyCaptionFormat() {
@@ -895,7 +895,7 @@ public class Calendar extends AbstractComponent
     /**
      * Sets custom date format for the weekly view. This is the caption of the
      * date. Format could be like "mmm MM/dd".
-     * 
+     *
      * @param dateFormatPattern
      *            The date caption pattern.
      */
@@ -919,7 +919,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Get the day of week by the given calendar and its locale
-     * 
+     *
      * @param calendar
      *            The calendar to use
      * @return
@@ -937,7 +937,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Is the user allowed to trigger events which alters the events
-     * 
+     *
      * @return true if the client is allowed to send changes to server
      * @see #isEventClickAllowed()
      */
@@ -949,7 +949,7 @@ public class Calendar extends AbstractComponent
      * Is the user allowed to trigger click events. Returns {@code true} by
      * default. Subclass can override this method to disallow firing event
      * clicks got from the client side.
-     * 
+     *
      * @return true if the client is allowed to click events
      * @see #isClientChangeAllowed()
      * @deprecated As of 7.4, override {@link #fireEventClick(Integer)} instead.
@@ -962,7 +962,7 @@ public class Calendar extends AbstractComponent
     /**
      * Fires an event when the user selecing moving forward/backward in the
      * calendar.
-     * 
+     *
      * @param forward
      *            True if the calendar moved forward else backward is assumed.
      */
@@ -976,7 +976,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Fires an event move event to all server side move listerners
-     * 
+     *
      * @param index
      *            The index of the event in the events list
      * @param newFromDatetime
@@ -998,7 +998,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Fires event when a week was clicked in the calendar.
-     * 
+     *
      * @param week
      *            The week that was clicked
      * @param year
@@ -1011,7 +1011,7 @@ public class Calendar extends AbstractComponent
     /**
      * Fires event when a date was clicked in the calendar. Uses an existing
      * event from the event cache.
-     * 
+     *
      * @param index
      *            The index of the event in the event cache.
      */
@@ -1022,7 +1022,7 @@ public class Calendar extends AbstractComponent
     /**
      * Fires event when a date was clicked in the calendar. Creates a new event
      * for the date and passes it to the listener.
-     * 
+     *
      * @param date
      *            The date and time that was clicked
      */
@@ -1034,7 +1034,7 @@ public class Calendar extends AbstractComponent
      * Fires an event range selected event. The event is fired when a user
      * highlights an area in the calendar. The highlighted areas start and end
      * dates are returned as arguments.
-     * 
+     *
      * @param from
      *            The start date and time of the highlighted area
      * @param to
@@ -1051,7 +1051,7 @@ public class Calendar extends AbstractComponent
      * event in the calendar causing the time range of the event to increase or
      * decrease. The new start and end times are returned as arguments to this
      * method.
-     * 
+     *
      * @param index
      *            The index of the event in the event cache
      * @param startTime
@@ -1076,7 +1076,7 @@ public class Calendar extends AbstractComponent
     /**
      * Localized display names for week days starting from sunday. Returned
      * array's length is always 7.
-     * 
+     *
      * @return Array of localized weekday names.
      */
     protected String[] getDayNamesShort() {
@@ -1087,7 +1087,7 @@ public class Calendar extends AbstractComponent
     /**
      * Localized display names for months starting from January. Returned
      * array's length is always 12.
-     * 
+     *
      * @return Array of localized month names.
      */
     protected String[] getMonthNamesShort() {
@@ -1098,7 +1098,7 @@ public class Calendar extends AbstractComponent
     /**
      * Gets a date that is first day in the week that target given date belongs
      * to.
-     * 
+     *
      * @param date
      *            Target date
      * @return Date that is first date in same week that given date is.
@@ -1116,7 +1116,7 @@ public class Calendar extends AbstractComponent
     /**
      * Gets a date that is last day in the week that target given date belongs
      * to.
-     * 
+     *
      * @param date
      *            Target date
      * @return Date that is last date in same week that given date is.
@@ -1137,7 +1137,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Calculates the end time of the day using the given calendar and date
-     * 
+     *
      * @param date
      * @param calendar
      *            the calendar instance to be used in the calculation. The given
@@ -1165,7 +1165,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Calculates the end time of the day using the given calendar and date
-     * 
+     *
      * @param date
      * @param calendar
      *            the calendar instance to be used in the calculation. The given
@@ -1189,7 +1189,7 @@ public class Calendar extends AbstractComponent
     /**
      * Finds the first day of the week and returns a day representing the start
      * of that day
-     * 
+     *
      * @param start
      *            The actual date
      * @param expandToFullWeek
@@ -1220,7 +1220,7 @@ public class Calendar extends AbstractComponent
     /**
      * Finds the last day of the week and returns a day representing the end of
      * that day
-     * 
+     *
      * @param end
      *            The actual date
      * @param expandToFullWeek
@@ -1254,7 +1254,7 @@ public class Calendar extends AbstractComponent
      * is used to query for events to show, and must be non-null. By default a
      * {@link com.vaadin.addon.calendar.event.BasicEventProvider
      * BasicEventProvider} is used.
-     * 
+     *
      * @param calendarEventProvider
      *            the calendarEventProvider to set. Cannot be null.
      */
@@ -1289,7 +1289,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.ui.CalendarEvents.EventChangeListener#
      * eventChange (com.vaadin.addon.calendar.ui.CalendarEvents.EventChange)
      */
@@ -1305,7 +1305,7 @@ public class Calendar extends AbstractComponent
      * Set the handler for the given type information. Mirrors
      * {@link #addListener(String, Class, Object, Method) addListener} from
      * AbstractComponent
-     * 
+     *
      * @param eventId
      *            A unique id for the event. Usually one of
      *            {@link CalendarEventId}
@@ -1332,7 +1332,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier
      * #addListener
@@ -1346,7 +1346,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier
      * #addListener
@@ -1360,7 +1360,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier
      * #addListener
@@ -1374,7 +1374,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier
      * #addListener
@@ -1388,7 +1388,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.NavigationNotifier
      * #addListener
@@ -1402,7 +1402,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeNotifier
      * #addListener
@@ -1417,7 +1417,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.RangeSelectNotifier
      * #addListener
@@ -1433,7 +1433,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveNotifier
      * #addListener
@@ -1447,7 +1447,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents.
      * CalendarEventNotifier #getHandler(java.lang.String)
      */
@@ -1467,7 +1467,7 @@ public class Calendar extends AbstractComponent
     /**
      * Set the drop handler for the calendar See {@link DropHandler} for
      * implementation details.
-     * 
+     *
      * @param dropHandler
      *            The drop handler to set
      */
@@ -1477,7 +1477,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map)
      */
@@ -1517,14 +1517,14 @@ public class Calendar extends AbstractComponent
      * Sets a container as a data source for the events in the calendar.
      * Equivalent for doing
      * <code>Calendar.setEventProvider(new ContainerEventProvider(container))</code>
-     * 
+     *
      * Use this method if you are adding a container which uses the default
      * property ids like {@link BeanItemContainer} for instance. If you are
      * using custom properties instead use
      * {@link Calendar#setContainerDataSource(com.vaadin.data.Container.Indexed, Object, Object, Object, Object, Object)}
-     * 
+     *
      * Please note that the container must be sorted by date!
-     * 
+     *
      * @param container
      *            The container to use as a datasource
      */
@@ -1553,9 +1553,9 @@ public class Calendar extends AbstractComponent
      * Sets a container as a data source for the events in the calendar.
      * Equivalent for doing
      * <code>Calendar.setEventProvider(new ContainerEventProvider(container))</code>
-     * 
+     *
      * Please note that the container must be sorted by date!
-     * 
+     *
      * @param container
      *            The container to use as a data source
      * @param captionProperty
@@ -1603,7 +1603,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
@@ -1615,7 +1615,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
@@ -1634,7 +1634,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
@@ -1654,7 +1654,7 @@ public class Calendar extends AbstractComponent
     /**
      * Adds an action handler to the calender that handles event produced by the
      * context menu.
-     * 
+     *
      * <p>
      * The {@link Handler#getActions(Object, Object)} parameters depend on what
      * view the Calendar is in:
@@ -1671,7 +1671,7 @@ public class Calendar extends AbstractComponent
      * The Dates passed into the {@link CalendarDateRange} are in the same
      * timezone as the calendar is.
      * </p>
-     * 
+     *
      * <p>
      * The {@link Handler#handleAction(Action, Object, Object)} parameters
      * depend on what the context menu is called upon:
@@ -1699,7 +1699,7 @@ public class Calendar extends AbstractComponent
 
     /**
      * Is the calendar in a mode where all days of the month is shown
-     * 
+     *
      * @return Returns true if calendar is in monthly mode and false if it is in
      *         weekly mode
      */
@@ -1715,7 +1715,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.event.Action.Container#removeActionHandler(com.vaadin.event
      * .Action.Handler)
@@ -1902,7 +1902,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.VariableOwner#changeVariables(java.lang.Object,
      * java.util.Map)
      */
@@ -1916,7 +1916,7 @@ public class Calendar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.LegacyComponent#paintContent(com.vaadin.server.PaintTarget)
      */
@@ -1935,7 +1935,7 @@ public class Calendar extends AbstractComponent
      * false, the caption is rendered in the browser as plain text.
      * <p>
      * The default is false, i.e. to render that caption as plain text.
-     * 
+     *
      * @param captionAsHtml
      *            true if the captions are rendered as HTML, false if rendered
      *            as plain text
@@ -1948,7 +1948,7 @@ public class Calendar extends AbstractComponent
      * Checks whether event captions are rendered as HTML
      * <p>
      * The default is false, i.e. to render that caption as plain text.
-     * 
+     *
      * @return true if the captions are rendered as HTML, false if rendered as
      *         plain text
      */
@@ -2008,7 +2008,7 @@ public class Calendar extends AbstractComponent
     /**
      * Allow setting first day of week independent of Locale. Set to null if you
      * want first day of week being defined by the locale
-     * 
+     *
      * @since 7.6
      * @param dayOfWeek
      *            any of java.util.Calendar.SUNDAY..java.util.Calendar.SATURDAY
diff --git a/server/src/main/java/com/vaadin/ui/ColorPicker.java b/server/src/main/java/com/vaadin/ui/ColorPicker.java
index 9e46c4e718..5f21aa0360 100644
--- a/server/src/main/java/com/vaadin/ui/ColorPicker.java
+++ b/server/src/main/java/com/vaadin/ui/ColorPicker.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
@@ -20,11 +20,11 @@ import com.vaadin.shared.ui.colorpicker.Color;
 /**
  * A class that defines default (button-like) implementation for a color picker
  * component.
- * 
+ *
  * @since 7.0.0
- * 
+ *
  * @see ColorPickerArea
- * 
+ *
  */
 public class ColorPicker extends AbstractColorPicker {
 
@@ -37,7 +37,7 @@ public class ColorPicker extends AbstractColorPicker {
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            caption of the color select popup
      */
@@ -47,7 +47,7 @@ public class ColorPicker extends AbstractColorPicker {
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            caption of the color select popup
      * @param initialColor
diff --git a/server/src/main/java/com/vaadin/ui/ColorPickerArea.java b/server/src/main/java/com/vaadin/ui/ColorPickerArea.java
index 94f64cf256..d15ffc6fad 100644
--- a/server/src/main/java/com/vaadin/ui/ColorPickerArea.java
+++ b/server/src/main/java/com/vaadin/ui/ColorPickerArea.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
@@ -19,11 +19,11 @@ import com.vaadin.shared.ui.colorpicker.Color;
 
 /**
  * A class that defines area-like implementation for a color picker component.
- * 
+ *
  * @since 7.0.0
- * 
+ *
  * @see ColorPicker
- * 
+ *
  */
 public class ColorPickerArea extends AbstractColorPicker {
 
@@ -36,7 +36,7 @@ public class ColorPickerArea extends AbstractColorPicker {
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            caption of the color select popup
      */
@@ -46,7 +46,7 @@ public class ColorPickerArea extends AbstractColorPicker {
 
     /**
      * Instantiates a new color picker.
-     * 
+     *
      * @param popupCaption
      *            caption of the color select popup
      * @param initialColor
diff --git a/server/src/main/java/com/vaadin/ui/Component.java b/server/src/main/java/com/vaadin/ui/Component.java
index 4c32973389..8b3a620497 100644
--- a/server/src/main/java/com/vaadin/ui/Component.java
+++ b/server/src/main/java/com/vaadin/ui/Component.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
@@ -37,14 +37,14 @@ import com.vaadin.ui.declarative.DesignContext;
  * by all Vaadin components. {@code Component} is paired with
  * {@link AbstractComponent}, which provides a default implementation for all
  * the methods defined in this interface.
- * 
+ *
  * <p>
  * Components are laid out in the user interface hierarchically. The layout is
  * managed by layout components, or more generally by components that implement
  * the {@link ComponentContainer} interface. Such a container is the
  * <i>parent</i> of the contained components.
  * </p>
- * 
+ *
  * <p>
  * The {@link #getParent()} method allows retrieving the parent component of a
  * component. While there is a {@link #setParent(Component) setParent()}, you
@@ -53,13 +53,13 @@ import com.vaadin.ui.declarative.DesignContext;
  * the layout or other {@code ComponentContainer}, which automatically sets the
  * parent.
  * </p>
- * 
+ *
  * <p>
  * A component becomes <i>attached</i> to an application (and the
  * {@link #attach()} is called) when it or one of its parents is attached to the
  * main window of the application through its containment hierarchy.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -70,14 +70,14 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * has multiple style names defined, the return string is a space-separated
      * list of style names. Built-in style names defined in Vaadin or GWT are
      * not returned.
-     * 
+     *
      * <p>
      * The style names are returned only in the basic form in which they were
      * added; each user-defined style name shows as two CSS style class names in
      * the rendered HTML: one as it was given and one prefixed with the
      * component-specific style name. Only the former is returned.
      * </p>
-     * 
+     *
      * @return the style name or a space-separated list of user-defined style
      *         names of the component
      * @see #setStyleName(String)
@@ -92,12 +92,12 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * space-separated list of style names. The style names must be valid CSS
      * class names and should not conflict with any built-in style names in
      * Vaadin or GWT.
-     * 
+     *
      * <pre>
      * Label label = new Label(&quot;This text has a lot of style&quot;);
      * label.setStyleName(&quot;myonestyle myotherstyle&quot;);
      * </pre>
-     * 
+     *
      * <p>
      * Each style name will occur in two versions: one as specified and one that
      * is prefixed with the style name of the component. For example, if you
@@ -105,30 +105,30 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * component will have both "{@code mystyle}" and "{@code v-button-mystyle}"
      * styles. You could then style the component either with:
      * </p>
-     * 
+     *
      * <pre>
      * .myonestyle {background: blue;}
      * </pre>
-     * 
+     *
      * <p>
      * or
      * </p>
-     * 
+     *
      * <pre>
      * .v-button-myonestyle {background: blue;}
      * </pre>
-     * 
+     *
      * <p>
      * It is normally a good practice to use {@link #addStyleName(String)
      * addStyleName()} rather than this setter, as different software
      * abstraction layers can then add their own styles without accidentally
      * removing those defined in other layers.
      * </p>
-     * 
+     *
      * <p>
      * This method will trigger a {@link RepaintRequestEvent}.
      * </p>
-     * 
+     *
      * @param style
      *            the new style or styles of the component as a space-separated
      *            list
@@ -142,12 +142,12 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * Adds one or more style names to this component. Multiple styles can be
      * specified as a space-separated list of style names. The style name will
      * be rendered as a HTML class name, which can be used in a CSS definition.
-     * 
+     *
      * <pre>
      * Label label = new Label(&quot;This text has style&quot;);
      * label.addStyleName(&quot;mystyle&quot;);
      * </pre>
-     * 
+     *
      * <p>
      * Each style name will occur in two versions: one as specified and one that
      * is prefixed with the style name of the component. For example, if you
@@ -155,23 +155,23 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * component will have both "{@code mystyle}" and "{@code v-button-mystyle}"
      * styles. You could then style the component either with:
      * </p>
-     * 
+     *
      * <pre>
      * .mystyle {font-style: italic;}
      * </pre>
-     * 
+     *
      * <p>
      * or
      * </p>
-     * 
+     *
      * <pre>
      * .v-button-mystyle {font-style: italic;}
      * </pre>
-     * 
+     *
      * <p>
      * This method will trigger a {@link RepaintRequestEvent}.
      * </p>
-     * 
+     *
      * @param style
      *            the new style to be added to the component
      * @see #getStyleName()
@@ -183,16 +183,16 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
     /**
      * Removes one or more style names from component. Multiple styles can be
      * specified as a space-separated list of style names.
-     * 
+     *
      * <p>
      * The parameter must be a valid CSS style name. Only user-defined style
      * names added with {@link #addStyleName(String) addStyleName()} or
      * {@link #setStyleName(String) setStyleName()} can be removed; built-in
      * style names defined in Vaadin or GWT can not be removed.
      * </p>
-     * 
+     *
      * * This method will trigger a {@link RepaintRequestEvent}.
-     * 
+     *
      * @param style
      *            the style name or style names to be removed
      * @see #getStyleName()
@@ -210,21 +210,21 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Changes the primary style name of the component.
-     * 
+     *
      * <p>
      * The primary style name identifies the component when applying the CSS
      * theme to the Component. By changing the style name all CSS rules targeted
      * for that style name will no longer apply, and might result in the
      * component not working as intended.
      * </p>
-     * 
+     *
      * <p>
      * To preserve the original style of the component when changing to a new
      * primary style you should make your new primary style inherit the old
      * primary style using the SASS @include directive. See more in the SASS
      * tutorials.
      * </p>
-     * 
+     *
      * @param style
      *            The new primary style name
      */
@@ -235,18 +235,18 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * with disabled components. Disabled components are rendered in a style
      * that indicates the status, usually in gray color. Children of a disabled
      * component are also disabled. Components are enabled by default.
-     * 
+     *
      * <p>
      * As a security feature, all updates for disabled components are blocked on
      * the server-side.
      * </p>
-     * 
+     *
      * <p>
      * Note that this method only returns the status of the component and does
      * not take parents into account. Even though this method returns true the
      * component can be disabled to the user if a parent is disabled.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the component and its parent are enabled,
      *         <code>false</code> otherwise.
      * @see VariableOwner#isEnabled()
@@ -258,23 +258,23 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * disabled components, which are shown with a style that indicates the
      * status, usually shaded in light gray color. Components are enabled by
      * default.
-     * 
+     *
      * <pre>
      * Button enabled = new Button(&quot;Enabled&quot;);
      * enabled.setEnabled(true); // The default
      * layout.addComponent(enabled);
-     * 
+     *
      * Button disabled = new Button(&quot;Disabled&quot;);
      * disabled.setEnabled(false);
      * layout.addComponent(disabled);
      * </pre>
-     * 
+     *
      * <p>
      * This method will trigger a {@link RepaintRequestEvent} for the component
      * and, if it is a {@link ComponentContainer}, for all its children
      * recursively.
      * </p>
-     * 
+     *
      * @param enabled
      *            a boolean value specifying if the component should be enabled
      *            or not
@@ -283,7 +283,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Tests the <i>visibility</i> property of the component.
-     * 
+     *
      * <p>
      * Visible components are drawn in the user interface, while invisible ones
      * are not. The effect is not merely a cosmetic CSS change - no information
@@ -292,14 +292,14 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * component invisible through this property can alter the positioning of
      * other components.
      * </p>
-     * 
+     *
      * <p>
      * A component is visible only if all its parents are also visible. This is
      * not checked by this method though, so even if this method returns true,
      * the component can be hidden from the user because a parent is set to
      * invisible.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the component has been set to be visible in
      *         the user interface, <code>false</code> if not
      * @see #setVisible(boolean)
@@ -309,27 +309,27 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Sets the visibility of the component.
-     * 
+     *
      * <p>
      * Visible components are drawn in the user interface, while invisible ones
      * are not. The effect is not merely a cosmetic CSS change - no information
      * about an invisible component will be sent to the client. The effect is
      * thus the same as removing the component from its parent.
      * </p>
-     * 
+     *
      * <pre>
      * TextField readonly = new TextField(&quot;Read-Only&quot;);
      * readonly.setValue(&quot;You can't see this!&quot;);
      * readonly.setVisible(false);
      * layout.addComponent(readonly);
      * </pre>
-     * 
+     *
      * <p>
      * A component is visible only if all of its parents are also visible. If a
      * component is explicitly set to be invisible, changes in the visibility of
      * its parents will not change the visibility of the component.
      * </p>
-     * 
+     *
      * @param visible
      *            the boolean value specifying if the component should be
      *            visible after the call or not.
@@ -339,7 +339,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Sets the parent connector of the component.
-     * 
+     *
      * <p>
      * This method automatically calls {@link #attach()} if the component
      * becomes attached to the session, regardless of whether it was attached
@@ -354,7 +354,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * components to a parent and the used method will call this method
      * implicitly.
      * </p>
-     * 
+     *
      * @param parent
      *            the parent connector
      * @throws IllegalStateException
@@ -365,13 +365,13 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets the parent component of the component.
-     * 
+     *
      * <p>
      * Components can be nested but a component can have only one parent. A
      * component that contains other components, that is, can be a parent,
      * should usually inherit the {@link ComponentContainer} interface.
      * </p>
-     * 
+     *
      * @return the parent component
      */
     @Override
@@ -383,18 +383,18 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * or {@link LegacyField} components normally have a value that can be input
      * or changed by the user, this is mostly relevant only to field components,
      * though not restricted to them.
-     * 
+     *
      * <p>
      * Notice that the read-only mode only affects whether the user can change
      * the <i>value</i> of the component; it is possible to, for example, scroll
      * a read-only table.
      * </p>
-     * 
+     *
      * <p>
      * The method will return {@code true} if the component or any of its
      * parents is in the read-only mode.
      * </p>
-     * 
+     *
      * @return <code>true</code> if the component or any of its parents is in
      *         read-only mode, <code>false</code> if not.
      * @see #setReadOnly(boolean)
@@ -404,23 +404,23 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
     /**
      * Sets the read-only mode of the component to the specified mode. The user
      * can not change the value of a read-only component.
-     * 
+     *
      * <p>
      * As only {@link AbstractField} or{@link LegacyField} components normally
      * have a value that can be input or changed by the user, this is mostly
      * relevant only to field components, though not restricted to them.
      * </p>
-     * 
+     *
      * <p>
      * Notice that the read-only mode only affects whether the user can change
      * the <i>value</i> of the component; it is possible to, for example, scroll
      * a read-only table.
      * </p>
-     * 
+     *
      * <p>
      * This method will trigger a {@link RepaintRequestEvent}.
      * </p>
-     * 
+     *
      * @param readOnly
      *            a boolean value specifying whether the component is put
      *            read-only mode or not
@@ -429,12 +429,12 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets the caption of the component.
-     * 
+     *
      * <p>
      * See {@link #setCaption(String)} for a detailed description of the
      * caption.
      * </p>
-     * 
+     *
      * @return the caption of the component or {@code null} if the caption is
      *         not set.
      * @see #setCaption(String)
@@ -443,7 +443,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Sets the caption of the component.
-     * 
+     *
      * <p>
      * A <i>caption</i> is an explanatory textual label accompanying a user
      * interface component, usually shown above, left of, or inside the
@@ -451,25 +451,25 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * closely related to caption and is usually displayed horizontally before
      * or after it, depending on the component and the containing layout.
      * </p>
-     * 
+     *
      * <p>
      * The caption can usually also be given as the first parameter to a
      * constructor, though some components do not support it.
      * </p>
-     * 
+     *
      * <pre>
      * RichTextArea area = new RichTextArea();
      * area.setCaption(&quot;You can edit stuff here&quot;);
      * area.setValue(&quot;&lt;h1&gt;Helpful Heading&lt;/h1&gt;&quot;
      *         + &quot;&lt;p&gt;All this is for you to edit.&lt;/p&gt;&quot;);
      * </pre>
-     * 
+     *
      * <p>
      * The contents of a caption are automatically quoted, so no raw HTML can be
      * rendered in a caption. The validity of the used character encoding,
      * usually UTF-8, is not checked.
      * </p>
-     * 
+     *
      * <p>
      * The caption of a component is, by default, managed and displayed by the
      * layout component or component container in which the component is placed.
@@ -483,12 +483,12 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * {@link Button} and {@link Panel}, manage the caption themselves and
      * display it inside the component.
      * </p>
-     * 
+     *
      * <p>
      * This method will trigger a {@link RepaintRequestEvent}. A
      * reimplementation should call the superclass implementation.
      * </p>
-     * 
+     *
      * @param caption
      *            the new caption for the component. If the caption is
      *            {@code null}, no caption is shown and it does not normally
@@ -498,11 +498,11 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets the icon resource of the component.
-     * 
+     *
      * <p>
      * See {@link #setIcon(Resource)} for a detailed description of the icon.
      * </p>
-     * 
+     *
      * @return the icon resource of the component or {@code null} if the
      *         component has no icon
      * @see #setIcon(Resource)
@@ -511,7 +511,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Sets the icon of the component.
-     * 
+     *
      * <p>
      * An icon is an explanatory graphical label accompanying a user interface
      * component, usually shown above, left of, or inside the component. Icon is
@@ -519,24 +519,24 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * and is usually displayed horizontally before or after it, depending on
      * the component and the containing layout.
      * </p>
-     * 
+     *
      * <p>
      * The image is loaded by the browser from a resource, typically a
      * {@link com.vaadin.server.ThemeResource}.
      * </p>
-     * 
+     *
      * <pre>
      * // Component with an icon from a custom theme
      * TextField name = new TextField(&quot;Name&quot;);
      * name.setIcon(new ThemeResource(&quot;icons/user.png&quot;));
      * layout.addComponent(name);
-     * 
+     *
      * // Component with an icon from another theme ('runo')
      * Button ok = new Button(&quot;OK&quot;);
      * ok.setIcon(new ThemeResource(&quot;../runo/icons/16/ok.png&quot;));
      * layout.addComponent(ok);
      * </pre>
-     * 
+     *
      * <p>
      * The icon of a component is, by default, managed and displayed by the
      * layout component or component container in which the component is placed.
@@ -548,16 +548,16 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * icon of its composition root, so if the root component has an icon, it
      * will not be rendered.
      * </p>
-     * 
+     *
      * <p>
      * An icon will be rendered inside an HTML element that has the
      * {@code v-icon} CSS style class. The containing layout may enclose an icon
      * and a caption inside elements related to the caption, such as
      * {@code v-caption} .
      * </p>
-     * 
+     *
      * This method will trigger a {@link RepaintRequestEvent}.
-     * 
+     *
      * @param icon
      *            the icon of the component. If null, no icon is shown and it
      *            does not normally take any space.
@@ -568,12 +568,12 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets the UI the component is attached to.
-     * 
+     *
      * <p>
      * If the component is not attached to a UI through a component containment
      * hierarchy, <code>null</code> is returned.
      * </p>
-     * 
+     *
      * @return the UI of the component or <code>null</code> if it is not
      *         attached to a UI
      */
@@ -582,7 +582,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * <p>
      * Reimplementing the {@code attach()} method is useful for tasks that need
      * to get a reference to the parent, window, or application object with the
@@ -591,7 +591,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * so in such case, the methods will return {@code null}. For example, the
      * following is invalid:
      * </p>
-     * 
+     *
      * <pre>
      * public class AttachExample extends CustomComponent {
      *     public AttachExample() {
@@ -603,7 +603,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      *     }
      * }
      * </pre>
-     * 
+     *
      * <p>
      * Adding a component to an application triggers calling the
      * {@link #attach()} method for the component. Correspondingly, removing a
@@ -612,16 +612,16 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * application, the {@code attach()} is called immediately from
      * {@link #setParent(Component)}.
      * </p>
-     * 
+     *
      * <pre>
      * public class AttachExample extends CustomComponent {
      *     public AttachExample() {
      *     }
-     * 
+     *
      *     &#064;Override
      *     public void attach() {
      *         super.attach(); // Must call.
-     * 
+     *
      *         // Now we know who ultimately owns us.
      *         ClassResource r = new ClassResource(&quot;smiley.jpg&quot;,
      *                 getApplication());
@@ -636,21 +636,21 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets the locale of the component.
-     * 
+     *
      * <p>
      * If a component does not have a locale set, the locale of its parent is
      * returned, and so on. Eventually, if no parent has locale set, the locale
      * of the application is returned. If the application does not have a locale
      * set, it is determined by <code>Locale.getDefault()</code>.
      * </p>
-     * 
+     *
      * <p>
      * As the component must be attached before its locale can be acquired,
      * using this method in the internationalization of component captions, etc.
      * is generally not feasible. For such use case, we recommend using an
      * otherwise acquired reference to the application locale.
      * </p>
-     * 
+     *
      * @return Locale of this component or {@code null} if the component and
      *         none of its parents has a locale set and the component is not yet
      *         attached to an application.
@@ -661,7 +661,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * Adds an unique id for component that is used in the client-side for
      * testing purposes. Keeping identifiers unique is the responsibility of the
      * programmer.
-     * 
+     *
      * @param id
      *            An alphanumeric id
      */
@@ -669,7 +669,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Gets currently set debug identifier
-     * 
+     *
      * @return current id, null if not set
      */
     public String getId();
@@ -681,7 +681,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * be used to briefly describe the state of the component to the user. The
      * description string may contain certain XML tags:
      * </p>
-     * 
+     *
      * <p>
      * <table border=1>
      * <tr>
@@ -724,11 +724,11 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * </tr>
      * </table>
      * </p>
-     * 
+     *
      * <p>
      * These tags may be nested.
      * </p>
-     * 
+     *
      * @return component's description <code>String</code>
      */
     public String getDescription();
@@ -747,7 +747,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * defaults.
      * <p>
      * This method must not modify the design.
-     * 
+     *
      * @since 7.4
      * @param design
      *            The element to obtain the state from
@@ -763,14 +763,14 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * for ensuring that its children write their state to the design.
      * <p>
      * This method must not modify the component state.
-     * 
+     *
      * @since 7.4
      * @param design
      *            The element to write the component state to. Any previous
      *            attributes or child nodes are <i>not</i> cleared.
      * @param designContext
      *            The DesignContext instance used for writing the design
-     * 
+     *
      */
     public void writeDesign(Element design, DesignContext designContext);
 
@@ -778,13 +778,13 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Superclass of all component originated events.
-     * 
+     *
      * <p>
      * Events are the basis of all user interaction handling in Vaadin. To
      * handle events, you provide a listener object that receives the events of
      * the particular event type.
      * </p>
-     * 
+     *
      * <pre>
      * Button button = new Button(&quot;Click Me!&quot;);
      * button.addListener(new Button.ClickListener() {
@@ -794,13 +794,13 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * });
      * layout.addComponent(button);
      * </pre>
-     * 
+     *
      * <p>
      * Notice that while each of the event types have their corresponding
      * listener types; the listener interfaces are not required to inherit the
      * {@code Component.Listener} interface.
      * </p>
-     * 
+     *
      * @see Component.Listener
      */
     @SuppressWarnings("serial")
@@ -808,7 +808,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
         /**
          * Constructs a new event with the specified source component.
-         * 
+         *
          * @param source
          *            the source component of the event
          */
@@ -818,7 +818,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
         /**
          * Gets the component where the event occurred.
-         * 
+         *
          * @return the source component of the event
          */
         public Component getComponent() {
@@ -829,7 +829,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Listener interface for receiving <code>Component.Event</code>s.
-     * 
+     *
      * <p>
      * Listener interfaces are the basis of all user interaction handling in
      * Vaadin. You have or create a listener object that receives the events.
@@ -837,7 +837,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * however, required to inherit the {@code Component.Listener} interface,
      * and they rarely do so.
      * </p>
-     * 
+     *
      * <p>
      * This generic listener interface is useful typically when you wish to
      * handle events from different component types in a single listener method
@@ -845,79 +845,79 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * listener class, you normally use the component specific listener class,
      * such as {@link com.vaadin.ui.Button.ClickEvent}.
      * </p>
-     * 
+     *
      * <pre>
      * class Listening extends CustomComponent implements Listener {
      *     Button ok; // Stored for determining the source of an event
-     * 
+     *
      *     Label status; // For displaying info about the event
-     * 
+     *
      *     public Listening() {
      *         VerticalLayout layout = new VerticalLayout();
-     * 
+     *
      *         // Some miscellaneous component
      *         TextField name = new TextField(&quot;Say it all here&quot;);
      *         name.addListener(this);
      *         name.setImmediate(true);
      *         layout.addComponent(name);
-     * 
+     *
      *         // Handle button clicks as generic events instead
      *         // of Button.ClickEvent events
      *         ok = new Button(&quot;OK&quot;);
      *         ok.addListener(this);
      *         layout.addComponent(ok);
-     * 
+     *
      *         // For displaying information about an event
      *         status = new Label(&quot;&quot;);
      *         layout.addComponent(status);
-     * 
+     *
      *         setCompositionRoot(layout);
      *     }
-     * 
+     *
      *     public void componentEvent(Event event) {
      *         // Act according to the source of the event
      *         if (event.getSource() == ok
      *                 &amp;&amp; event.getClass() == Button.ClickEvent.class)
      *             getWindow().showNotification(&quot;Click!&quot;);
-     * 
+     *
      *         // Display source component and event class names
      *         status.setValue(
      *                 &quot;Event from &quot; + event.getSource().getClass().getName()
      *                         + &quot;: &quot; + event.getClass().getName());
      *     }
      * }
-     * 
+     *
      * Listening listening = new Listening();
      * layout.addComponent(listening);
      * </pre>
-     * 
+     *
      * @see Component#addListener(Listener)
      */
     public interface Listener extends ConnectorEventListener {
 
         /**
          * Notifies the listener of a component event.
-         * 
+         *
          * <p>
          * As the event can typically come from one of many source components,
          * you may need to differentiate between the event source by component
          * reference, class, etc.
          * </p>
-         * 
+         *
          * <pre>
          * public void componentEvent(Event event) {
          *     // Act according to the source of the event
          *     if (event.getSource() == ok
          *             &amp;&amp; event.getClass() == Button.ClickEvent.class)
          *         getWindow().showNotification(&quot;Click!&quot;);
-         * 
+         *
          *     // Display source component and event class names
          *     status.setValue(
          *             &quot;Event from &quot; + event.getSource().getClass().getName() + &quot;: &quot;
          *                     + event.getClass().getName());
          * }
          * </pre>
-         * 
+         *
          * @param event
          *            the event that has occurred.
          */
@@ -926,51 +926,51 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Registers a new (generic) component event listener for the component.
-     * 
+     *
      * <pre>
      * class Listening extends CustomComponent implements Listener {
      *     // Stored for determining the source of an event
      *     Button ok;
-     * 
+     *
      *     Label status; // For displaying info about the event
-     * 
+     *
      *     public Listening() {
      *         VerticalLayout layout = new VerticalLayout();
-     * 
+     *
      *         // Some miscellaneous component
      *         TextField name = new TextField(&quot;Say it all here&quot;);
      *         name.addListener(this);
      *         name.setImmediate(true);
      *         layout.addComponent(name);
-     * 
+     *
      *         // Handle button clicks as generic events instead
      *         // of Button.ClickEvent events
      *         ok = new Button(&quot;OK&quot;);
      *         ok.addListener(this);
      *         layout.addComponent(ok);
-     * 
+     *
      *         // For displaying information about an event
      *         status = new Label(&quot;&quot;);
      *         layout.addComponent(status);
-     * 
+     *
      *         setCompositionRoot(layout);
      *     }
-     * 
+     *
      *     public void componentEvent(Event event) {
      *         // Act according to the source of the event
      *         if (event.getSource() == ok)
      *             getWindow().showNotification(&quot;Click!&quot;);
-     * 
+     *
      *         status.setValue(
      *                 &quot;Event from &quot; + event.getSource().getClass().getName()
      *                         + &quot;: &quot; + event.getClass().getName());
      *     }
      * }
-     * 
+     *
      * Listening listening = new Listening();
      * layout.addComponent(listening);
      * </pre>
-     * 
+     *
      * @param listener
      *            the new Listener to be registered.
      * @see Component.Event
@@ -981,7 +981,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
     /**
      * Removes a previously registered component event listener from this
      * component.
-     * 
+     *
      * @param listener
      *            the listener to be removed.
      * @see #addListener(Listener)
@@ -990,7 +990,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
     /**
      * Class of all component originated error events.
-     * 
+     *
      * <p>
      * The component error event is normally fired by
      * {@link AbstractComponent#setComponentError(ErrorMessage)}. The component
@@ -1005,7 +1005,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
         /**
          * Constructs a new event with a specified source component.
-         * 
+         *
          * @param message
          *            the error message.
          * @param component
@@ -1018,7 +1018,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
         /**
          * Gets the error message.
-         * 
+         *
          * @return the error message.
          */
         public ErrorMessage getErrorMessage() {
@@ -1030,7 +1030,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * A sub-interface implemented by components that can obtain input focus.
      * This includes all {@link LegacyField} components as well as some other
      * components, such as {@link Upload}.
-     * 
+     *
      * <p>
      * Focus can be set with {@link #focus()}. This interface does not provide
      * an accessor that would allow finding out the currently focused component;
@@ -1039,33 +1039,33 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * {@link com.vaadin.event.FieldEvents.FocusListener} and
      * {@link com.vaadin.event.FieldEvents.BlurListener} interfaces.
      * </p>
-     * 
+     *
      * @see FieldEvents
      */
     public interface Focusable extends Component {
 
         /**
          * Sets the focus to this component.
-         * 
+         *
          * <pre>
          * Form loginBox = new Form();
          * loginBox.setCaption(&quot;Login&quot;);
          * layout.addComponent(loginBox);
-         * 
+         *
          * // Create the first field which will be focused
          * TextField username = new TextField(&quot;User name&quot;);
          * loginBox.addField(&quot;username&quot;, username);
-         * 
+         *
          * // Set focus to the user name
          * username.focus();
-         * 
+         *
          * TextField password = new TextField(&quot;Password&quot;);
          * loginBox.addField(&quot;password&quot;, password);
-         * 
+         *
          * Button login = new Button(&quot;Login&quot;);
          * loginBox.getFooter().addComponent(login);
          * </pre>
-         * 
+         *
          * <p>
          * Notice that this interface does not provide an accessor that would
          * allow finding out the currently focused component. Focus information
@@ -1073,7 +1073,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
          * through the {@link com.vaadin.event.FieldEvents.FocusListener} and
          * {@link com.vaadin.event.FieldEvents.BlurListener} interfaces.
          * </p>
-         * 
+         *
          * @see com.vaadin.event.FieldEvents
          * @see com.vaadin.event.FieldEvents.FocusEvent
          * @see com.vaadin.event.FieldEvents.FocusListener
@@ -1084,7 +1084,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
 
         /**
          * Gets the <i>tabulator index</i> of the {@code Focusable} component.
-         * 
+         *
          * @return tab index set for the {@code Focusable} component
          * @see #setTabIndex(int)
          */
@@ -1096,54 +1096,54 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
          * fields are focused when the user presses the Tab key. Components with
          * a defined tab index are focused sequentially first, and then the
          * components with no tab index.
-         * 
+         *
          * <pre>
          * Form loginBox = new Form();
          * loginBox.setCaption(&quot;Login&quot;);
          * layout.addComponent(loginBox);
-         * 
+         *
          * // Create the first field which will be focused
          * TextField username = new TextField(&quot;User name&quot;);
          * loginBox.addField(&quot;username&quot;, username);
-         * 
+         *
          * // Set focus to the user name
          * username.focus();
-         * 
+         *
          * TextField password = new TextField(&quot;Password&quot;);
          * loginBox.addField(&quot;password&quot;, password);
-         * 
+         *
          * Button login = new Button(&quot;Login&quot;);
          * loginBox.getFooter().addComponent(login);
-         * 
+         *
          * // An additional component which natural focus order would
          * // be after the button.
          * CheckBox remember = new CheckBox(&quot;Remember me&quot;);
          * loginBox.getFooter().addComponent(remember);
-         * 
+         *
          * username.setTabIndex(1);
          * password.setTabIndex(2);
          * remember.setTabIndex(3); // Different than natural place
          * login.setTabIndex(4);
          * </pre>
-         * 
+         *
          * <p>
          * After all focusable user interface components are done, the browser
          * can begin again from the component with the smallest tab index, or it
          * can take the focus out of the page, for example, to the location bar.
          * </p>
-         * 
+         *
          * <p>
          * If the tab index is not set (is set to zero), the default tab order
          * is used. The order is somewhat browser-dependent, but generally
          * follows the HTML structure of the page.
          * </p>
-         * 
+         *
          * <p>
          * A negative value means that the component is completely removed from
          * the tabulation order and can not be reached by pressing the Tab key
          * at all.
          * </p>
-         * 
+         *
          * @param tabIndex
          *            the tab order of this component. Indexes usually start
          *            from 1. Zero means that default tab order should be used.
diff --git a/server/src/main/java/com/vaadin/ui/ComponentContainer.java b/server/src/main/java/com/vaadin/ui/ComponentContainer.java
index ce8cb891e1..521bee3879 100644
--- a/server/src/main/java/com/vaadin/ui/ComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/ComponentContainer.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.ui.HasComponents.ComponentAttachDetachNotifier;
  * A special type of parent which allows the user to add and remove components
  * to it. Typically does not have any restrictions on the number of children it
  * can contain.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -33,7 +33,7 @@ public interface ComponentContainer
 
     /**
      * Adds the component into this container.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -41,7 +41,7 @@ public interface ComponentContainer
 
     /**
      * Adds the components in the given order to this component container.
-     * 
+     *
      * @param components
      *            The components to add.
      */
@@ -49,7 +49,7 @@ public interface ComponentContainer
 
     /**
      * Removes the component from this container.
-     * 
+     *
      * @param c
      *            the component to be removed.
      */
@@ -63,7 +63,7 @@ public interface ComponentContainer
     /**
      * Replaces the component in the container with another one without changing
      * position.
-     * 
+     *
      * <p>
      * This method replaces component with another one is such way that the new
      * component overtakes the position of the old component. If the old
@@ -72,7 +72,7 @@ public interface ComponentContainer
      * positions are swapped. Component attach and detach events should be taken
      * care as with add and remove.
      * </p>
-     * 
+     *
      * @param oldComponent
      *            the old component that will be replaced.
      * @param newComponent
@@ -85,9 +85,9 @@ public interface ComponentContainer
      * Gets an iterator to the collection of contained components. Using this
      * iterator it is possible to step through all components contained in this
      * container.
-     * 
+     *
      * @return the component iterator.
-     * 
+     *
      * @deprecated As of 7.0, use {@link #iterator()} instead.
      */
     @Deprecated
@@ -96,7 +96,7 @@ public interface ComponentContainer
     /**
      * Gets the number of children this {@link ComponentContainer} has. This
      * must be symmetric with what {@link #getComponentIterator()} returns.
-     * 
+     *
      * @return The number of child components this container has.
      * @since 7.0.0
      */
@@ -105,7 +105,7 @@ public interface ComponentContainer
     /**
      * Moves all components from an another container into this container. The
      * components are removed from <code>source</code>.
-     * 
+     *
      * @param source
      *            the container which contains the components that are to be
      *            moved to this container.
diff --git a/server/src/main/java/com/vaadin/ui/CssLayout.java b/server/src/main/java/com/vaadin/ui/CssLayout.java
index 38ce0ba458..21c1875322 100644
--- a/server/src/main/java/com/vaadin/ui/CssLayout.java
+++ b/server/src/main/java/com/vaadin/ui/CssLayout.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
@@ -54,7 +54,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * <p>
  * By extending CssLayout one can also inject some css rules straight to child
  * components using {@link #getCss(Component)}.
- * 
+ *
  * <p>
  * (*) Relative sizes (set from server side) are treated bit differently than in
  * other layouts in Vaadin. In cssLayout the size is calculated relatively to
@@ -67,9 +67,9 @@ import com.vaadin.ui.declarative.DesignContext;
  * wants to set component sizes with CSS, component must have undefined size on
  * server side (which is not the default for all components) and the size must
  * be defined with class styles - not by directly injecting width and height.
- * 
+ *
  * @since 6.1 brought in from "FastLayouts" incubator project
- * 
+ *
  */
 public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
@@ -96,9 +96,9 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /**
      * Constructs a CssLayout with the given components in the given order.
-     * 
+     *
      * @see #addComponents(Component...)
-     * 
+     *
      * @param children
      *            Components to add to the container.
      */
@@ -110,7 +110,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     /**
      * Add a component into this container. The component is added to the right
      * or below the previous component.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -130,7 +130,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     /**
      * Adds a component into this container. The component is added to the left
      * or on top of the other components.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -151,7 +151,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /**
      * Adds a component into indexed position in this container.
-     * 
+     *
      * @param c
      *            the component to be added.
      * @param index
@@ -179,7 +179,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /**
      * Removes the component from this container.
-     * 
+     *
      * @param c
      *            the component to be removed.
      */
@@ -192,7 +192,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     /**
      * Gets the component container iterator for going trough all the components
      * in the container.
-     * 
+     *
      * @return the Iterator of the components inside the container.
      */
     @Override
@@ -203,7 +203,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components
      */
     @Override
@@ -238,17 +238,17 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     /**
      * Returns styles to be applied to given component. Override this method to
      * inject custom style rules to components.
-     * 
+     *
      * <p>
      * Note that styles are injected over previous styles before actual child
      * rendering. Previous styles are not cleared, but overridden.
-     * 
+     *
      * <p>
      * Note that one most often achieves better code style, by separating
      * styling to theme (with custom theme and {@link #addStyleName(String)}.
      * With own custom styles it is also very easy to break browser
      * compatibility.
-     * 
+     *
      * @param c
      *            the component
      * @return css rules to be applied to component
@@ -337,7 +337,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /**
      * Returns the index of the given component.
-     * 
+     *
      * @param component
      *            The component to look up.
      * @return The index of the component or -1 if the component is not a child.
@@ -348,7 +348,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /**
      * Returns the component at the given position.
-     * 
+     *
      * @param index
      *            The position of the component.
      * @return The component at the given index.
@@ -361,7 +361,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -378,7 +378,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/CustomComponent.java b/server/src/main/java/com/vaadin/ui/CustomComponent.java
index 9ecee07eaa..5275169cd3 100644
--- a/server/src/main/java/com/vaadin/ui/CustomComponent.java
+++ b/server/src/main/java/com/vaadin/ui/CustomComponent.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
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * Custom component provides a simple implementation of the {@link Component}
  * interface to allow creating new UI components by composition of existing
  * server-side components.
- * 
+ *
  * <p>
  * The component is used by inheriting the CustomComponent class and setting the
  * composition root component. The composition root must be set with
@@ -31,24 +31,24 @@ import java.util.Iterator;
  * such as by adding it to a layout, so it is preferable to set it in the
  * constructor.
  * </p>
- * 
+ *
  * <p>
  * The composition root itself can contain more components. The advantage of
  * wrapping it in a CustomComponent is that its details, such as interfaces, are
  * hidden from the users of the component, thereby contributing to information
  * hiding.
  * </p>
- * 
+ *
  * <p>
  * The CustomComponent does not display the caption of the composition root, so
  * if you want to have it shown in the layout where the custom component is
  * contained, you need to set it as caption of the CustomComponent.
  * </p>
- * 
+ *
  * <p>
  * The component expands horizontally and has undefined height by default.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -63,7 +63,7 @@ public class CustomComponent extends AbstractComponent
 
     /**
      * Constructs a new custom component.
-     * 
+     *
      * <p>
      * Note that you must set the composition root before the component can be
      * used, preferably in the constructor.
@@ -76,7 +76,7 @@ public class CustomComponent extends AbstractComponent
 
     /**
      * Constructs a new custom component.
-     * 
+     *
      * @param compositionRoot
      *            the root of the composition component tree. It must not be
      *            null.
@@ -88,7 +88,7 @@ public class CustomComponent extends AbstractComponent
 
     /**
      * Returns the composition root.
-     * 
+     *
      * @return the Component Composition root.
      */
     protected Component getCompositionRoot() {
@@ -97,12 +97,12 @@ public class CustomComponent extends AbstractComponent
 
     /**
      * Sets the composition root for the component.
-     * 
+     *
      * <p>
      * You must set the composition root to a non-null value before the
      * component can be used. You can change it later.
      * </p>
-     * 
+     *
      * @param compositionRoot
      *            the root of the composition component tree.
      */
@@ -140,7 +140,7 @@ public class CustomComponent extends AbstractComponent
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components (zero or one)
      */
     public int getComponentCount() {
diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java
index 69160db5e2..9e9cdbf0ad 100644
--- a/server/src/main/java/com/vaadin/ui/CustomField.java
+++ b/server/src/main/java/com/vaadin/ui/CustomField.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,22 +28,22 @@ import com.vaadin.legacy.ui.LegacyAbstractField;
  * enabling the creation of e.g. form fields by composing Vaadin components.
  * Customization of both the visual presentation and the logic of the field is
  * possible.
- * 
+ *
  * Subclasses must implement {@link #getType()} and {@link #initContent()}.
- * 
+ *
  * Most custom fields can simply compose a user interface that calls the methods
  * {@link #setInternalValue(Object)} and {@link #getInternalValue()} when
  * necessary.
- * 
+ *
  * It is also possible to override {@link #validate()},
  * {@link #setInternalValue(Object)}, {@link #commit()},
  * {@link #setPropertyDataSource(Property)}, {@link #isEmpty()} and other logic
  * of the field. Methods overriding {@link #setInternalValue(Object)} should
  * also call the corresponding superclass method.
- * 
+ *
  * @param <T>
  *            field value type
- * 
+ *
  * @since 7.0
  */
 public abstract class CustomField<T> extends LegacyAbstractField<T>
@@ -56,7 +56,7 @@ public abstract class CustomField<T> extends LegacyAbstractField<T>
 
     /**
      * Constructs a new custom field.
-     * 
+     *
      * <p>
      * The component is implemented by wrapping the methods of the composition
      * root component given as parameter. The composition root must be set
@@ -71,7 +71,7 @@ public abstract class CustomField<T> extends LegacyAbstractField<T>
     /**
      * Constructs the content and notifies it that the {@link CustomField} is
      * attached to a window.
-     * 
+     *
      * @see com.vaadin.ui.Component#attach()
      */
     @Override
@@ -87,7 +87,7 @@ public abstract class CustomField<T> extends LegacyAbstractField<T>
 
     /**
      * Returns the content (UI) of the custom component.
-     * 
+     *
      * @return Component
      */
     protected Component getContent() {
@@ -101,11 +101,11 @@ public abstract class CustomField<T> extends LegacyAbstractField<T>
     /**
      * Create the content component or layout for the field. Subclasses of
      * {@link CustomField} should implement this method.
-     * 
+     *
      * Note that this method is called when the CustomField is attached to a
      * layout or when {@link #getContent()} is called explicitly for the first
      * time. It is only called once for a {@link CustomField}.
-     * 
+     *
      * @return {@link Component} representing the UI of the CustomField
      */
     protected abstract Component initContent();
diff --git a/server/src/main/java/com/vaadin/ui/CustomLayout.java b/server/src/main/java/com/vaadin/ui/CustomLayout.java
index 2de64865e4..2095d6628d 100644
--- a/server/src/main/java/com/vaadin/ui/CustomLayout.java
+++ b/server/src/main/java/com/vaadin/ui/CustomLayout.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
@@ -42,7 +42,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * adapter and theme are responsible for rendering the layout with a given style
  * by placing the items in the defined locations.
  * </p>
- * 
+ *
  * <p>
  * The placement of the locations is not fixed - different themes can define the
  * locations in a way that is suitable for them. One typical example would be to
@@ -50,12 +50,12 @@ import com.vaadin.ui.declarative.DesignContext;
  * would define locations for "menu", "body", and "title", for example. The
  * layout would then be implemented as an HTML template for each theme.
  * </p>
- * 
+ *
  * <p>
  * The default theme handles the styles that are not defined by drawing the
  * subcomponents just as in OrderedLayout.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -74,7 +74,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
      * for setting the appropriate fields. Either
      * {@link #setTemplateName(String)}, that makes layout fetch the template
      * from theme, or {@link #setTemplateContents(String)}.
-     * 
+     *
      * @since 7.5.0
      */
     public CustomLayout() {
@@ -83,7 +83,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Constructs a custom layout with the template given in the stream.
-     * 
+     *
      * @param templateStream
      *            Stream containing template data. Must be using UTF-8 encoding.
      *            To use a String as a template use for instance new
@@ -137,7 +137,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
     /**
      * Adds the component into this container to given location. If the location
      * is already populated, the old component is removed.
-     * 
+     *
      * @param c
      *            the component to be added.
      * @param location
@@ -159,7 +159,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
      * specifying the location (empty string is then used as location). Only one
      * component can be added to the default "" location and adding more
      * components into that location overwrites the old components.
-     * 
+     *
      * @param c
      *            the component to be added.
      */
@@ -170,7 +170,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Removes the component from this container.
-     * 
+     *
      * @param c
      *            the component to be removed.
      */
@@ -186,7 +186,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Removes the component from this container from given location.
-     * 
+     *
      * @param location
      *            the Location identifier of the component.
      */
@@ -197,7 +197,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
     /**
      * Gets the component container iterator for going trough all the components
      * in the container.
-     * 
+     *
      * @return the Iterator of the components inside the container.
      */
     @Override
@@ -208,7 +208,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components
      */
     @Override
@@ -218,7 +218,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Gets the child-component by its location.
-     * 
+     *
      * @param location
      *            the name of the location where the requested component
      *            resides.
@@ -273,11 +273,11 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Set the name of the template used to draw custom layout.
-     * 
+     *
      * With GWT-adapter, the template with name 'templatename' is loaded from
      * VAADIN/themes/themename/layouts/templatename.html. If the theme has not
      * been set (with Application.setTheme()), themename is 'default'.
-     * 
+     *
      * @param templateName
      */
     public void setTemplateName(String templateName) {
@@ -287,7 +287,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     /**
      * Set the contents of the template used to draw the custom layout.
-     * 
+     *
      * @param templateContents
      */
     public void setTemplateContents(String templateContents) {
diff --git a/server/src/main/java/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java
index a3652b893f..28e56e1285 100644
--- a/server/src/main/java/com/vaadin/ui/DateField.java
+++ b/server/src/main/java/com/vaadin/ui/DateField.java
@@ -44,9 +44,9 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * A date editor component with <code>java.util.Date</code> as an input value.
- * 
+ *
  * @author Vaadin Ltd
- * 
+ *
  * @since 8.0
  *
  */
@@ -123,7 +123,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Constructs an empty <code>DateField</code> with caption.
-     * 
+     *
      * @param caption
      *            the caption of the datefield.
      */
@@ -134,7 +134,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param value
@@ -356,7 +356,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * date (taking the resolution into account), the component will not
      * validate. If <code>startDate</code> is set to <code>null</code>, any
      * value before <code>endDate</code> will be accepted by the range
-     * 
+     *
      * @param startDate
      *            - the allowed range's start date
      */
@@ -375,7 +375,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Sets the current error message if the range validation fails.
-     * 
+     *
      * @param dateOutOfRangeMessage
      *            - Localizable message which is shown when value (the date) is
      *            set outside allowed range
@@ -386,7 +386,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Returns current date-out-of-range error message.
-     * 
+     *
      * @see #setDateOutOfRangeMessage(String)
      * @return Current error message for dates out of range.
      */
@@ -396,7 +396,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Gets the resolution.
-     * 
+     *
      * @return int
      */
     public Resolution getResolution() {
@@ -405,9 +405,9 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Sets the resolution of the DateField.
-     * 
+     *
      * The default resolution is {@link Resolution#DAY} since Vaadin 7.0.
-     * 
+     *
      * @param resolution
      *            the resolution to set.
      */
@@ -421,7 +421,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * date (taking the resolution into account), the component will not
      * validate. If <code>endDate</code> is set to <code>null</code>, any value
      * after <code>startDate</code> will be accepted by the range.
-     * 
+     *
      * @param endDate
      *            - the allowed range's end date (inclusive, based on the
      *            current resolution)
@@ -441,7 +441,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Returns the precise rangeStart used.
-     * 
+     *
      * @return the precise rangeStart used
      */
     public Date getRangeStart() {
@@ -450,7 +450,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Returns the precise rangeEnd used.
-     * 
+     *
      * @return the precise rangeEnd used
      */
     public Date getRangeEnd() {
@@ -460,14 +460,14 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Sets formatting used by some component implementations. See
      * {@link SimpleDateFormat} for format details.
-     * 
+     *
      * By default it is encouraged to used default formatting defined by Locale,
      * but due some JVM bugs it is sometimes necessary to use this method to
      * override formatting. See Vaadin issue #2200.
-     * 
+     *
      * @param dateFormat
      *            the dateFormat to set
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#setLocale(Locale))
      */
     public void setDateFormat(String dateFormat) {
@@ -478,7 +478,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Returns a format string used to format date value on client side or null
      * if default formatting from {@link Component#getLocale()} is used.
-     * 
+     *
      * @return the dateFormat
      */
     public String getDateFormat() {
@@ -488,10 +488,10 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Specifies whether or not date/time interpretation in component is to be
      * lenient.
-     * 
+     *
      * @see Calendar#setLenient(boolean)
      * @see #isLenient()
-     * 
+     *
      * @param lenient
      *            true if the lenient mode is to be turned on; false if it is to
      *            be turned off.
@@ -503,9 +503,9 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Returns whether date/time interpretation is to be lenient.
-     * 
+     *
      * @see #setLenient(boolean)
-     * 
+     *
      * @return true if the interpretation mode of this calendar is lenient;
      *         false otherwise.
      */
@@ -541,7 +541,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Checks whether ISO 8601 week numbers are shown in the date selector.
-     * 
+     *
      * @return true if week numbers are shown, false otherwise.
      */
     public boolean isShowISOWeekNumbers() {
@@ -552,7 +552,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * Sets the visibility of ISO 8601 week numbers in the date selector. ISO
      * 8601 defines that a week always starts with a Monday so the week numbers
      * are only shown if this is the case.
-     * 
+     *
      * @param showWeekNumbers
      *            true if week numbers should be shown, false otherwise.
      */
@@ -563,13 +563,13 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Returns new instance calendar used in Date conversions.
-     * 
+     *
      * Returns new clone of the calendar object initialized using the the
      * current date (if available)
-     * 
+     *
      * If this is no calendar is assigned the <code>Calendar.getInstance</code>
      * is used.
-     * 
+     *
      * @return the Calendar.
      * @see #setCalendar(Calendar)
      */
@@ -609,10 +609,10 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * Gets the time zone used by this field. The time zone is used to convert
      * the absolute time in a Date object to a logical time displayed in the
      * selector and to convert the select time back to a Date object.
-     * 
+     *
      * If {@code null} is returned, the current default time zone returned by
      * {@code TimeZone.getDefault()} is used.
-     * 
+     *
      * @return the current time zone
      */
     public TimeZone getTimeZone() {
@@ -626,9 +626,9 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * custom exception, the message returned by
      * {@link Exception#getLocalizedMessage()} will be used instead of the value
      * returned by this method.
-     * 
+     *
      * @see #setParseErrorMessage(String)
-     * 
+     *
      * @return the error message that the DateField uses when it can't parse the
      *         textual input from user to a Date object
      */
@@ -641,7 +641,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * text input by user to a Date field. Note that if the
      * {@link #handleUnparsableDateString(String)} method is overridden, the
      * localized message from its exception is used.
-     * 
+     *
      * @see #getParseErrorMessage()
      * @see #handleUnparsableDateString(String)
      * @param parsingErrorMessage
@@ -654,10 +654,10 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * Sets the time zone used by this date field. The time zone is used to
      * convert the absolute time in a Date object to a logical time displayed in
      * the selector and to convert the select time back to a Date object.
-     * 
+     *
      * If no time zone has been set, the current default time zone returned by
      * {@code TimeZone.getDefault()} is used.
-     * 
+     *
      * @see #getTimeZone()
      * @param timeZone
      *            the time zone to use for time calculations.
@@ -670,7 +670,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Adds a <code>FocusListener</code> to the Component which gets fired when
      * a <code>LegacyField</code> receives keyboard focus.
-     * 
+     *
      * @param listener
      * @see FocusListener
      */
@@ -681,7 +681,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Removes a <code>FocusListener</code> from the Component.
-     * 
+     *
      * @param listener
      * @see FocusListener
      */
@@ -692,7 +692,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * Adds a <code>BlurListener</code> to the Component which gets fired when a
      * <code>LegacyField</code> loses keyboard focus.
-     * 
+     *
      * @param listener
      * @see BlurListener
      */
@@ -703,7 +703,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
 
     /**
      * Removes a <code>BlurListener</code> from the Component.
-     * 
+     *
      * @param listener
      * @see BlurListener
      */
@@ -749,14 +749,14 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
     /**
      * This method is called to handle a non-empty date string from the client
      * if the client could not parse it as a Date.
-     * 
+     *
      * By default, an error result is returned whose error message is
      * {@link #getParseErrorMessage()}.
-     * 
+     *
      * This can be overridden to handle conversions, to return a result with
      * {@code null} value (equivalent to empty input) or to return a custom
      * error.
-     * 
+     *
      * @param dateString
      *            date string to handle
      * @return result that contains parsed Date as a value or an error
@@ -806,7 +806,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * if <code>rangeStart</code> is set to one millisecond before year n and
      * resolution is set to YEAR, any date in year n - 1 will be accepted.
      * Lowest supported resolution is DAY.
-     * 
+     *
      * @param forResolution
      *            - the range conforms to the resolution
      * @return
@@ -839,7 +839,7 @@ public class DateField extends AbstractField<Date> implements LegacyComponent {
      * to YEAR, any date in year n will be accepted. Resolutions lower than DAY
      * will be interpreted on a DAY level. That is, everything below DATE is
      * cleared
-     * 
+     *
      * @param forResolution
      *            - the range conforms to the resolution
      * @return
diff --git a/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java
index 77a827985f..82a78b344c 100644
--- a/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.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
@@ -73,7 +73,7 @@ public class DragAndDropWrapper extends CustomComponent
         /**
          * The component in wrapper that is being dragged or null if the
          * transferable is not a component (most likely an html5 drag).
-         * 
+         *
          * @return
          */
         public Component getDraggedComponent() {
@@ -136,7 +136,7 @@ public class DragAndDropWrapper extends CustomComponent
         }
 
         /**
-         * 
+         *
          * @return the absolute position of wrapper on the page
          */
         public Integer getAbsoluteTop() {
@@ -177,7 +177,7 @@ public class DragAndDropWrapper extends CustomComponent
         WRAPPER,
         /**
          * The whole wrapper is used to start an HTML5 drag.
-         * 
+         *
          * NOTE: In Internet Explorer 6 to 8, this prevents user interactions
          * with the wrapper's contents. For example, clicking a button inside
          * the wrapper will no longer work.
@@ -200,7 +200,7 @@ public class DragAndDropWrapper extends CustomComponent
     /**
      * This is an internal constructor. Use
      * {@link DragAndDropWrapper#DragAndDropWrapper(Component)} instead.
-     * 
+     *
      * @since 7.5.0
      */
     @Deprecated
@@ -211,7 +211,7 @@ public class DragAndDropWrapper extends CustomComponent
 
     /**
      * Wraps given component in a {@link DragAndDropWrapper}.
-     * 
+     *
      * @param root
      *            the component to be wrapped
      */
@@ -224,7 +224,7 @@ public class DragAndDropWrapper extends CustomComponent
      * Sets data flavors available in the DragAndDropWrapper is used to start an
      * HTML5 style drags. Most commonly the "Text" flavor should be set.
      * Multiple data types can be set.
-     * 
+     *
      * @param type
      *            the string identifier of the drag "payload". E.g. "Text" or
      *            "text/html"
@@ -279,7 +279,7 @@ public class DragAndDropWrapper extends CustomComponent
                          * We want to avoid a new ProxyReceiver to be made since
                          * it'll get a new URL, so we need to keep extra track
                          * on what has been sent.
-                         * 
+                         *
                          * See #12330.
                          */
                         sentIds.add(id);
@@ -335,7 +335,7 @@ public class DragAndDropWrapper extends CustomComponent
     /**
      * Sets the component that will be used as the drag image. Only used when
      * wrapper is set to {@link DragStartMode#COMPONENT_OTHER}
-     * 
+     *
      * @param dragImageComponent
      */
     public void setDragImageComponent(Component dragImageComponent) {
@@ -346,7 +346,7 @@ public class DragAndDropWrapper extends CustomComponent
     /**
      * Gets the component that will be used as the drag image. Only used when
      * wrapper is set to {@link DragStartMode#COMPONENT_OTHER}
-     * 
+     *
      * @return <code>null</code> if no component is set.
      */
     public Component getDragImageComponent() {
diff --git a/server/src/main/java/com/vaadin/ui/Embedded.java b/server/src/main/java/com/vaadin/ui/Embedded.java
index d83eef9c4d..8431faa83a 100644
--- a/server/src/main/java/com/vaadin/ui/Embedded.java
+++ b/server/src/main/java/com/vaadin/ui/Embedded.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
@@ -42,10 +42,10 @@ import com.vaadin.shared.ui.embedded.EmbeddedServerRpc;
  * Adobe Flash objects, and embedded web pages. This use of the component is
  * deprecated in Vaadin 7; the {@link Image}, {@link Flash}, and
  * {@link BrowserFrame} components should be used instead, respectively.
- * 
+ *
  * @see Video
  * @see Audio
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -59,7 +59,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Image types.
-     * 
+     *
      * @deprecated As of 7.0, use the {@link Image} component instead.
      */
     @Deprecated
@@ -67,7 +67,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Browser ("iframe") type.
-     * 
+     *
      * @deprecated As of 7.0, use the {@link BrowserFrame} component instead.
      */
     @Deprecated
@@ -119,7 +119,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Creates a new empty Embedded object with caption.
-     * 
+     *
      * @param caption
      */
     public Embedded(String caption) {
@@ -131,7 +131,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * Creates a new Embedded object whose contents is loaded from given
      * resource. The dimensions are assumed if possible. The type is guessed
      * from resource.
-     * 
+     *
      * @param caption
      * @param source
      *            the Source of the embedded object.
@@ -199,7 +199,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * presented instead of this component's normal content, for accessibility
      * purposes. Does not work when {@link #setType(int)} has been called with
      * {@link #TYPE_BROWSER}.
-     * 
+     *
      * @param altText
      *            A short, human-readable description of this component's
      *            content.
@@ -215,7 +215,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Gets this component's "alt-text".
-     * 
+     *
      * @see #setAlternateText(String)
      */
     public String getAlternateText() {
@@ -227,7 +227,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * are passed to the instantiated object. Parameters are are stored as name
      * value pairs. This overrides the previous value assigned to this
      * parameter.
-     * 
+     *
      * @param name
      *            the name of the parameter.
      * @param value
@@ -242,7 +242,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * Gets the value of an object parameter. Parameters are optional
      * information, and they are passed to the instantiated object. Parameters
      * are are stored as name value pairs.
-     * 
+     *
      * @return the Value of parameter or null if not found.
      */
     public String getParameter(String name) {
@@ -251,7 +251,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Removes an object parameter from the list.
-     * 
+     *
      * @param name
      *            the name of the parameter to remove.
      */
@@ -262,7 +262,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Gets the embedded object parameter names.
-     * 
+     *
      * @return the Iterator of parameters names.
      */
     public Iterator<String> getParameterNames() {
@@ -273,7 +273,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * This attribute specifies the base path used to resolve relative URIs
      * specified by the classid, data, and archive attributes. When absent, its
      * default value is the base URI of the current document.
-     * 
+     *
      * @return the code base.
      */
     public String getCodebase() {
@@ -282,7 +282,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Gets the MIME-Type of the code.
-     * 
+     *
      * @return the MIME-Type of the code.
      */
     public String getCodetype() {
@@ -291,7 +291,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Gets the MIME-Type of the object.
-     * 
+     *
      * @return the MIME-Type of the object.
      */
     public String getMimeType() {
@@ -301,7 +301,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * This attribute specifies a message that a user agent may render while
      * loading the object's implementation and data.
-     * 
+     *
      * @return The text displayed when loading
      */
     public String getStandby() {
@@ -312,7 +312,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * This attribute specifies the base path used to resolve relative URIs
      * specified by the classid, data, and archive attributes. When absent, its
      * default value is the base URI of the current document.
-     * 
+     *
      * @param codebase
      *            The base path
      */
@@ -330,7 +330,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * but recommended when classid is specified since it allows the user agent
      * to avoid loading information for unsupported content types. When absent,
      * it defaults to the value of the type attribute.
-     * 
+     *
      * @param codetype
      *            the codetype to set.
      */
@@ -344,7 +344,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Sets the mimeType, the MIME-Type of the object.
-     * 
+     *
      * @param mimeType
      *            the mimeType to set.
      */
@@ -370,7 +370,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * This attribute specifies a message that a user agent may render while
      * loading the object's implementation and data.
-     * 
+     *
      * @param standby
      *            The text to display while loading
      */
@@ -385,7 +385,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * This attribute may be used to specify the location of an object's
      * implementation via a URI.
-     * 
+     *
      * @return the classid.
      */
     public String getClassId() {
@@ -395,7 +395,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * This attribute may be used to specify the location of an object's
      * implementation via a URI.
-     * 
+     *
      * @param classId
      *            the classId to set.
      */
@@ -409,7 +409,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * Gets the resource contained in the embedded object.
-     * 
+     *
      * @return the Resource
      */
     public Resource getSource() {
@@ -425,7 +425,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * <li>TYPE_IMAGE
      * </ul>
      * </p>
-     * 
+     *
      * @return the type.
      */
     public int getType() {
@@ -435,7 +435,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * Sets the object source resource. The dimensions are assumed if possible.
      * The type is guessed from resource.
-     * 
+     *
      * @param source
      *            the source to set.
      */
@@ -470,7 +470,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * <li>{@link #TYPE_BROWSER} <i>(Deprecated)</i>
      * </ul>
      * </p>
-     * 
+     *
      * @param type
      *            the type to set.
      */
@@ -491,7 +491,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * archives will generally result in reduced load times for objects.
      * Archives specified as relative URIs should be interpreted relative to the
      * codebase attribute.
-     * 
+     *
      * @return Space-separated list of URIs with resources relevant to the
      *         object
      */
@@ -506,7 +506,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * archives will generally result in reduced load times for objects.
      * Archives specified as relative URIs should be interpreted relative to the
      * codebase attribute.
-     * 
+     *
      * @param archive
      *            Space-separated list of URIs with resources relevant to the
      *            object
@@ -523,9 +523,9 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
      * Add a click listener to the component. The listener is called whenever
      * the user clicks inside the component. Depending on the content the event
      * may be blocked and in that case no event is fired.
-     * 
+     *
      * Use {@link #removeListener(ClickListener)} to remove the listener.
-     * 
+     *
      * @param listener
      *            The listener to add
      */
@@ -546,7 +546,7 @@ public class Embedded extends AbstractComponent implements LegacyComponent {
     /**
      * Remove a click listener from the component. The listener should earlier
      * have been added using {@link #addListener(ClickListener)}.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
diff --git a/server/src/main/java/com/vaadin/ui/Flash.java b/server/src/main/java/com/vaadin/ui/Flash.java
index e5aa2a4d0c..f569b9ad16 100644
--- a/server/src/main/java/com/vaadin/ui/Flash.java
+++ b/server/src/main/java/com/vaadin/ui/Flash.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.declarative.DesignContext;
 
 /**
  * A component for displaying Adobe® Flash® content.
- * 
+ *
  * @author Vaadin Ltd.
  * @version @VERSION@
  * @since 7.0
@@ -45,7 +45,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Creates a new empty Flash component with the given caption
-     * 
+     *
      * @param caption
      *            The caption for the component
      */
@@ -55,7 +55,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Creates a new Flash component with the given caption and content.
-     * 
+     *
      * @param caption
      *            The caption for the component
      * @param source
@@ -81,7 +81,7 @@ public class Flash extends AbstractEmbedded {
      * This attribute specifies the base path used to resolve relative URIs
      * specified by the classid, data, and archive attributes. When absent, its
      * default value is the base URI of the current document.
-     * 
+     *
      * @param codebase
      *            The base path
      */
@@ -95,7 +95,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Returns the codebase.
-     * 
+     *
      * @see #setCodebase(String)
      * @since 7.4.1
      * @return Current codebase.
@@ -110,7 +110,7 @@ public class Flash extends AbstractEmbedded {
      * but recommended when classid is specified since it allows the user agent
      * to avoid loading information for unsupported content types. When absent,
      * it defaults to the value of the type attribute.
-     * 
+     *
      * @param codetype
      *            the codetype to set.
      */
@@ -124,7 +124,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Returns the current codetype.
-     * 
+     *
      * @see #setCodetype(String)
      * @since 7.4.1
      * @return Current codetype.
@@ -140,7 +140,7 @@ public class Flash extends AbstractEmbedded {
      * archives will generally result in reduced load times for objects.
      * Archives specified as relative URIs should be interpreted relative to the
      * codebase attribute.
-     * 
+     *
      * @param archive
      *            Space-separated list of URIs with resources relevant to the
      *            object
@@ -155,7 +155,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Returns current archive.
-     * 
+     *
      * @see #setArchive(String)
      * @since 7.4.1
      * @return Current archive.
@@ -166,7 +166,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Sets standby.
-     * 
+     *
      * @param standby
      *            Standby string.
      */
@@ -180,7 +180,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Returns standby.
-     * 
+     *
      * @since 7.4.1
      * @return Standby string.
      */
@@ -193,7 +193,7 @@ public class Flash extends AbstractEmbedded {
      * are passed to the instantiated object. Parameters are are stored as name
      * value pairs. This overrides the previous value assigned to this
      * parameter.
-     * 
+     *
      * @param name
      *            the name of the parameter.
      * @param value
@@ -211,7 +211,7 @@ public class Flash extends AbstractEmbedded {
      * Gets the value of an object parameter. Parameters are optional
      * information, and they are passed to the instantiated object. Parameters
      * are are stored as name value pairs.
-     * 
+     *
      * @return the Value of parameter or null if not found.
      */
     public String getParameter(String name) {
@@ -221,7 +221,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Removes an object parameter from the list.
-     * 
+     *
      * @param name
      *            the name of the parameter to remove.
      */
@@ -252,7 +252,7 @@ public class Flash extends AbstractEmbedded {
 
     /**
      * Returns an iterable with declared parameter names.
-     * 
+     *
      * @see #setParameter(String, String)
      * @see #getParameter(String)
      * @since 7.4.1
diff --git a/server/src/main/java/com/vaadin/ui/FormLayout.java b/server/src/main/java/com/vaadin/ui/FormLayout.java
index c817300e53..72d053fb4e 100644
--- a/server/src/main/java/com/vaadin/ui/FormLayout.java
+++ b/server/src/main/java/com/vaadin/ui/FormLayout.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
@@ -22,14 +22,14 @@ import com.vaadin.shared.ui.orderedlayout.FormLayoutState;
 /**
  * FormLayout is used by {@link Form} to layout fields. It may also be used
  * separately without {@link Form}.
- * 
+ *
  * FormLayout is a close relative of {@link VerticalLayout}, but in FormLayout
  * captions are rendered to the left of their respective components. Required
  * and validation indicators are shown between the captions and the fields.
- * 
+ *
  * FormLayout by default has component spacing on. Also margin top and margin
  * bottom are by default on.
- * 
+ *
  */
 public class FormLayout extends AbstractOrderedLayout {
 
@@ -42,9 +42,9 @@ public class FormLayout extends AbstractOrderedLayout {
 
     /**
      * Constructs a FormLayout and adds the given components to it.
-     * 
+     *
      * @see AbstractOrderedLayout#addComponents(Component...)
-     * 
+     *
      * @param children
      *            Components to add to the FormLayout
      */
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 67be288d73..06befe9fdb 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -125,11 +125,11 @@ import elemental.json.JsonValue;
  * Grid is always bound to a {@link Container.Indexed}, but is not a
  * {@code Container} of any kind in of itself. The contents of the given
  * Container is displayed with the help of {@link Renderer Renderers}.
- * 
+ *
  * <h3 id="grid-headers-and-footers">Headers and Footers</h3>
  * <p>
- * 
- * 
+ *
+ *
  * <h3 id="grid-converters-and-renderers">Converters and Renderers</h3>
  * <p>
  * Each column has its own {@link Renderer} that displays data into something
@@ -148,14 +148,14 @@ import elemental.json.JsonValue;
  * column.setConverter(new StringToDateConverter());
  * column.setRenderer(new MyColorfulDateRenderer());
  * </pre></code>
- * 
+ *
  * <h3 id="grid-lazyloading">Lazy Loading</h3>
  * <p>
  * The data is accessed as it is needed by Grid and not any sooner. In other
  * words, if the given Container is huge, but only the first few rows are
  * displayed to the user, only those (and a few more, for caching purposes) are
  * accessed.
- * 
+ *
  * <h3 id="grid-selection-modes-and-models">Selection Modes and Models</h3>
  * <p>
  * Grid supports three selection <em>{@link SelectionMode modes}</em> (single,
@@ -170,14 +170,14 @@ import elemental.json.JsonValue;
  * <p>
  * <code><pre>
  * Grid grid = new Grid(myContainer);
- * 
+ *
  * // uses the bundled SingleSelectionModel class
  * grid.setSelectionMode(SelectionMode.SINGLE);
- * 
+ *
  * // changes the behavior to a custom selection model
  * grid.setSelectionModel(new MyTwoSelectionModel());
  * </pre></code>
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -186,13 +186,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An event listener for column visibility change events in the Grid.
-     * 
+     *
      * @since 7.5.0
      */
     public interface ColumnVisibilityChangeListener extends Serializable {
         /**
          * Called when a column has become hidden or unhidden.
-         * 
+         *
          * @param event
          */
         void columnVisibilityChanged(ColumnVisibilityChangeEvent event);
@@ -200,7 +200,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An event that is fired when a column's visibility changes.
-     * 
+     *
      * @since 7.5.0
      */
     public static class ColumnVisibilityChangeEvent extends Component.Event {
@@ -211,7 +211,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Constructor for a column visibility change event.
-         * 
+         *
          * @param source
          *            the grid from which this event originates
          * @param column
@@ -233,7 +233,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the column that became hidden or visible.
-         * 
+         *
          * @return the column that became hidden or visible.
          * @see Column#isHidden()
          */
@@ -243,7 +243,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Was the column set hidden or visible.
-         * 
+         *
          * @return <code>true</code> if the column was hidden <code>false</code>
          *         if it was set visible
          */
@@ -254,7 +254,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns <code>true</code> if the column reorder was done by the user,
          * <code>false</code> if not and it was triggered by server side code.
-         * 
+         *
          * @return <code>true</code> if event is a result of user interaction
          */
         public boolean isUserOriginated() {
@@ -264,7 +264,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A callback interface for generating details for a particular row in Grid.
-     * 
+     *
      * @since 7.5.0
      * @author Vaadin Ltd
      * @see DetailsGenerator#NULL
@@ -288,7 +288,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <em>Note:</em> If a component gets generated, it may not be manually
          * attached anywhere. The same details component can not be displayed
          * for multiple different rows.
-         * 
+         *
          * @param rowReference
          *            the reference for the row for which to generate details
          * @return the details for the given row, or <code>null</code> to leave
@@ -303,7 +303,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * this class when the {@link RpcDataProviderExtension} is sending data to
      * the client. Details components are detached and forgotten when client
      * informs that it has dropped the corresponding item.
-     * 
+     *
      * @since 7.6.1
      */
     public final static class DetailComponentManager
@@ -311,7 +311,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * The user-defined details generator.
-         * 
+         *
          * @see #setDetailsGenerator(DetailsGenerator)
          */
         private DetailsGenerator detailsGenerator;
@@ -350,7 +350,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * {@link DetailsGenerator}.
          * <p>
          * This method attaches created components to the parent {@link Grid}.
-         * 
+         *
          * @param itemId
          *            the item id for which to create the details component.
          * @throws IllegalStateException
@@ -398,7 +398,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Destroys a details component correctly.
          * <p>
          * This method will detach the component from parent {@link Grid}.
-         * 
+         *
          * @param itemId
          *            the item id for which to destroy the details component
          */
@@ -429,7 +429,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets details visiblity status of given item id.
-         * 
+         *
          * @param itemId
          *            item id to set
          * @param visible
@@ -479,7 +479,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Sets a new details generator for row details.
          * <p>
          * The currently opened row details will be re-rendered.
-         * 
+         *
          * @param detailsGenerator
          *            the details generator to set
          * @throws IllegalArgumentException
@@ -501,7 +501,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the current details generator for row details.
-         * 
+         *
          * @return the detailsGenerator the current details generator
          */
         public DetailsGenerator getDetailsGenerator() {
@@ -510,7 +510,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Checks whether details are visible for the given item.
-         * 
+         *
          * @param itemId
          *            the id of the item for which to check details visibility
          * @return <code>true</code> iff the details are visible
@@ -553,7 +553,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Field factory used by default in the editor.
-     * 
+     *
      * Aims to fields of suitable type and with suitable size for use in the
      * editor row.
      */
@@ -566,7 +566,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the singleton instance
-         * 
+         *
          * @return the singleton instance
          */
         public static EditorFieldFactory get() {
@@ -612,7 +612,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Called when an exception occurs while the editor row is being saved
-         * 
+         *
          * @param event
          *            An event providing more information about the error
          */
@@ -621,7 +621,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * ContextClickEvent for the Grid Component.
-     * 
+     *
      * @since 7.6
      */
     public static class GridContextClickEvent extends ContextClickEvent {
@@ -643,7 +643,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the item id of context clicked row.
-         * 
+         *
          * @return item id of clicked row; <code>null</code> if header or footer
          */
         public Object getItemId() {
@@ -652,7 +652,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns property id of clicked column.
-         * 
+         *
          * @return property id
          */
         public Object getPropertyId() {
@@ -661,7 +661,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Return the clicked section of Grid.
-         * 
+         *
          * @return section of grid
          */
         public Section getSection() {
@@ -673,7 +673,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * of the Grid the index is the item index in the Container. Header and
          * Footer rows for index can be fetched with
          * {@link Grid#getHeaderRow(int)} and {@link Grid#getFooterRow(int)}.
-         * 
+         *
          * @return row index in section
          */
         public int getRowIndex() {
@@ -705,7 +705,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Retrieves the cause of the failure
-         * 
+         *
          * @return the cause of the failure
          */
         public CommitException getCause() {
@@ -719,7 +719,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Checks if validation exceptions caused this error
-         * 
+         *
          * @return true if the problem was caused by a validation error
          */
         public boolean isValidationFailure() {
@@ -729,7 +729,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Marks that an error indicator should be shown for the editor of a
          * column.
-         * 
+         *
          * @param column
          *            the column to show an error for
          */
@@ -739,7 +739,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets all the columns that have been marked as erroneous.
-         * 
+         *
          * @return an umodifiable collection of erroneous columns
          */
         public Collection<Column> getErrorColumns() {
@@ -748,7 +748,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the error message to show to the user.
-         * 
+         *
          * @return error message to show
          */
         public String getUserErrorMessage() {
@@ -757,7 +757,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets the error message to show to the user.
-         * 
+         *
          * @param userErrorMessage
          *            the user error message to set
          */
@@ -769,14 +769,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An event listener for column reorder events in the Grid.
-     * 
+     *
      * @since 7.5.0
      */
     public interface ColumnReorderListener extends Serializable {
 
         /**
          * Called when the columns of the grid have been reordered.
-         * 
+         *
          * @param event
          *            An event providing more information
          */
@@ -785,7 +785,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An event that is fired when the columns are reordered.
-     * 
+     *
      * @since 7.5.0
      */
     public static class ColumnReorderEvent extends Component.Event {
@@ -793,7 +793,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         private final boolean userOriginated;
 
         /**
-         * 
+         *
          * @param source
          *            the grid where the event originated from
          * @param userOriginated
@@ -808,7 +808,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns <code>true</code> if the column reorder was done by the user,
          * <code>false</code> if not and it was triggered by server side code.
-         * 
+         *
          * @return <code>true</code> if event is a result of user interaction
          */
         public boolean isUserOriginated() {
@@ -819,14 +819,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An event listener for column resize events in the Grid.
-     * 
+     *
      * @since 7.6
      */
     public interface ColumnResizeListener extends Serializable {
 
         /**
          * Called when the columns of the grid have been resized.
-         * 
+         *
          * @param event
          *            An event providing more information
          */
@@ -836,7 +836,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * An event that is fired when a column is resized, either programmatically
      * or by the user.
-     * 
+     *
      * @since 7.6
      */
     public static class ColumnResizeEvent extends Component.Event {
@@ -845,7 +845,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         private final boolean userOriginated;
 
         /**
-         * 
+         *
          * @param source
          *            the grid where the event originated from
          * @param userOriginated
@@ -861,7 +861,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the column that was resized.
-         * 
+         *
          * @return the resized column.
          */
         public Column getColumn() {
@@ -871,7 +871,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns <code>true</code> if the column resize was done by the user,
          * <code>false</code> if not and it was triggered by server side code.
-         * 
+         *
          * @return <code>true</code> if event is a result of user interaction
          */
         public boolean isUserOriginated() {
@@ -895,7 +895,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Called when an editor is opened
-         * 
+         *
          * @param e
          *            an editor open event object
          */
@@ -903,7 +903,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Called when an editor is reopened without closing it first
-         * 
+         *
          * @param e
          *            an editor move event object
          */
@@ -911,7 +911,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Called when an editor is closed
-         * 
+         *
          * @param e
          *            an editor close event object
          */
@@ -974,7 +974,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Default error handler for the editor
-     * 
+     *
      */
     public class DefaultEditorErrorHandler implements EditorErrorHandler {
 
@@ -1038,7 +1038,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link Grid#setSelectionMode(SelectionMode)} is equivalent to calling
      * {@link Grid#setSelectionModel(SelectionModel)} with one of the built-in
      * implementations of {@link SelectionModel}.
-     * 
+     *
      * @see Grid#setSelectionMode(SelectionMode)
      * @see Grid#setSelectionModel(SelectionModel)
      */
@@ -1078,7 +1078,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     public interface SelectionModel extends Serializable, Extension {
         /**
          * Checks whether an item is selected or not.
-         * 
+         *
          * @param itemId
          *            the item id to check for
          * @return <code>true</code> iff the item is selected
@@ -1087,7 +1087,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns a collection of all the currently selected itemIds.
-         * 
+         *
          * @return a collection of all the currently selected itemIds
          */
         Collection<Object> getSelectedRows();
@@ -1098,7 +1098,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * {@link AbstractExtension}.
          * <p>
          * <em>Note:</em> This method should not be called manually.
-         * 
+         *
          * @param grid
          *            the Grid in which the SelectionModel currently is, or
          *            <code>null</code> when a selection model is being detached
@@ -1131,7 +1131,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
              * <p>
              * This method does not clear any previous selection state, only
              * adds to it.
-             * 
+             *
              * @param itemIds
              *            the itemId(s) to mark as selected
              * @return <code>true</code> if the selection state changed.
@@ -1150,7 +1150,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
              * <p>
              * This method does not clear any previous selection state, only
              * adds to it.
-             * 
+             *
              * @param itemIds
              *            the itemIds to mark as selected
              * @return <code>true</code> if the selection state changed.
@@ -1166,7 +1166,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Marks items as deselected.
-             * 
+             *
              * @param itemIds
              *            the itemId(s) to remove from being selected
              * @return <code>true</code> if the selection state changed.
@@ -1181,7 +1181,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Marks items as deselected.
-             * 
+             *
              * @param itemIds
              *            the itemId(s) to remove from being selected
              * @return <code>true</code> if the selection state changed.
@@ -1196,7 +1196,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Marks all the items in the current Container as selected
-             * 
+             *
              * @return <code>true</code> iff some items were previously not
              *         selected
              * @see #deselectAll()
@@ -1205,7 +1205,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Marks all the items in the current Container as deselected
-             * 
+             *
              * @return <code>true</code> iff some items were previously selected
              * @see #selectAll()
              */
@@ -1214,7 +1214,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             /**
              * Marks items as selected while deselecting all items not in the
              * given Collection.
-             * 
+             *
              * @param itemIds
              *            the itemIds to mark as selected
              * @return <code>true</code> if the selection state changed.
@@ -1230,7 +1230,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             /**
              * Marks items as selected while deselecting all items not in the
              * varargs array.
-             * 
+             *
              * @param itemIds
              *            the itemIds to mark as selected
              * @return <code>true</code> if the selection state changed.
@@ -1258,7 +1258,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Marks an item as selected.
-             * 
+             *
              * @param itemId
              *            the itemId to mark as selected; <code>null</code> for
              *            deselect
@@ -1278,7 +1278,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Gets the item id of the currently selected item.
-             * 
+             *
              * @return the item id of the currently selected item, or
              *         <code>null</code> if nothing is selected
              */
@@ -1287,7 +1287,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             /**
              * Sets whether it's allowed to deselect the selected row through
              * the UI. Deselection is allowed by default.
-             * 
+             *
              * @param deselectAllowed
              *            <code>true</code> if the selected row can be
              *            deselected without selecting another row instead;
@@ -1298,7 +1298,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             /**
              * Sets whether it's allowed to deselect the selected row through
              * the UI.
-             * 
+             *
              * @return <code>true</code> if deselection is allowed; otherwise
              *         <code>false</code>
              */
@@ -1317,7 +1317,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * {@inheritDoc}
-             * 
+             *
              * @return always <code>false</code>.
              */
             @Override
@@ -1325,7 +1325,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * {@inheritDoc}
-             * 
+             *
              * @return always an empty collection.
              */
             @Override
@@ -1360,10 +1360,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sanity check for existence of item id.
-         * 
+         *
          * @param itemId
          *            item id to be selected / deselected
-         * 
+         *
          * @throws IllegalArgumentException
          *             if item Id doesn't exist in the container of Grid
          */
@@ -1377,10 +1377,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sanity check for existence of item ids in given collection.
-         * 
+         *
          * @param itemIds
          *            item id collection to be selected / deselected
-         * 
+         *
          * @throws IllegalArgumentException
          *             if at least one item id doesn't exist in the container of
          *             Grid
@@ -1400,7 +1400,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Note that this is only a helper method, and routes the call all the
          * way to Grid. A {@link SelectionModel} is not a
          * {@link SelectionNotifier}
-         * 
+         *
          * @param oldSelection
          *            the complete {@link Collection} of the itemIds that were
          *            selected <em>before</em> this event happened
@@ -1571,7 +1571,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * The default selection size limit.
-         * 
+         *
          * @see #setSelectionLimit(int)
          */
         public static final int DEFAULT_MAX_SELECTIONS = 1000;
@@ -1683,7 +1683,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * row exceeds the new limit.
          * <p>
          * The default limit is {@value #DEFAULT_MAX_SELECTIONS} rows.
-         * 
+         *
          * @param selectionLimit
          *            the non-negative selection limit to set
          * @throws IllegalArgumentException
@@ -1699,9 +1699,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the selection limit.
-         * 
+         *
          * @see #setSelectionLimit(int)
-         * 
+         *
          * @return the selection limit
          */
         public int getSelectionLimit() {
@@ -1850,7 +1850,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Compares two sets and returns a set containing all values that are
          * present in the first, but not in the second.
-         * 
+         *
          * @param set1
          *            first item set
          * @param set2
@@ -1905,7 +1905,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Creates a new row reference for the given grid.
-         * 
+         *
          * @param grid
          *            the grid that the row belongs to
          */
@@ -1915,7 +1915,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets the identifying information for this row
-         * 
+         *
          * @param itemId
          *            the item id of the row
          */
@@ -1925,7 +1925,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the grid that contains the referenced row.
-         * 
+         *
          * @return the grid that contains referenced row
          */
         public Grid getGrid() {
@@ -1934,7 +1934,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the item id of the row.
-         * 
+         *
          * @return the item id of the row
          */
         public Object getItemId() {
@@ -1943,7 +1943,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the item for the row.
-         * 
+         *
          * @return the item for the row
          */
         public Item getItem() {
@@ -1971,7 +1971,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets the identifying information for this cell
-         * 
+         *
          * @param propertyId
          *            the property id of the column
          */
@@ -1981,7 +1981,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the grid that contains the referenced cell.
-         * 
+         *
          * @return the grid that contains referenced cell
          */
         public Grid getGrid() {
@@ -2004,7 +2004,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the item id of the row of the cell.
-         * 
+         *
          * @return the item id of the row
          */
         public Object getItemId() {
@@ -2013,7 +2013,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the item for the row of the cell.
-         * 
+         *
          * @return the item for the row
          */
         public Item getItem() {
@@ -2022,7 +2022,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the value of the cell.
-         * 
+         *
          * @return the value of the cell
          */
         public Object getValue() {
@@ -2032,14 +2032,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A callback interface for generating custom style names for Grid rows.
-     * 
+     *
      * @see Grid#setRowStyleGenerator(RowStyleGenerator)
      */
     public interface RowStyleGenerator extends Serializable {
 
         /**
          * Called by Grid to generate a style name for a row.
-         * 
+         *
          * @param row
          *            the row to generate a style for
          * @return the style name to add to this row, or {@code null} to not set
@@ -2050,14 +2050,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A callback interface for generating custom style names for Grid cells.
-     * 
+     *
      * @see Grid#setCellStyleGenerator(CellStyleGenerator)
      */
     public interface CellStyleGenerator extends Serializable {
 
         /**
          * Called by Grid to generate a style name for a column.
-         * 
+         *
          * @param cell
          *            the cell to generate a style for
          * @return the style name to add to this cell, or {@code null} to not
@@ -2071,9 +2071,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Grid rows. If a description is generated for a row, it is used for all
      * the cells in the row for which a {@link CellDescriptionGenerator cell
      * description} is not generated.
-     * 
+     *
      * @see Grid#setRowDescriptionGenerator
-     * 
+     *
      * @since 7.6
      */
     public interface RowDescriptionGenerator extends Serializable {
@@ -2083,7 +2083,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * description may contain HTML which is rendered directly; if this is
          * not desired the returned string must be escaped by the implementing
          * method.
-         * 
+         *
          * @param row
          *            the row to generate a description for
          * @return the row description or {@code null} for no description
@@ -2095,9 +2095,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * A callback interface for generating optional descriptions (tooltips) for
      * Grid cells. If a cell has both a {@link RowDescriptionGenerator row
      * description} and a cell description, the latter has precedence.
-     * 
+     *
      * @see Grid#setCellDescriptionGenerator(CellDescriptionGenerator)
-     * 
+     *
      * @since 7.6
      */
     public interface CellDescriptionGenerator extends Serializable {
@@ -2107,7 +2107,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * description may contain HTML which is rendered directly; if this is
          * not desired the returned string must be escaped by the implementing
          * method.
-         * 
+         *
          * @param cell
          *            the cell to generate a description for
          * @return the cell description or {@code null} for no description
@@ -2209,7 +2209,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Abstract base class for Grid header and footer sections.
-     * 
+     *
      * @since 7.6
      * @param <ROWTYPE>
      *            the type of the rows in the section
@@ -2219,7 +2219,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Abstract base class for Grid header and footer rows.
-         * 
+         *
          * @param <CELLTYPE>
          *            the type of the cells in the row
          */
@@ -2277,7 +2277,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Creates and returns a new instance of the cell type.
-             * 
+             *
              * @return the created cell
              */
             protected abstract CELLTYPE createCell();
@@ -2289,7 +2289,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
             /**
              * Returns the cell for the given property id on this row. If the
              * column is merged returned cell is the cell for the whole group.
-             * 
+             *
              * @param propertyId
              *            the property id of the column
              * @return the cell for the given property, merged cell for merged
@@ -2306,7 +2306,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Merges columns cells in a row
-             * 
+             *
              * @param propertyIds
              *            The property ids of columns to merge
              * @return The remaining visible cell after the merge
@@ -2324,7 +2324,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Merges columns cells in a row
-             * 
+             *
              * @param cells
              *            The cells to merge. Must be from the same row.
              * @return The remaining visible cell after the merge
@@ -2369,7 +2369,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the custom style name for this row.
-             * 
+             *
              * @return the style name or null if no style name has been set
              */
             public String getStyleName() {
@@ -2378,7 +2378,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Sets a custom style name for this row.
-             * 
+             *
              * @param styleName
              *            the style name to set or null to not use any style
              *            name
@@ -2389,7 +2389,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Writes the declarative design to the given table row element.
-             * 
+             *
              * @since 7.5.0
              * @param trElement
              *            Element to write design to
@@ -2423,7 +2423,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Reads the declarative design from the given table row element.
-             * 
+             *
              * @since 7.5.0
              * @param trElement
              *            Element to read design from
@@ -2497,7 +2497,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Gets the row where this cell is.
-             * 
+             *
              * @return row for this cell
              */
             public StaticRow<?> getRow() {
@@ -2510,7 +2510,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Sets the text displayed in this cell.
-             * 
+             *
              * @param text
              *            a plain text caption
              */
@@ -2523,7 +2523,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the text displayed in this cell.
-             * 
+             *
              * @return the plain text caption
              */
             public String getText() {
@@ -2537,9 +2537,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the HTML content displayed in this cell.
-             * 
+             *
              * @return the html
-             * 
+             *
              */
             public String getHtml() {
                 if (cellState.type != GridStaticCellType.HTML) {
@@ -2552,7 +2552,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Sets the HTML content displayed in this cell.
-             * 
+             *
              * @param html
              *            the html to set
              */
@@ -2565,7 +2565,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the component displayed in this cell.
-             * 
+             *
              * @return the component
              */
             public Component getComponent() {
@@ -2579,7 +2579,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Sets the component displayed in this cell.
-             * 
+             *
              * @param component
              *            the component to set
              */
@@ -2593,7 +2593,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the type of content stored in this cell.
-             * 
+             *
              * @return cell content type
              */
             public GridStaticCellType getCellType() {
@@ -2602,7 +2602,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Returns the custom style name for this cell.
-             * 
+             *
              * @return the style name or null if no style name has been set
              */
             public String getStyleName() {
@@ -2611,7 +2611,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Sets a custom style name for this cell.
-             * 
+             *
              * @param styleName
              *            the style name to set or null to not use any style
              *            name
@@ -2631,7 +2631,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Writes the declarative design to the given table cell element.
-             * 
+             *
              * @since 7.5.0
              * @param cellElement
              *            Element to write design to
@@ -2657,7 +2657,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
             /**
              * Reads the declarative design from the given table cell element.
-             * 
+             *
              * @since 7.5.0
              * @param cellElement
              *            Element to read design from
@@ -2691,7 +2691,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets the visibility of the whole section.
-         * 
+         *
          * @param visible
          *            true to show this section, false to hide
          */
@@ -2704,7 +2704,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the visibility of this section.
-         * 
+         *
          * @return true if visible, false otherwise.
          */
         public boolean isVisible() {
@@ -2713,10 +2713,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Removes the row at the given position.
-         * 
+         *
          * @param rowIndex
          *            the position of the row
-         * 
+         *
          * @throws IllegalArgumentException
          *             if no row exists at given index
          * @see #removeRow(StaticRow)
@@ -2739,10 +2739,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Removes the given row from the section.
-         * 
+         *
          * @param row
          *            the row to be removed
-         * 
+         *
          * @throws IllegalArgumentException
          *             if the row does not exist in this section
          * @see #removeRow(int)
@@ -2761,7 +2761,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets row at given index.
-         * 
+         *
          * @param rowIndex
          *            0 based index for row. Counted from top to bottom
          * @return row at given index
@@ -2776,7 +2776,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Adds a new row at the top of this section.
-         * 
+         *
          * @return the new row
          * @see #appendRow()
          * @see #addRowAt(int)
@@ -2789,7 +2789,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Adds a new row at the bottom of this section.
-         * 
+         *
          * @return the new row
          * @see #prependRow()
          * @see #addRowAt(int)
@@ -2802,11 +2802,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Inserts a new row at the given position.
-         * 
+         *
          * @param index
          *            the position at which to insert the row
          * @return the new row
-         * 
+         *
          * @throws IndexOutOfBoundsException
          *             if the index is out of bounds
          * @see #appendRow()
@@ -2833,7 +2833,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the amount of rows in this section.
-         * 
+         *
          * @return row count
          */
         public int getRowCount() {
@@ -2853,7 +2853,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Removes a column for given property id from the section.
-         * 
+         *
          * @param propertyId
          *            property to be removed
          */
@@ -2865,7 +2865,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Adds a column for given property id to the section.
-         * 
+         *
          * @param propertyId
          *            property to be added
          */
@@ -2877,7 +2877,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Performs a sanity check that section is in correct state.
-         * 
+         *
          * @throws IllegalStateException
          *             if merged cells are not i n continuous range
          */
@@ -2917,7 +2917,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Writes the declarative design to the given table section element.
-         * 
+         *
          * @since 7.5.0
          * @param tableSectionElement
          *            Element to write design to
@@ -2934,7 +2934,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Writes the declarative design from the given table section element.
-         * 
+         *
          * @since 7.5.0
          * @param tableSectionElement
          *            Element to read design from
@@ -2980,10 +2980,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Sets the default row of this header. The default row is a special
          * header row providing a user interface for sorting columns.
-         * 
+         *
          * @param row
          *            the new default row, or null for no default row
-         * 
+         *
          * @throws IllegalArgumentException
          *             this header does not contain the row
          */
@@ -3012,7 +3012,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns the current default row of this header. The default row is a
          * special header row providing a user interface for sorting columns.
-         * 
+         *
          * @return the default row or null if no default row set
          */
         public HeaderRow getDefaultRow() {
@@ -3222,7 +3222,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Internally used constructor.
-         * 
+         *
          * @param grid
          *            The grid this column belongs to. Should not be null.
          * @param state
@@ -3240,7 +3240,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns the serializable state of this column that is sent to the
          * client side connector.
-         * 
+         *
          * @return the internal state of the column
          */
         GridColumnState getState() {
@@ -3249,7 +3249,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the property id for the backing property of this Column
-         * 
+         *
          * @return property id
          */
         public Object getPropertyId() {
@@ -3259,9 +3259,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns the caption of the header. By default the header caption is
          * the property id of the column.
-         * 
+         *
          * @return the text in the default row of header.
-         * 
+         *
          * @throws IllegalStateException
          *             if the column no longer is attached to the grid
          */
@@ -3275,11 +3275,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Sets the caption of the header. This caption is also used as the
          * hiding toggle caption, unless it is explicitly set via
          * {@link #setHidingToggleCaption(String)}.
-         * 
+         *
          * @param caption
          *            the text to show in the caption
          * @return the column itself
-         * 
+         *
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
          */
@@ -3301,7 +3301,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the caption of the hiding toggle for this column.
-         * 
+         *
          * @since 7.5.0
          * @see #setHidingToggleCaption(String)
          * @return the caption for the hiding toggle for this column
@@ -3323,7 +3323,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * <em>NOTE:</em> setting this to empty string might cause the hiding
          * toggle to not render correctly.
-         * 
+         *
          * @since 7.5.0
          * @param hidingToggleCaption
          *            the text to show in the column hiding toggle
@@ -3341,7 +3341,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the width (in pixels). By default a column is 100px wide.
-         * 
+         *
          * @return the width in pixels of the column
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
@@ -3357,11 +3357,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * This overrides any configuration set by any of
          * {@link #setExpandRatio(int)}, {@link #setMinimumWidth(double)} or
          * {@link #setMaximumWidth(double)}.
-         * 
+         *
          * @param pixelWidth
          *            the new pixel width of the column
          * @return the column itself
-         * 
+         *
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
          * @throws IllegalArgumentException
@@ -3385,7 +3385,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns whether this column has an undefined width.
-         * 
+         *
          * @since 7.6
          * @return whether the width is undefined
          * @throws IllegalStateException
@@ -3400,7 +3400,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Marks the column width as undefined. An undefined width means the
          * grid is free to resize the column based on the cell contents and
          * available space in the grid.
-         * 
+         *
          * @return the column itself
          */
         public Column setWidthUndefined() {
@@ -3416,7 +3416,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Checks if column is attached and throws an
          * {@link IllegalStateException} if it is not
-         * 
+         *
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
          */
@@ -3428,9 +3428,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets this column as the last frozen column in its grid.
-         * 
+         *
          * @return the column itself
-         * 
+         *
          * @throws IllegalArgumentException
          *             if the column is no longer attached to any grid
          * @see Grid#setFrozenColumnCount(int)
@@ -3448,14 +3448,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * If a suitable converter isn't defined explicitly, the session
          * converter factory is used to find a compatible converter.
-         * 
+         *
          * @param renderer
          *            the renderer to use
          * @return the column itself
-         * 
+         *
          * @throws IllegalArgumentException
          *             if no compatible converter could be found
-         * 
+         *
          * @see VaadinSession#getConverterFactory()
          * @see LegacyConverterUtil#getConverter(Class, Class, VaadinSession)
          * @see #setConverter(LegacyConverter)
@@ -3475,13 +3475,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Sets the renderer for this column and the converter used to convert
          * from the property value type to the renderer presentation type.
-         * 
+         *
          * @param renderer
          *            the renderer to use, cannot be null
          * @param converter
          *            the converter to use
          * @return the column itself
-         * 
+         *
          * @throws IllegalArgumentException
          *             if the renderer is already associated with a grid column
          */
@@ -3506,12 +3506,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Sets the converter used to convert from the property value type to
          * the renderer presentation type.
-         * 
+         *
          * @param converter
          *            the converter to use, or {@code null} to not use any
          *            converters
          * @return the column itself
-         * 
+         *
          * @throws IllegalArgumentException
          *             if the types are not compatible
          */
@@ -3542,7 +3542,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                  * Since the converter is null (i.e. will be removed), we need
                  * to know that the renderer and model are compatible. If not,
                  * we can't allow for this to happen.
-                 * 
+                 *
                  * The constructor is allowed to call this method with null
                  * without any compatibility checks, therefore we have a special
                  * case for it.
@@ -3574,7 +3574,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the renderer instance used by this column.
-         * 
+         *
          * @return the renderer
          */
         public Renderer<?> getRenderer() {
@@ -3583,7 +3583,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the converter instance used by this column.
-         * 
+         *
          * @return the converter
          */
         public LegacyConverter<?, ?> getConverter() {
@@ -3632,12 +3632,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * sorted by a sortable column by clicking or tapping the column's
          * default header. Programmatic sorting using the Grid#sort methods is
          * not affected by this setting.
-         * 
+         *
          * @param sortable
          *            {@code true} if the user should be able to sort the
          *            column, {@code false} otherwise
          * @return the column itself
-         * 
+         *
          * @throws IllegalStateException
          *             if the data source of the Grid does not implement
          *             {@link Sortable}
@@ -3673,7 +3673,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * <em>Note:</em> it is possible to sort by this column programmatically
          * using the Grid#sort methods regardless of the returned value.
-         * 
+         *
          * @return {@code true} if the column is sortable by the user,
          *         {@code false} otherwise
          */
@@ -3706,7 +3706,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * reserves only one of those. The column with a ratio of 2, is as wide
          * as it needs to be, <strong>plus two thirds</strong> of the excess
          * width.
-         * 
+         *
          * @param expandRatio
          *            the expand ratio of this column. {@code 0} to not have it
          *            expand at all. A negative number to clear the expand
@@ -3726,7 +3726,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the column's expand ratio.
-         * 
+         *
          * @return the column's expand ratio
          * @see #setExpandRatio(int)
          */
@@ -3738,7 +3738,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Clears the expand ratio for this column.
          * <p>
          * Equal to calling {@link #setExpandRatio(int) setExpandRatio(-1)}
-         * 
+         *
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
          */
@@ -3751,7 +3751,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * This defines the minimum guaranteed pixel width of the column
          * <em>when it is set to expand</em>.
-         * 
+         *
          * @throws IllegalStateException
          *             if the column is no longer attached to any grid
          * @see #setExpandRatio(int)
@@ -3773,7 +3773,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Return the minimum width for this column.
-         * 
+         *
          * @return the minimum width for this column
          * @see #setMinimumWidth(double)
          */
@@ -3786,7 +3786,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * This defines the maximum allowed pixel width of the column <em>when
          * it is set to expand</em>.
-         * 
+         *
          * @param pixels
          *            the maximum width
          * @throws IllegalStateException
@@ -3810,7 +3810,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns the maximum width for this column.
-         * 
+         *
          * @return the maximum width for this column
          * @see #setMaximumWidth(double)
          */
@@ -3828,15 +3828,15 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * are not automatically assigned an editor field and, if one is
          * manually assigned, it is not used. Columns that cannot (or should
          * not) be edited even in principle should be set non-editable.
-         * 
+         *
          * @param editable
          *            {@code true} if this column should be editable,
          *            {@code false} otherwise
          * @return this column
-         * 
+         *
          * @throws IllegalStateException
          *             if the editor is currently active
-         * 
+         *
          * @see Grid#editItem(Object)
          * @see Grid#isEditorActive()
          */
@@ -3854,10 +3854,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Returns whether the properties corresponding to this column should be
          * editable when the item editor is active.
-         * 
+         *
          * @return {@code true} if this column is editable, {@code false}
          *         otherwise
-         * 
+         *
          * @see Grid#editItem(Object)
          * @see #setEditable(boolean)
          */
@@ -3875,7 +3875,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Setting the field to <code>null</code> clears any previously set
          * field, causing a new field to be created the next time the item
          * editor is opened.
-         * 
+         *
          * @param editor
          *            the editor field
          * @return this column
@@ -3898,10 +3898,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * user-provided <code>FieldGroup</code> might cause
          * {@link com.vaadin.data.fieldgroup.FieldGroup.BindException
          * BindException} to be thrown.
-         * 
+         *
          * @return the bound field; or <code>null</code> if the respective
          *         column is not editable
-         * 
+         *
          * @throws IllegalArgumentException
          *             if there is no column for the provided property id
          * @throws FieldGroup.BindException
@@ -3915,7 +3915,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Hides or shows the column. By default columns are visible before
          * explicitly hiding them.
-         * 
+         *
          * @since 7.5.0
          * @param hidden
          *            <code>true</code> to hide the column, <code>false</code>
@@ -3933,7 +3933,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Returns whether this column is hidden. Default is {@code false}.
-         * 
+         *
          * @since 7.5.0
          * @return <code>true</code> if the column is currently hidden,
          *         <code>false</code> otherwise
@@ -3945,7 +3945,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Sets whether this column can be hidden by the user. Hidable columns
          * can be hidden and shown via the sidebar menu.
-         * 
+         *
          * @since 7.5.0
          * @param hidable
          *            <code>true</code> iff the column may be hidable by the
@@ -3966,7 +3966,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <p>
          * <em>Note:</em> the column can be programmatically hidden using
          * {@link #setHidden(boolean)} regardless of the returned value.
-         * 
+         *
          * @since 7.5.0
          * @return <code>true</code> if the user can hide the column,
          *         <code>false</code> if not
@@ -3977,7 +3977,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Sets whether this column can be resized by the user.
-         * 
+         *
          * @since 7.6
          * @param resizable
          *            {@code true} if this column should be resizable,
@@ -3998,7 +3998,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * <em>Note:</em> the column can be programmatically resized using
          * {@link #setWidth(double)} and {@link #setWidthUndefined()} regardless
          * of the returned value.
-         * 
+         *
          * @since 7.6
          * @return {@code true} if this column is resizable, {@code false}
          *         otherwise
@@ -4009,12 +4009,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Writes the design attributes for this column into given element.
-         * 
+         *
          * @since 7.5.0
-         * 
+         *
          * @param design
          *            Element to write attributes into
-         * 
+         *
          * @param designContext
          *            the design context
          */
@@ -4053,7 +4053,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Reads the design attributes for this column from given element.
-         * 
+         *
          * @since 7.5.0
          * @param design
          *            Element to read attributes from
@@ -4119,7 +4119,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * currently extends the AbstractExtension superclass, but this fact should
      * be regarded as an implementation detail and subject to change in a future
      * major or minor Vaadin revision.
-     * 
+     *
      * @param <T>
      *            the type this renderer knows how to present
      */
@@ -4176,7 +4176,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Null representation for the renderer
-         * 
+         *
          * @return a textual representation of {@code null}
          */
         protected String getNullRepresentation() {
@@ -4192,7 +4192,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * is desired. For instance, a {@code Renderer<Date>} could first turn a
          * date value into a formatted string and return
          * {@code encode(dateString, String.class)}.
-         * 
+         *
          * @param value
          *            the value to be encoded
          * @param type
@@ -4209,7 +4209,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * Converts and encodes the given data model property value using the
          * given converter and renderer. This method is public only for testing
          * purposes.
-         * 
+         *
          * @since 7.6
          * @param renderer
          *            the renderer to use
@@ -4278,7 +4278,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Note: If the extension is an instance of {@link DataGenerator} it will
      * automatically register itself to {@link RpcDataProviderExtension} of
      * extended Grid. On remove this registration is automatically removed.
-     * 
+     *
      * @since 7.5
      */
     public static abstract class AbstractGridExtension
@@ -4293,7 +4293,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Constructs a new Grid extension and extends given Grid.
-         * 
+         *
          * @param grid
          *            a grid instance
          */
@@ -4328,7 +4328,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * A key is used to identify a particular row on both a server and a
          * client. This method can be used to get the item id for the row key
          * that the client has sent.
-         * 
+         *
          * @param rowKey
          *            the row key for which to retrieve an item id
          * @return the item id corresponding to {@code key}
@@ -4343,7 +4343,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * An id is used to identify a particular column on both a server and a
          * client. This method can be used to get the column for the column id
          * that the client has sent.
-         * 
+         *
          * @param columnId
          *            the column id for which to retrieve a column
          * @return the column corresponding to {@code columnId}
@@ -4354,7 +4354,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Gets the parent Grid of the renderer.
-         * 
+         *
          * @return parent grid
          * @throws IllegalStateException
          *             if parent is not Grid
@@ -4376,7 +4376,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
         /**
          * Resends the row data for given item id to the client.
-         * 
+         *
          * @since 7.6
          * @param itemId
          *            row to refresh
@@ -4388,7 +4388,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Informs the parent Grid that this Extension wants to add a child
          * component to it.
-         * 
+         *
          * @since 7.6
          * @param c
          *            component
@@ -4400,7 +4400,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Informs the parent Grid that this Extension wants to remove a child
          * component from it.
-         * 
+         *
          * @since 7.6
          * @param c
          *            component
@@ -4523,7 +4523,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <code>true</code> if Grid is using the internal IndexedContainer created
      * in Grid() constructor, or <code>false</code> if the user has set their
      * own Container.
-     * 
+     *
      * @see #setContainerDataSource(Indexed)
      * @see #Grid()
      */
@@ -4565,7 +4565,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Creates a new Grid using the given data source.
-     * 
+     *
      * @param dataSource
      *            the indexed container to use as a data source
      */
@@ -4576,7 +4576,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Creates a new Grid with the given caption and a new
      * {@link IndexedContainer} data source.
-     * 
+     *
      * @param caption
      *            the caption of the grid
      */
@@ -4587,7 +4587,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Creates a new Grid with the given caption and data source. If the data
      * source is null, a new {@link IndexedContainer} will be used.
-     * 
+     *
      * @param caption
      *            the caption of the grid
      * @param dataSource
@@ -5012,7 +5012,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns the grid data source.
-     * 
+     *
      * @return the container data source of the grid
      */
     public Container.Indexed getContainerDataSource() {
@@ -5021,7 +5021,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns a column based on the property id
-     * 
+     *
      * @param propertyId
      *            the property id of the column
      * @return the column or <code>null</code> if not found
@@ -5033,7 +5033,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns a copy of currently configures columns in their current visual
      * order in this Grid.
-     * 
+     *
      * @return unmodifiable copy of current columns in visual order
      */
     public List<Column> getColumns() {
@@ -5051,11 +5051,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * Note that adding a new property is only done for the default container
      * that Grid sets up with the default constructor.
-     * 
+     *
      * @param propertyId
      *            the property id of the new column
      * @return the new column
-     * 
+     *
      * @throws IllegalStateException
      *             if column for given property already exists in this grid
      */
@@ -5098,13 +5098,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * Note that adding a new property is only done for the default container
      * that Grid sets up with the default constructor.
-     * 
+     *
      * @param propertyId
      *            the property id of the new column
      * @param type
      *            the data type for the new property
      * @return the new column
-     * 
+     *
      * @throws IllegalStateException
      *             if column for given property already exists in this grid or
      *             property already exists in the container with wrong type
@@ -5157,7 +5157,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Used internally by the {@link Grid} to get a {@link Column} by
      * referencing its generated state id. Also used by {@link Column} to verify
      * if it has been detached from the {@link Grid}.
-     * 
+     *
      * @param columnId
      *            the client id generated for the column when the column is
      *            added to the grid
@@ -5171,7 +5171,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Used internally by the {@link Grid} to get a property id by referencing
      * the columns generated state id.
-     * 
+     *
      * @param columnId
      *            The state id of the column
      * @return The column instance or null if not found
@@ -5183,7 +5183,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns whether column reordering is allowed. Default value is
      * <code>false</code>.
-     * 
+     *
      * @since 7.5.0
      * @return true if reordering is allowed
      */
@@ -5194,7 +5194,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Sets whether or not column reordering is allowed. Default value is
      * <code>false</code>.
-     * 
+     *
      * @since 7.5.0
      * @param columnReorderingAllowed
      *            specifies whether column reordering is allowed
@@ -5218,7 +5218,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Creates a new column based on a property id and appends it as the last
      * column.
-     * 
+     *
      * @param datasourcePropertyId
      *            The property id of a property in the datasource
      */
@@ -5255,10 +5255,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes a column from Grid based on a property id.
-     * 
+     *
      * @param propertyId
      *            The property id of column to be removed
-     * 
+     *
      * @throws IllegalArgumentException
      *             if there is no column for given property id in this grid
      */
@@ -5290,9 +5290,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * property id is not in propertyIds are removed. Similarly, a column is
      * added for any property id in propertyIds that has no corresponding column
      * in this Grid.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param propertyIds
      *            properties in the desired column order
      */
@@ -5314,7 +5314,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Sets a new column order for the grid. All columns which are not ordered
      * here will remain in the order they were before as the last columns of
      * grid.
-     * 
+     *
      * @param propertyIds
      *            properties in the order columns should be
      */
@@ -5346,10 +5346,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * -1 will also disable the selection column.
      * <p>
      * The default value is 0.
-     * 
+     *
      * @param numberOfColumns
      *            the number of columns that should be frozen
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the column count is < 0 or > the number of visible columns
      */
@@ -5371,9 +5371,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>NOTE:</em> this count includes {@link Column#isHidden() hidden
      * columns} in the count.
-     * 
+     *
      * @see #setFrozenColumnCount(int)
-     * 
+     *
      * @return the number of frozen columns
      */
     public int getFrozenColumnCount() {
@@ -5385,7 +5385,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * If the item has visible details, its size will also be taken into
      * account.
-     * 
+     *
      * @param itemId
      *            id of item to scroll to.
      * @throws IllegalArgumentException
@@ -5400,7 +5400,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * If the item has visible details, its size will also be taken into
      * account.
-     * 
+     *
      * @param itemId
      *            id of item to scroll to.
      * @param destination
@@ -5444,7 +5444,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * If Grid is currently not in {@link HeightMode#ROW}, the given value is
      * remembered, and applied once the mode is applied.
-     * 
+     *
      * @param rows
      *            The height in terms of number of rows displayed in Grid's
      *            body. If Grid doesn't contain enough rows, white space is
@@ -5474,7 +5474,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Gets the amount of rows in Grid's body that are shown, while
      * {@link #getHeightMode()} is {@link HeightMode#ROW}.
-     * 
+     *
      * @return the amount of rows that are being shown in Grid's body
      * @see #setHeightByRows(double)
      */
@@ -5487,7 +5487,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>Note:</em> This method will change the widget's size in the browser
      * only if {@link #getHeightMode()} returns {@link HeightMode#CSS}.
-     * 
+     *
      * @see #setHeightMode(HeightMode)
      */
     @Override
@@ -5506,7 +5506,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <em>Note:</em> If headers/footers are inserted or removed, the widget
      * will resize itself to still display the required amount of rows in its
      * body. It also takes the horizontal scrollbar into account.
-     * 
+     *
      * @param heightMode
      *            the mode in to which Grid should be set
      */
@@ -5516,7 +5516,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
          * widget dimensions (height/width) on each state change event. The
          * original design was to have setHeight and setHeightByRow be equals,
          * and whichever was called the latest was considered in effect.
-         * 
+         *
          * But, because of Vaadin always calling setHeight on the widget, this
          * approach doesn't work.
          */
@@ -5528,7 +5528,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Returns the current {@link HeightMode} the Grid is in.
      * <p>
      * Defaults to {@link HeightMode#CSS}.
-     * 
+     *
      * @return the current HeightMode
      */
     public HeightMode getHeightMode() {
@@ -5544,7 +5544,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * deselected.
      * <p>
      * If the given SelectionModel is already in use, this method does nothing.
-     * 
+     *
      * @param selectionModel
      *            the new SelectionModel to use
      * @throws IllegalArgumentException
@@ -5570,7 +5570,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns the currently used {@link SelectionModel}.
-     * 
+     *
      * @return the currently used SelectionModel
      */
     public SelectionModel getSelectionModel() {
@@ -5595,8 +5595,8 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * grid.setSelectionMode(SelectionMode.MULTI);
      * grid.setSelectionModel(new MultiSelectionMode());
      * </pre></code>
-     * 
-     * 
+     *
+     *
      * @param selectionMode
      *            the selection mode to switch to
      * @return The {@link SelectionModel} instance that was taken into use
@@ -5617,7 +5617,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Checks whether an item is selected or not.
-     * 
+     *
      * @param itemId
      *            the item id to check for
      * @return <code>true</code> iff the item is selected
@@ -5632,7 +5632,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}.
-     * 
+     *
      * @return a collection of all the currently selected itemIds
      */
     // keep this javadoc in sync with SelectionModel.getSelectedRows
@@ -5646,7 +5646,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
      * {@link SelectionModel.Single} is supported.
-     * 
+     *
      * @return the item id of the currently selected item, or <code>null</code>
      *         if nothing is selected
      * @throws IllegalStateException
@@ -5684,7 +5684,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link #getSelectionModel() selection model}. Only
      * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
      * supported.
-     * 
+     *
      * @param itemId
      *            the itemId to mark as selected
      * @return <code>true</code> if the selection state changed,
@@ -5730,7 +5730,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link #getSelectionModel() selection model}. Only
      * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
      * supported.
-     * 
+     *
      * @param itemId
      *            the itemId to remove from being selected
      * @return <code>true</code> if the selection state changed,
@@ -5777,7 +5777,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link #getSelectionModel() selection model}. Only
      * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
      * supported.
-     * 
+     *
      * @return <code>true</code> if the selection state changed,
      *         <code>false</code> if the itemId was already selected
      * @throws IllegalStateException
@@ -5818,7 +5818,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * application logic. This method is publicly accessible only so that
      * {@link SelectionModel SelectionModels} would be able to inform Grid of
      * these events.
-     * 
+     *
      * @param newSelection
      *            the selection that was added by this event
      * @param oldSelection
@@ -5845,7 +5845,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Registers a new column reorder listener.
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            the listener to register
@@ -5856,7 +5856,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes a previously registered column reorder listener.
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            the listener to remove
@@ -5872,7 +5872,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Registers a new column resize listener.
-     * 
+     *
      * @param listener
      *            the listener to register
      */
@@ -5882,7 +5882,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes a previously registered column resize listener.
-     * 
+     *
      * @param listener
      *            the listener to remove
      */
@@ -5892,7 +5892,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the {@link KeyMapper } being used by the data source.
-     * 
+     *
      * @return the key mapper being used by the data source
      */
     KeyMapper<Object> getKeyMapper() {
@@ -5901,7 +5901,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Adds a renderer to this grid's connector hierarchy.
-     * 
+     *
      * @param renderer
      *            the renderer to add
      */
@@ -5915,10 +5915,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>Note:</em> Sorting by a property that has no column in Grid will hide
      * all possible sorting indicators.
-     * 
+     *
      * @param s
      *            a sort instance
-     * 
+     *
      * @throws IllegalStateException
      *             if container is not sortable (does not implement
      *             Container.Sortable)
@@ -5934,10 +5934,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>Note:</em> Sorting by a property that has no column in Grid will hide
      * all possible sorting indicators.
-     * 
+     *
      * @param propertyId
      *            a property ID
-     * 
+     *
      * @throws IllegalStateException
      *             if container is not sortable (does not implement
      *             Container.Sortable)
@@ -5953,12 +5953,12 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>Note:</em> Sorting by a property that has no column in Grid will hide
      * all possible sorting indicators.
-     * 
+     *
      * @param propertyId
      *            a property ID
      * @param direction
      *            a sort order value (ascending/descending)
-     * 
+     *
      * @throws IllegalStateException
      *             if container is not sortable (does not implement
      *             Container.Sortable)
@@ -5982,10 +5982,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * <em>Note:</em> Sorting by a property that has no column in Grid will hide
      * all possible sorting indicators.
-     * 
+     *
      * @param order
      *            a sort order list.
-     * 
+     *
      * @throws IllegalStateException
      *             if container is not sortable (does not implement
      *             Container.Sortable)
@@ -6026,7 +6026,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Get the current sort order list.
-     * 
+     *
      * @return a sort order list
      */
     public List<SortOrder> getSortOrder() {
@@ -6091,7 +6091,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Adds a sort order change listener that gets notified when the sort order
      * changes.
-     * 
+     *
      * @param listener
      *            the sort order change listener to add
      */
@@ -6103,7 +6103,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Removes a sort order change listener previously added using
      * {@link #addSortListener(SortListener)}.
-     * 
+     *
      * @param listener
      *            the sort order change listener to remove
      */
@@ -6117,7 +6117,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns the header section of this grid. The default header contains a
      * single row displaying the column captions.
-     * 
+     *
      * @return the header
      */
     protected Header getHeader() {
@@ -6126,7 +6126,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the header row at given index.
-     * 
+     *
      * @param rowIndex
      *            0 based index for row. Counted from top to bottom
      * @return header row at given index
@@ -6141,11 +6141,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Inserts a new row at the given position to the header section. Shifts the
      * row currently at that position and any subsequent rows down (adds one to
      * their indices).
-     * 
+     *
      * @param index
      *            the position at which to insert the row
      * @return the new row
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the index is less than 0 or greater than row count
      * @see #appendHeaderRow()
@@ -6159,7 +6159,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Adds a new row at the bottom of the header section.
-     * 
+     *
      * @return the new row
      * @see #prependHeaderRow()
      * @see #addHeaderRowAt(int)
@@ -6174,7 +6174,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Returns the current default row of the header section. The default row is
      * a special header row providing a user interface for sorting columns.
      * Setting a header text for column updates cells in the default header.
-     * 
+     *
      * @return the default row or null if no default row set
      */
     public HeaderRow getDefaultHeaderRow() {
@@ -6183,7 +6183,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the row count for the header section.
-     * 
+     *
      * @return row count
      */
     public int getHeaderRowCount() {
@@ -6192,7 +6192,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Adds a new row at the top of the header section.
-     * 
+     *
      * @return the new row
      * @see #appendHeaderRow()
      * @see #addHeaderRowAt(int)
@@ -6205,10 +6205,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes the given row from the header section.
-     * 
+     *
      * @param row
      *            the row to be removed
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the row does not exist in this section
      * @see #removeHeaderRow(int)
@@ -6222,10 +6222,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes the row at the given position from the header section.
-     * 
+     *
      * @param rowIndex
      *            the position of the row
-     * 
+     *
      * @throws IllegalArgumentException
      *             if no row exists at given index
      * @see #removeHeaderRow(HeaderRow)
@@ -6240,10 +6240,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Sets the default row of the header. The default row is a special header
      * row providing a user interface for sorting columns.
-     * 
+     *
      * @param row
      *            the new default row, or null for no default row
-     * 
+     *
      * @throws IllegalArgumentException
      *             header does not contain the row
      */
@@ -6253,7 +6253,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the visibility of the header section.
-     * 
+     *
      * @param visible
      *            true to show header section, false to hide
      */
@@ -6263,7 +6263,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns the visibility of the header section.
-     * 
+     *
      * @return true if visible, false otherwise.
      */
     public boolean isHeaderVisible() {
@@ -6275,7 +6275,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns the footer section of this grid. The default header contains a
      * single row displaying the column captions.
-     * 
+     *
      * @return the footer
      */
     protected Footer getFooter() {
@@ -6284,7 +6284,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the footer row at given index.
-     * 
+     *
      * @param rowIndex
      *            0 based index for row. Counted from top to bottom
      * @return footer row at given index
@@ -6299,11 +6299,11 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Inserts a new row at the given position to the footer section. Shifts the
      * row currently at that position and any subsequent rows down (adds one to
      * their indices).
-     * 
+     *
      * @param index
      *            the position at which to insert the row
      * @return the new row
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the index is less than 0 or greater than row count
      * @see #appendFooterRow()
@@ -6317,7 +6317,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Adds a new row at the bottom of the footer section.
-     * 
+     *
      * @return the new row
      * @see #prependFooterRow()
      * @see #addFooterRowAt(int)
@@ -6330,7 +6330,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the row count for the footer.
-     * 
+     *
      * @return row count
      */
     public int getFooterRowCount() {
@@ -6339,7 +6339,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Adds a new row at the top of the footer section.
-     * 
+     *
      * @return the new row
      * @see #appendFooterRow()
      * @see #addFooterRowAt(int)
@@ -6352,10 +6352,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes the given row from the footer section.
-     * 
+     *
      * @param row
      *            the row to be removed
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the row does not exist in this section
      * @see #removeFooterRow(int)
@@ -6369,10 +6369,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes the row at the given position from the footer section.
-     * 
+     *
      * @param rowIndex
      *            the position of the row
-     * 
+     *
      * @throws IllegalArgumentException
      *             if no row exists at given index
      * @see #removeFooterRow(FooterRow)
@@ -6386,7 +6386,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the visibility of the footer section.
-     * 
+     *
      * @param visible
      *            true to show footer section, false to hide
      */
@@ -6396,7 +6396,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns the visibility of the footer section.
-     * 
+     *
      * @return true if visible, false otherwise.
      */
     public boolean isFooterVisible() {
@@ -6472,13 +6472,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link RowDescriptionGenerator} is also set, the row description it
      * generates is displayed for cells for which {@code generator} returns
      * null.
-     * 
+     *
      * @param generator
      *            the description generator to use or {@code null} to remove a
      *            previously set generator if any
-     * 
+     *
      * @see #setRowDescriptionGenerator(RowDescriptionGenerator)
-     * 
+     *
      * @since 7.6
      */
     public void setCellDescriptionGenerator(
@@ -6492,9 +6492,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns the {@code CellDescriptionGenerator} instance used to generate
      * descriptions (tooltips) for Grid cells.
-     * 
+     *
      * @return the description generator or {@code null} if no generator is set
-     * 
+     *
      * @since 7.6
      */
     public CellDescriptionGenerator getCellDescriptionGenerator() {
@@ -6507,14 +6507,14 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * {@link CellDescriptionGenerator} is also set, the row description
      * generated by {@code generator} is used for cells for which the cell
      * description generator returns null.
-     * 
-     * 
+     *
+     *
      * @param generator
      *            the description generator to use or {@code null} to remove a
      *            previously set generator if any
-     * 
+     *
      * @see #setCellDescriptionGenerator(CellDescriptionGenerator)
-     * 
+     *
      * @since 7.6
      */
     public void setRowDescriptionGenerator(RowDescriptionGenerator generator) {
@@ -6527,9 +6527,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Returns the {@code RowDescriptionGenerator} instance used to generate
      * descriptions (tooltips) for Grid rows
-     * 
+     *
      * @return the description generator or {@code} null if no generator is set
-     * 
+     *
      * @since 7.6
      */
     public RowDescriptionGenerator getRowDescriptionGenerator() {
@@ -6538,7 +6538,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the style generator that is used for generating styles for cells
-     * 
+     *
      * @param cellStyleGenerator
      *            the cell style generator to set, or <code>null</code> to
      *            remove a previously set generator
@@ -6550,7 +6550,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the style generator that is used for generating styles for cells
-     * 
+     *
      * @return the cell style generator, or <code>null</code> if no generator is
      *         set
      */
@@ -6560,7 +6560,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the style generator that is used for generating styles for rows
-     * 
+     *
      * @param rowStyleGenerator
      *            the row style generator to set, or <code>null</code> to remove
      *            a previously set generator
@@ -6572,7 +6572,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the style generator that is used for generating styles for rows
-     * 
+     *
      * @return the row style generator, or <code>null</code> if no generator is
      *         set
      */
@@ -6589,7 +6589,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * order might have been changed, it's better to instead add items directly
      * to the underlying container and use {@link Item#getItemProperty(Object)}
      * to make sure each value is assigned to the intended property.
-     * 
+     *
      * @param values
      *            the cell values of the new row, in the same order as the
      *            visible column order, not <code>null</code>.
@@ -6660,13 +6660,13 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * editor is enabled, the user can open it by double-clicking a row or
      * hitting enter when a row is focused. The editor can also be opened
      * programmatically using the {@link #editItem(Object)} method.
-     * 
+     *
      * @param isEnabled
      *            <code>true</code> to enable the feature, <code>false</code>
      *            otherwise
      * @throws IllegalStateException
      *             if an item is currently being edited
-     * 
+     *
      * @see #getEditedItemId()
      */
     public void setEditorEnabled(boolean isEnabled)
@@ -6683,9 +6683,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Checks whether the item editor UI is enabled for this grid.
-     * 
+     *
      * @return <code>true</code> iff the editor is enabled for this grid
-     * 
+     *
      * @see #setEditorEnabled(boolean)
      * @see #getEditedItemId()
      */
@@ -6695,7 +6695,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the id of the item that is currently being edited.
-     * 
+     *
      * @return the id of the item that is currently being edited, or
      *         <code>null</code> if no item is being edited at the moment
      */
@@ -6705,7 +6705,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the field group that is backing the item editor of this grid.
-     * 
+     *
      * @return the backing field group
      */
     public FieldGroup getEditorFieldGroup() {
@@ -6714,10 +6714,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the field group that is backing the item editor of this grid.
-     * 
+     *
      * @param fieldGroup
      *            the backing field group
-     * 
+     *
      * @throws IllegalStateException
      *             if the editor is currently active
      */
@@ -6732,7 +6732,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Returns whether an item is currently being edited in the editor.
-     * 
+     *
      * @return true iff the editor is open
      */
     public boolean isEditorActive() {
@@ -6775,10 +6775,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Opens the editor interface for the provided item. Scrolls the Grid to
      * bring the item to view if it is not already visible.
-     * 
+     *
      * Note that any cell content rendered by a WidgetRenderer will not be
      * visible in the editor row.
-     * 
+     *
      * @param itemId
      *            the id of the item to edit
      * @throws IllegalStateException
@@ -6846,10 +6846,10 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Saves all changes done to the bound fields.
      * <p>
      * <em>Note:</em> This is a pass-through call to the backing field group.
-     * 
+     *
      * @throws CommitException
      *             If the commit was aborted
-     * 
+     *
      * @see FieldGroup#commit()
      */
     public void saveEditor() throws CommitException {
@@ -6906,7 +6906,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * <p>
      * When {@link #editItem(Object) editItem} is called, fields are
      * automatically created and bound to any unbound properties.
-     * 
+     *
      * @return a collection of all the fields bound to the item editor
      */
     Collection<LegacyField<?>> getEditorFields() {
@@ -6929,7 +6929,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * only used when {@link FieldGroup} creates a new field.
      * <p>
      * <em>Note:</em> This is a pass-through call to the backing field group.
-     * 
+     *
      * @param fieldFactory
      *            The field factory to use
      */
@@ -6939,9 +6939,9 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the error handler for the editor.
-     * 
+     *
      * The error handler is called whenever there is an exception in the editor.
-     * 
+     *
      * @param editorErrorHandler
      *            The editor error handler to use
      * @throws IllegalArgumentException
@@ -6958,7 +6958,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the error handler used for the editor
-     * 
+     *
      * @see #setErrorHandler(com.vaadin.server.ErrorHandler)
      * @return the editor error handler, never null
      */
@@ -6971,7 +6971,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * only used when {@link FieldGroup} creates a new field.
      * <p>
      * <em>Note:</em> This is a pass-through call to the backing field group.
-     * 
+     *
      * @return The field factory in use
      */
     public FieldGroupFieldFactory getEditorFieldFactory() {
@@ -6980,7 +6980,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the caption on the save button in the Grid editor.
-     * 
+     *
      * @param saveCaption
      *            the caption to set
      * @throws IllegalArgumentException
@@ -6996,7 +6996,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the current caption of the save button in the Grid editor.
-     * 
+     *
      * @return the current caption of the save button
      */
     public String getEditorSaveCaption() {
@@ -7005,7 +7005,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Sets the caption on the cancel button in the Grid editor.
-     * 
+     *
      * @param cancelCaption
      *            the caption to set
      * @throws IllegalArgumentException
@@ -7021,7 +7021,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the current caption of the cancel button in the Grid editor.
-     * 
+     *
      * @return the current caption of the cancel button
      */
     public String getEditorCancelCaption() {
@@ -7031,7 +7031,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     /**
      * Sets the buffered editor mode. The default mode is buffered (
      * <code>true</code>).
-     * 
+     *
      * @since 7.6
      * @param editorBuffered
      *            <code>true</code> to enable buffered editor,
@@ -7052,7 +7052,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the buffered editor mode.
-     * 
+     *
      * @since 7.6
      * @return <code>true</code> if buffered editor is enabled,
      *         <code>false</code> otherwise
@@ -7091,7 +7091,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * In most cases Grid will know when column widths need to be recalculated
      * but this method can be used to force recalculation in situations when
      * grid does not recalculate automatically.
-     * 
+     *
      * @since 7.4.1
      */
     public void recalculateColumnWidths() {
@@ -7100,7 +7100,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Registers a new column visibility change listener
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            the listener to register
@@ -7113,7 +7113,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Removes a previously registered column visibility change listener
-     * 
+     *
      * @since 7.5.0
      * @param listener
      *            the listener to remove
@@ -7134,7 +7134,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * Sets a new details generator for row details.
      * <p>
      * The currently opened row details will be re-rendered.
-     * 
+     *
      * @since 7.5.0
      * @param detailsGenerator
      *            the details generator to set
@@ -7148,7 +7148,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Gets the current details generator for row details.
-     * 
+     *
      * @since 7.5.0
      * @return the detailsGenerator the current details generator
      */
@@ -7158,7 +7158,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Shows or hides the details for a specific item.
-     * 
+     *
      * @since 7.5.0
      * @param itemId
      *            the id of the item for which to set details visibility
@@ -7172,7 +7172,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Checks whether details are visible for the given item.
-     * 
+     *
      * @since 7.5.0
      * @param itemId
      *            the id of the item for which to check details visibility
diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java
index 112c118a27..66195c4a6f 100644
--- a/server/src/main/java/com/vaadin/ui/GridLayout.java
+++ b/server/src/main/java/com/vaadin/ui/GridLayout.java
@@ -50,12 +50,12 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * A layout where the components are laid out on a grid using cell coordinates.
- * 
+ *
  * <p>
  * The GridLayout also maintains a cursor for adding components in
  * left-to-right, top-to-bottom order.
  * </p>
- * 
+ *
  * <p>
  * Each component in a <code>GridLayout</code> uses a defined
  * {@link GridLayout.Area area} (column1,row1,column2,row2) from the grid. The
@@ -63,12 +63,12 @@ import com.vaadin.ui.declarative.DesignContext;
  * you will get an {@link OverlapsException}. Adding a component with cursor
  * automatically extends the grid by increasing the grid height.
  * </p>
- * 
+ *
  * <p>
  * The grid coordinates, which are specified by a row and column index, always
  * start from 0 for the topmost row and the leftmost column.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -107,10 +107,10 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Constructor for a grid of given size (number of columns and rows).
-     * 
+     *
      * The grid may grow or shrink later. Grid grows automatically if you add
      * components outside its area.
-     * 
+     *
      * @param columns
      *            Number of columns in the grid.
      * @param rows
@@ -132,9 +132,9 @@ public class GridLayout extends AbstractLayout
     /**
      * Constructs a GridLayout of given size (number of columns and rows) and
      * adds the given components in order to the grid.
-     * 
+     *
      * @see #addComponents(Component...)
-     * 
+     *
      * @param columns
      *            Number of columns in the grid.
      * @param rows
@@ -163,13 +163,13 @@ public class GridLayout extends AbstractLayout
      * by specifying the upper left corner (column1, row1) and the lower right
      * corner (column2, row2) of the area. The coordinates are zero-based.
      * </p>
-     * 
+     *
      * <p>
      * If the area overlaps with any of the existing components already present
      * in the grid, the operation will fail and an {@link OverlapsException} is
      * thrown.
      * </p>
-     * 
+     *
      * @param component
      *            the component to be added, not <code>null</code>.
      * @param column1
@@ -271,7 +271,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Tests if the given area overlaps with any of the items already on the
      * grid.
-     * 
+     *
      * @param area
      *            the Area to be checked for overlapping.
      * @throws OverlapsException
@@ -293,7 +293,7 @@ public class GridLayout extends AbstractLayout
      * the area.) End coordinates (SouthEast corner of the area) are the same as
      * column1,row1. The coordinates are zero-based. Component width and height
      * is 1.
-     * 
+     *
      * @param component
      *            the component to be added, not <code>null</code>.
      * @param column
@@ -313,16 +313,16 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Forces the next component to be added at the beginning of the next line.
-     * 
+     *
      * <p>
      * Sets the cursor column to 0 and increments the cursor row by one.
      * </p>
-     * 
+     *
      * <p>
      * By calling this function you can ensure that no more components are added
      * right of the previous component.
      * </p>
-     * 
+     *
      * @see #space()
      */
     public void newLine() {
@@ -333,7 +333,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Moves the cursor forward by one. If the cursor goes out of the right grid
      * border, it is moved to the first column of the next row.
-     * 
+     *
      * @see #newLine()
      */
     public void space() {
@@ -349,7 +349,7 @@ public class GridLayout extends AbstractLayout
      * cursor position is already occupied, the cursor is moved forwards to find
      * free position. If the cursor goes out from the bottom of the grid, the
      * grid is automatically extended.
-     * 
+     *
      * @param component
      *            the component to be added, not <code>null</code>.
      */
@@ -385,7 +385,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Removes the specified component from the layout.
-     * 
+     *
      * @param component
      *            the component to be removed.
      */
@@ -404,7 +404,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Removes the component specified by its cell coordinates.
-     * 
+     *
      * @param column
      *            the component's column, starting from 0.
      * @param row
@@ -428,7 +428,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Gets an Iterator for the components contained in the layout. By using the
      * Iterator it is possible to step through the contents of the layout.
-     * 
+     *
      * @return the Iterator of the components inside the layout.
      */
     @Override
@@ -439,7 +439,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Gets the number of components contained in the layout. Consistent with
      * the iterator returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components
      */
     @Override
@@ -489,7 +489,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com
      * .vaadin.ui.Component)
      */
@@ -507,17 +507,17 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Defines a rectangular area of cells in a GridLayout.
-     * 
+     *
      * <p>
      * Also maintains a reference to the component contained in the area.
      * </p>
-     * 
+     *
      * <p>
      * The area is specified by the cell coordinates of its upper left corner
      * (column1,row1) and lower right corner (column2,row2). As otherwise with
      * GridLayout, the column and row coordinates start from zero.
      * </p>
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -529,7 +529,7 @@ public class GridLayout extends AbstractLayout
          * <p>
          * Construct a new area on a grid.
          * </p>
-         * 
+         *
          * @param component
          *            the component connected to the area.
          * @param column1
@@ -563,7 +563,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Tests if this Area overlaps with another Area.
-         * 
+         *
          * @param other
          *            the other Area that is to be tested for overlap with this
          *            area
@@ -576,7 +576,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the component connected to the area.
-         * 
+         *
          * @return the Component.
          */
         public Component getComponent() {
@@ -585,7 +585,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the column of the top-left corner cell.
-         * 
+         *
          * @return the column of the top-left corner cell.
          */
         public int getColumn1() {
@@ -594,7 +594,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the column of the bottom-right corner cell.
-         * 
+         *
          * @return the column of the bottom-right corner cell.
          */
         public int getColumn2() {
@@ -603,7 +603,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the row of the top-left corner cell.
-         * 
+         *
          * @return the row of the top-left corner cell.
          */
         public int getRow1() {
@@ -612,7 +612,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the row of the bottom-right corner cell.
-         * 
+         *
          * @return the row of the bottom-right corner cell.
          */
         public int getRow2() {
@@ -631,7 +631,7 @@ public class GridLayout extends AbstractLayout
      * Gridlayout does not support laying components on top of each other. An
      * <code>OverlapsException</code> is thrown when a component already exists
      * (even partly) at the same space on a grid with the new component.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -641,7 +641,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Constructs an <code>OverlapsException</code>.
-         * 
+         *
          * @param existingArea
          */
         public OverlapsException(Area existingArea) {
@@ -676,7 +676,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the area .
-         * 
+         *
          * @return the existing area.
          */
         public Area getArea() {
@@ -687,7 +687,7 @@ public class GridLayout extends AbstractLayout
     /**
      * An <code>Exception</code> object which is thrown when an area exceeds the
      * bounds of the grid.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -698,7 +698,7 @@ public class GridLayout extends AbstractLayout
         /**
          * Constructs an <code>OoutOfBoundsException</code> with the specified
          * detail message.
-         * 
+         *
          * @param areaOutOfBounds
          */
         public OutOfBoundsException(Area areaOutOfBounds) {
@@ -707,7 +707,7 @@ public class GridLayout extends AbstractLayout
 
         /**
          * Gets the area that is out of bounds.
-         * 
+         *
          * @return the area out of Bound.
          */
         public Area getArea() {
@@ -718,7 +718,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Sets the number of columns in the grid. The column count can not be
      * reduced if there are any areas that would be outside of the shrunk grid.
-     * 
+     *
      * @param columns
      *            the new number of columns in the grid.
      */
@@ -759,7 +759,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Get the number of columns in the grid.
-     * 
+     *
      * @return the number of columns in the grid.
      */
     public int getColumns() {
@@ -769,7 +769,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Sets the number of rows in the grid. The number of rows can not be
      * reduced if there are any areas that would be outside of the shrunk grid.
-     * 
+     *
      * @param rows
      *            the new number of rows in the grid.
      */
@@ -809,7 +809,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Get the number of rows in the grid.
-     * 
+     *
      * @return the number of rows in the grid.
      */
     public int getRows() {
@@ -818,14 +818,14 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Gets the current x-position (column) of the cursor.
-     * 
+     *
      * <p>
      * The cursor position points the position for the next component that is
      * added without specifying its coordinates (grid cell). When the cursor
      * position is occupied, the next component will be added to first free
      * position after the cursor.
      * </p>
-     * 
+     *
      * @return the grid column the cursor is on, starting from 0.
      */
     public int getCursorX() {
@@ -835,7 +835,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Sets the current cursor x-position. This is usually handled automatically
      * by GridLayout.
-     * 
+     *
      * @param cursorX
      */
     public void setCursorX(int cursorX) {
@@ -844,14 +844,14 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Gets the current y-position (row) of the cursor.
-     * 
+     *
      * <p>
      * The cursor position points the position for the next component that is
      * added without specifying its coordinates (grid cell). When the cursor
      * position is occupied, the next component will be added to the first free
      * position after the cursor.
      * </p>
-     * 
+     *
      * @return the grid row the Cursor is on.
      */
     public int getCursorY() {
@@ -861,7 +861,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Sets the current y-coordinate (row) of the cursor. This is usually
      * handled automatically by GridLayout.
-     * 
+     *
      * @param cursorY
      *            the row number, starting from 0 for the topmost row.
      */
@@ -896,7 +896,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * Removes all components from this container.
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#removeAllComponents()
      */
     @Override
@@ -926,7 +926,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean)
      */
     @Override
@@ -936,7 +936,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     @Override
@@ -946,7 +946,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Inserts an empty row at the specified position in the grid.
-     * 
+     *
      * @param row
      *            Index of the row before which the new row will be inserted.
      *            The leftmost row has index 0.
@@ -980,18 +980,18 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Removes a row and all the components in the row.
-     * 
+     *
      * <p>
      * Components which span over several rows are removed if the selected row
      * is on the first row of such a component.
      * </p>
-     * 
+     *
      * <p>
      * If the last row is removed then all remaining components will be removed
      * and the grid will be reduced to one row. The cursor will be moved to the
      * upper left cell of the grid.
      * </p>
-     * 
+     *
      * @param row
      *            Index of the row to remove. The leftmost row has index 0.
      */
@@ -1038,13 +1038,13 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Sets the expand ratio of given column.
-     * 
+     *
      * <p>
      * The expand ratio defines how excess space is distributed among columns.
      * Excess space means space that is left over from components that are not
      * sized relatively. By default, the excess space is distributed evenly.
      * </p>
-     * 
+     *
      * <p>
      * Note, that width of this GridLayout needs to be defined (fixed or
      * relative, as opposed to undefined height) for this method to have any
@@ -1054,9 +1054,9 @@ public class GridLayout extends AbstractLayout
      * the server so you cannot set a child component to have undefined width on
      * the server and set it to <code>100%</code> in CSS. You must set it to
      * <code>100%</code> on the server.
-     * 
+     *
      * @see #setWidth(float, int)
-     * 
+     *
      * @param columnIndex
      * @param ratio
      */
@@ -1068,9 +1068,9 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Returns the expand ratio of given column
-     * 
+     *
      * @see #setColumnExpandRatio(int, float)
-     * 
+     *
      * @param columnIndex
      * @return the expand ratio, 0.0f by default
      */
@@ -1081,13 +1081,13 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Sets the expand ratio of given row.
-     * 
+     *
      * <p>
      * Expand ratio defines how excess space is distributed among rows. Excess
      * space means the space left over from components that are not sized
      * relatively. By default, the excess space is distributed evenly.
      * </p>
-     * 
+     *
      * <p>
      * Note, that height of this GridLayout needs to be defined (fixed or
      * relative, as opposed to undefined height) for this method to have any
@@ -1097,9 +1097,9 @@ public class GridLayout extends AbstractLayout
      * on the server so you cannot set a child component to have undefined
      * height on the server and set it to <code>100%</code> in CSS. You must set
      * it to <code>100%</code> on the server.
-     * 
+     *
      * @see #setHeight(float, int)
-     * 
+     *
      * @param rowIndex
      *            The row index, starting from 0 for the topmost row.
      * @param ratio
@@ -1112,9 +1112,9 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Returns the expand ratio of given row.
-     * 
+     *
      * @see #setRowExpandRatio(int, float)
-     * 
+     *
      * @param rowIndex
      *            The row index, starting from 0 for the topmost row.
      * @return the expand ratio, 0.0f by default
@@ -1126,7 +1126,7 @@ public class GridLayout extends AbstractLayout
 
     /**
      * Gets the Component at given index.
-     * 
+     *
      * @param x
      *            The column index, starting from 0 for the leftmost column.
      * @param y
@@ -1148,7 +1148,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Returns information about the area where given component is laid in the
      * GridLayout.
-     * 
+     *
      * @param component
      *            the component whose area information is requested.
      * @return an Area object that contains information how component is laid in
@@ -1199,7 +1199,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.MarginHandler#setMargin(boolean)
      */
     @Override
@@ -1209,7 +1209,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.MarginHandler#setMargin(com.vaadin.shared.ui.
      * MarginInfo )
      */
@@ -1220,7 +1220,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.MarginHandler#getMargin()
      */
     @Override
@@ -1230,7 +1230,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Layout.AlignmentHandler#getDefaultComponentAlignment()
      */
     @Override
@@ -1240,7 +1240,7 @@ public class GridLayout extends AbstractLayout
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.Layout.AlignmentHandler#setDefaultComponentAlignment(com
      * .vaadin.ui.Alignment)
@@ -1254,12 +1254,12 @@ public class GridLayout extends AbstractLayout
      * Sets whether empty rows and columns should be considered as non-existent
      * when rendering or not. If this is set to true then the spacing between
      * multiple empty columns (or rows) will be collapsed.
-     * 
+     *
      * The default behavior is to consider all rows and columns as visible
-     * 
+     *
      * NOTE that this must be set before the initial rendering takes place.
      * Updating this on the fly is not supported.
-     * 
+     *
      * @since 7.3
      * @param hideEmptyRowsAndColumns
      *            true to hide empty rows and columns, false to leave them as-is
@@ -1271,7 +1271,7 @@ public class GridLayout extends AbstractLayout
     /**
      * Checks whether whether empty rows and columns should be considered as
      * non-existent when rendering or not.
-     * 
+     *
      * @see #setHideEmptyRowsAndColumns(boolean)
      * @since 7.3
      * @return true if empty rows and columns are hidden, false otherwise
@@ -1573,7 +1573,7 @@ public class GridLayout extends AbstractLayout
      * for empty {@link GridLayout}, because there's no other way to serialize
      * info about number of columns and rows if there are absolutely no
      * components in the {@link GridLayout}
-     * 
+     *
      * @param design
      * @param designContext
      */
diff --git a/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.java b/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.java
index 86d33f57b2..fac7cf4dbd 100644
--- a/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.java
+++ b/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.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
@@ -18,7 +18,7 @@ package com.vaadin.ui;
 /**
  * Component with layout measuring hint. Used to improve granularity of control
  * over child component measurements.
- * 
+ *
  * @since 7.6
  * @author Vaadin Ltd
  */
@@ -52,7 +52,7 @@ public interface HasChildMeasurementHint extends HasComponents {
 
     /**
      * Sets desired child size measurement hint.
-     * 
+     *
      * @param hint
      *            desired hint. A value of null will reset value back to the
      *            default (MEASURE_ALWAYS)
@@ -61,7 +61,7 @@ public interface HasChildMeasurementHint extends HasComponents {
 
     /**
      * Returns the current child size measurement hint.
-     * 
+     *
      * @return a child measurement hint value
      */
     ChildMeasurementHint getChildMeasurementHint();
diff --git a/server/src/main/java/com/vaadin/ui/HasComponents.java b/server/src/main/java/com/vaadin/ui/HasComponents.java
index fed8676f7e..58a4ac6668 100644
--- a/server/src/main/java/com/vaadin/ui/HasComponents.java
+++ b/server/src/main/java/com/vaadin/ui/HasComponents.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,17 +24,17 @@ import com.vaadin.util.ReflectTools;
 /**
  * Interface that must be implemented by all {@link Component}s that contain
  * other {@link Component}s.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
- * 
+ *
  */
 public interface HasComponents extends Component, Iterable<Component> {
     /**
      * Gets an iterator to the collection of contained components. Using this
      * iterator it is possible to step through all components contained in this
      * container.
-     * 
+     *
      * @return the component iterator.
      */
     @Override
@@ -43,13 +43,13 @@ public interface HasComponents extends Component, Iterable<Component> {
     /**
      * Interface for {@link HasComponents} implementations that support sending
      * attach and detach events for components.
-     * 
+     *
      * @since 7.0
      */
     public interface ComponentAttachDetachNotifier extends Serializable {
         /**
          * Listens the component attach events.
-         * 
+         *
          * @param listener
          *            the listener to add.
          */
@@ -58,7 +58,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Stops the listening component attach events.
-         * 
+         *
          * @param listener
          *            the listener to removed.
          */
@@ -89,7 +89,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * A new component is attached to container.
-         * 
+         *
          * @param event
          *            the component attach event.
          */
@@ -107,7 +107,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * A component has been detached from container.
-         * 
+         *
          * @param event
          *            the component detach event.
          */
@@ -124,7 +124,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Creates a new attach event.
-         * 
+         *
          * @param container
          *            the container the component has been detached to.
          * @param attachedComponent
@@ -138,7 +138,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Gets the component container.
-         * 
+         *
          * @param the
          *            component container.
          */
@@ -148,7 +148,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Gets the attached component.
-         * 
+         *
          * @param the
          *            attach component.
          */
@@ -167,7 +167,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Creates a new detach event.
-         * 
+         *
          * @param container
          *            the container the component has been detached from.
          * @param detachedComponent
@@ -181,7 +181,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Gets the component container.
-         * 
+         *
          * @param the
          *            component container.
          */
@@ -191,7 +191,7 @@ public interface HasComponents extends Component, Iterable<Component> {
 
         /**
          * Gets the detached component.
-         * 
+         *
          * @return the detached component.
          */
         public Component getDetachedComponent() {
diff --git a/server/src/main/java/com/vaadin/ui/HorizontalLayout.java b/server/src/main/java/com/vaadin/ui/HorizontalLayout.java
index 616fa09225..32378a4652 100644
--- a/server/src/main/java/com/vaadin/ui/HorizontalLayout.java
+++ b/server/src/main/java/com/vaadin/ui/HorizontalLayout.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
@@ -19,10 +19,10 @@ import com.vaadin.shared.ui.orderedlayout.HorizontalLayoutState;
 
 /**
  * Horizontal layout
- * 
+ *
  * <code>HorizontalLayout</code> is a component container, which shows the
  * subcomponents in the order of their addition (horizontally).
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.3
  */
@@ -39,9 +39,9 @@ public class HorizontalLayout extends AbstractOrderedLayout {
     /**
      * Constructs a HorizontalLayout with the given components. The components
      * are added in the given order.
-     * 
+     *
      * @see AbstractOrderedLayout#addComponents(Component...)
-     * 
+     *
      * @param children
      *            The components to add.
      */
diff --git a/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.java b/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.java
index 922986eeda..e176573d3c 100644
--- a/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.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
@@ -20,9 +20,9 @@ import com.vaadin.shared.ui.splitpanel.HorizontalSplitPanelState;
 /**
  * A horizontal split panel contains two components and lays them horizontally.
  * The first component is on the left side.
- * 
+ *
  * <pre>
- * 
+ *
  *      +---------------------++----------------------+
  *      |                     ||                      |
  *      | The first component || The second component |
@@ -32,9 +32,9 @@ import com.vaadin.shared.ui.splitpanel.HorizontalSplitPanelState;
  *                            ^
  *                            |
  *                      the splitter
- * 
+ *
  * </pre>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 6.5
  */
@@ -49,7 +49,7 @@ public class HorizontalSplitPanel extends AbstractSplitPanel {
 
     /**
      * Creates a horizontal split panel containing the given components
-     * 
+     *
      * @param firstComponent
      *            The component to be placed to the left of the splitter
      * @param secondComponent
diff --git a/server/src/main/java/com/vaadin/ui/Html5File.java b/server/src/main/java/com/vaadin/ui/Html5File.java
index 87ea83c8c9..ef3b646f81 100644
--- a/server/src/main/java/com/vaadin/ui/Html5File.java
+++ b/server/src/main/java/com/vaadin/ui/Html5File.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
@@ -61,7 +61,7 @@ public class Html5File implements Serializable {
      * on HTML 5 API's. It is supported only by modern web browsers like Firefox
      * 3.6 and above and recent webkit based browsers (Safari 5, Chrome 6) at
      * this time.
-     * 
+     *
      * @param streamVariable
      *            the callback that returns stream where the implementation
      *            writes the file contents as it arrives.
diff --git a/server/src/main/java/com/vaadin/ui/Image.java b/server/src/main/java/com/vaadin/ui/Image.java
index abac7b95c5..cc92b4a3c8 100644
--- a/server/src/main/java/com/vaadin/ui/Image.java
+++ b/server/src/main/java/com/vaadin/ui/Image.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
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.image.ImageState;
 
 /**
  * Component for embedding images.
- * 
+ *
  * @author Vaadin Ltd.
  * @version @VERSION@
  * @since 7.0
@@ -49,7 +49,7 @@ public class Image extends AbstractEmbedded {
 
     /**
      * Creates a new empty Image with caption.
-     * 
+     *
      * @param caption
      */
     public Image(String caption) {
@@ -60,7 +60,7 @@ public class Image extends AbstractEmbedded {
     /**
      * Creates a new Image whose contents is loaded from given resource. The
      * dimensions are assumed if possible. The type is guessed from resource.
-     * 
+     *
      * @param caption
      * @param source
      *            the Source of the embedded object.
@@ -88,9 +88,9 @@ public class Image extends AbstractEmbedded {
      * Add a click listener to the component. The listener is called whenever
      * the user clicks inside the component. Depending on the content the event
      * may be blocked and in that case no event is fired.
-     * 
+     *
      * Use {@link #removeClickListener(ClickListener)} to remove the listener.
-     * 
+     *
      * @param listener
      *            The listener to add
      */
@@ -111,7 +111,7 @@ public class Image extends AbstractEmbedded {
     /**
      * Remove a click listener from the component. The listener should earlier
      * have been added using {@link #addClickListener(ClickListener)}.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
diff --git a/server/src/main/java/com/vaadin/ui/InlineDateField.java b/server/src/main/java/com/vaadin/ui/InlineDateField.java
index 721c563c04..cec795bf12 100644
--- a/server/src/main/java/com/vaadin/ui/InlineDateField.java
+++ b/server/src/main/java/com/vaadin/ui/InlineDateField.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
@@ -19,7 +19,7 @@ import java.util.Date;
 
 /**
  * A date entry component, which displays the actual date selector inline.
- * 
+ *
  * @see DateField
  * @see PopupDateField
  * @author Vaadin Ltd.
@@ -37,7 +37,7 @@ public class InlineDateField extends DateField {
     /**
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param value
@@ -49,7 +49,7 @@ public class InlineDateField extends DateField {
 
     /**
      * Constructs an empty <code>DateField</code> with caption.
-     * 
+     *
      * @param caption
      *            the caption of the datefield.
      */
diff --git a/server/src/main/java/com/vaadin/ui/JavaScript.java b/server/src/main/java/com/vaadin/ui/JavaScript.java
index 668ae67056..91ee1ccc20 100644
--- a/server/src/main/java/com/vaadin/ui/JavaScript.java
+++ b/server/src/main/java/com/vaadin/ui/JavaScript.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
@@ -33,7 +33,7 @@ import elemental.json.JsonException;
  * instance of JavaScript, either use Page.getJavaScript() or
  * JavaScript.getCurrent() as a shorthand for getting the JavaScript object
  * corresponding to the current Page.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -76,15 +76,15 @@ public class JavaScript extends AbstractExtension {
      * object). The <code>call</code> method in the passed
      * {@link JavaScriptFunction} object will be invoked with the same
      * parameters whenever the JavaScript function is called in the browser.
-     * 
+     *
      * A function added with the name <code>"myFunction"</code> can thus be
      * invoked with the following JavaScript code:
      * <code>window.myFunction(argument1, argument2)</code>.
-     * 
+     *
      * If the name parameter contains dots, simple objects are created on demand
      * to allow calling the function using the same name (e.g.
      * <code>window.myObject.myFunction</code>).
-     * 
+     *
      * @param name
      *            the name that the function should get in the global JavaScript
      *            namespace.
@@ -100,11 +100,11 @@ public class JavaScript extends AbstractExtension {
     /**
      * Removes a JavaScripFunction from the browser's global JavaScript
      * namespace.
-     * 
+     *
      * If the name contains dots and intermediate objects were created by
      * {@link #addFunction(String, JavaScriptFunction)}, these objects will not
      * be removed by this method.
-     * 
+     *
      * @param name
      *            the name of the callback to remove
      */
@@ -115,7 +115,7 @@ public class JavaScript extends AbstractExtension {
 
     /**
      * Executes the given JavaScript code in the browser.
-     * 
+     *
      * @param script
      *            The JavaScript code to run.
      */
@@ -125,7 +125,7 @@ public class JavaScript extends AbstractExtension {
 
     /**
      * Executes the given JavaScript code in the browser.
-     * 
+     *
      * @param script
      *            The JavaScript code to run.
      */
@@ -136,9 +136,9 @@ public class JavaScript extends AbstractExtension {
     /**
      * Get the JavaScript object for the current Page, or null if there is no
      * current page.
-     * 
+     *
      * @see Page#getCurrent()
-     * 
+     *
      * @return the JavaScript object corresponding to the current Page, or
      *         <code>null</code> if there is no current page.
      */
@@ -152,7 +152,7 @@ public class JavaScript extends AbstractExtension {
 
     /**
      * JavaScript is not designed to be removed.
-     * 
+     *
      * @throws UnsupportedOperationException
      *             when invoked
      */
diff --git a/server/src/main/java/com/vaadin/ui/JavaScriptFunction.java b/server/src/main/java/com/vaadin/ui/JavaScriptFunction.java
index 071c88350b..b1f2b8c324 100644
--- a/server/src/main/java/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/main/java/com/vaadin/ui/JavaScriptFunction.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,11 +26,11 @@ import elemental.json.JsonArray;
  * Defines a method that is called by a client-side JavaScript function. When
  * the corresponding JavaScript function is called, the {@link #call(JsonArray)}
  * method is invoked.
- * 
+ *
  * @see JavaScript#addFunction(String, JavaScriptFunction)
  * @see AbstractJavaScriptComponent#addFunction(String, JavaScriptFunction)
  * @see AbstractJavaScriptExtension#addFunction(String, JavaScriptFunction)
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -41,7 +41,7 @@ public interface JavaScriptFunction extends Serializable {
      * <p>
      * Because of the asynchronous nature of the communication between client
      * and server, no return value can be sent back to the browser.
-     * 
+     *
      * @param arguments
      *            an array with JSON representations of the arguments with which
      *            the JavaScript function was called.
diff --git a/server/src/main/java/com/vaadin/ui/Layout.java b/server/src/main/java/com/vaadin/ui/Layout.java
index 6cf2cec249..01343d3299 100644
--- a/server/src/main/java/com/vaadin/ui/Layout.java
+++ b/server/src/main/java/com/vaadin/ui/Layout.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
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.MarginInfo;
  * layouting control to the elements in the container. This is required by the
  * various layout components to enable them to place other components in
  * specific locations in the UI.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -40,11 +40,11 @@ public interface Layout extends ComponentContainer, Serializable {
         /**
          * Set alignment for one contained component in this layout. Use
          * predefined alignments from Alignment class.
-         * 
+         *
          * Example: <code>
          *      layout.setComponentAlignment(myComponent, Alignment.TOP_RIGHT);
          * </code>
-         * 
+         *
          * @param childComponent
          *            the component to align within it's layout cell.
          * @param alignment
@@ -55,7 +55,7 @@ public interface Layout extends ComponentContainer, Serializable {
 
         /**
          * Returns the current Alignment of given component.
-         * 
+         *
          * @param childComponent
          * @return the {@link Alignment}
          */
@@ -64,7 +64,7 @@ public interface Layout extends ComponentContainer, Serializable {
         /**
          * Sets the alignment used for new components added to this layout. The
          * default is {@link Alignment#TOP_LEFT}.
-         * 
+         *
          * @param defaultComponentAlignment
          *            The new default alignment
          */
@@ -73,7 +73,7 @@ public interface Layout extends ComponentContainer, Serializable {
 
         /**
          * Returns the alignment used for new components added to this layout
-         * 
+         *
          * @return The default alignment
          */
         public Alignment getDefaultComponentAlignment();
@@ -83,12 +83,12 @@ public interface Layout extends ComponentContainer, Serializable {
     /**
      * This type of layout supports automatic addition of space between its
      * components.
-     * 
+     *
      */
     public interface SpacingHandler extends Serializable {
         /**
          * Enable spacing between child components within this layout.
-         * 
+         *
          * <p>
          * <strong>NOTE:</strong> This will only affect the space between
          * components, not the space around all the components in the layout
@@ -96,12 +96,12 @@ public interface Layout extends ComponentContainer, Serializable {
          * Table). Use {@link #setMargin(boolean)} to add space around the
          * layout.
          * </p>
-         * 
+         *
          * <p>
          * See the reference manual for more information about CSS rules for
          * defining the amount of spacing to use.
          * </p>
-         * 
+         *
          * @param enabled
          *            true if spacing should be turned on, false if it should be
          *            turned off
@@ -109,7 +109,7 @@ public interface Layout extends ComponentContainer, Serializable {
         public void setSpacing(boolean enabled);
 
         /**
-         * 
+         *
          * @return true if spacing between child components within this layout
          *         is enabled, false otherwise
          */
@@ -127,7 +127,7 @@ public interface Layout extends ComponentContainer, Serializable {
          * will tell the client-side implementation to leave extra space around
          * the layout. The client-side implementation decides the actual amount,
          * and it can vary between themes.
-         * 
+         *
          * @param enabled
          *            true if margins should be enabled on all sides, false to
          *            disable all margins
@@ -136,26 +136,26 @@ public interface Layout extends ComponentContainer, Serializable {
 
         /**
          * Enable margins for this layout.
-         * 
+         *
          * <p>
          * <strong>NOTE:</strong> This will only affect the space around the
          * components in the layout, not space between the components in the
          * layout. Use {@link #setSpacing(boolean)} to add space between the
          * components in the layout.
          * </p>
-         * 
+         *
          * <p>
          * See the reference manual for more information about CSS rules for
          * defining the size of the margin.
          * </p>
-         * 
+         *
          * @param marginInfo
          *            MarginInfo object containing the new margins.
          */
         public void setMargin(MarginInfo marginInfo);
 
         /**
-         * 
+         *
          * @return MarginInfo containing the currently enabled margins.
          */
         public MarginInfo getMargin();
diff --git a/server/src/main/java/com/vaadin/ui/LegacyComponent.java b/server/src/main/java/com/vaadin/ui/LegacyComponent.java
index bb379534c1..4260ee482a 100644
--- a/server/src/main/java/com/vaadin/ui/LegacyComponent.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyComponent.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
@@ -25,10 +25,10 @@ import com.vaadin.server.VariableOwner;
  * implementing this interface your Component will be able to use
  * {@link #paintContent(PaintTarget)} and
  * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6.
- * 
+ *
  * @deprecated As of 7.0. This class is only intended to ease migration and
  *             should not be used for new projects.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0.0
  */
@@ -41,13 +41,13 @@ public interface LegacyComponent
      * Paints the Paintable into a UIDL stream. This method creates the UIDL
      * sequence describing it and outputs it to the given UIDL stream.
      * </p>
-     * 
+     *
      * <p>
      * It is called when the contents of the component should be painted in
      * response to the component first being shown or having been altered so
      * that its visual representation is changed.
      * </p>
-     * 
+     *
      * @param target
      *            the target UIDL stream where the component should paint itself
      *            to.
@@ -62,7 +62,7 @@ public interface LegacyComponent
      * For a LegacyComponent, markAsDirty will also cause
      * {@link #paintContent(PaintTarget)} to be called before sending changes to
      * the client.
-     * 
+     *
      * @see com.vaadin.server.ClientConnector#markAsDirty()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
index 8dca9143f7..61b488054d 100644
--- a/server/src/main/java/com/vaadin/ui/LegacyWindow.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.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
@@ -45,7 +45,7 @@ public class LegacyWindow extends UI {
 
     /**
      * Creates a new legacy window with the given caption
-     * 
+     *
      * @param caption
      *            the caption of the window
      */
@@ -57,7 +57,7 @@ public class LegacyWindow extends UI {
 
     /**
      * Creates a legacy window with the given caption and content layout
-     * 
+     *
      * @param caption
      * @param content
      */
@@ -92,7 +92,7 @@ public class LegacyWindow extends UI {
      * <p>
      * Note! Portlets do not support direct window access through URLs.
      * </p>
-     * 
+     *
      * @return the Name of the Window.
      */
     public String getName() {
@@ -115,7 +115,7 @@ public class LegacyWindow extends UI {
      * <p>
      * Note! Portlets do not support direct window access through URLs.
      * </p>
-     * 
+     *
      * @param name
      *            the new name for the window or null if the application should
      *            automatically assign a name to it
@@ -139,7 +139,7 @@ public class LegacyWindow extends UI {
      * <p>
      * Note! This method can not be used for portlets.
      * </p>
-     * 
+     *
      * @return the URL of the window or null if the window is not attached to an
      *         application
      */
@@ -160,10 +160,10 @@ public class LegacyWindow extends UI {
     /**
      * Opens the given resource in this UI. The contents of this UI is replaced
      * by the {@code Resource}.
-     * 
+     *
      * @param resource
      *            the resource to show in this UI
-     * 
+     *
      * @deprecated As of 7.0, use getPage().setLocation instead
      */
     @Deprecated
@@ -211,7 +211,7 @@ public class LegacyWindow extends UI {
      * with security features in some browsers. Is is recommended to instead use
      * {@link Link} for starting downloads.
      * </p>
-     * 
+     *
      * @param resource
      *            the resource.
      * @param windowName
@@ -270,7 +270,7 @@ public class LegacyWindow extends UI {
      * with security features in some browsers. Is is recommended to instead use
      * {@link Link} for starting downloads.
      * </p>
-     * 
+     *
      * @param resource
      *            the resource.
      * @param windowName
@@ -295,7 +295,7 @@ public class LegacyWindow extends UI {
      * with security features in some browsers. Is is recommended to instead use
      * {@link Link} for starting downloads.
      * </p>
-     * 
+     *
      * @param resource
      *            the resource.
      * @param windowName
@@ -318,13 +318,13 @@ public class LegacyWindow extends UI {
      * Adds a new {@link BrowserWindowResizeListener} to this UI. The listener
      * will be notified whenever the browser window within which this UI resides
      * is resized.
-     * 
+     *
      * @param resizeListener
      *            the listener to add
-     * 
+     *
      * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
      * @see #setResizeLazy(boolean)
-     * 
+     *
      * @deprecated As of 7.0, use the similarly named api in Page instead
      */
     @Deprecated
@@ -335,7 +335,7 @@ public class LegacyWindow extends UI {
     /**
      * Removes a {@link BrowserWindowResizeListener} from this UI. The listener
      * will no longer be notified when the browser window is resized.
-     * 
+     *
      * @param resizeListener
      *            the listener to remove
      * @deprecated As of 7.0, use the similarly named api in Page instead
@@ -348,7 +348,7 @@ public class LegacyWindow extends UI {
     /**
      * Gets the last known height of the browser window in which this UI
      * resides.
-     * 
+     *
      * @return the browser window height in pixels
      * @deprecated As of 7.0, use the similarly named api in Page instead
      */
@@ -359,9 +359,9 @@ public class LegacyWindow extends UI {
 
     /**
      * Gets the last known width of the browser window in which this UI resides.
-     * 
+     *
      * @return the browser window width in pixels
-     * 
+     *
      * @deprecated As of 7.0, use the similarly named api in Page instead
      */
     @Deprecated
@@ -371,13 +371,13 @@ public class LegacyWindow extends UI {
 
     /**
      * Executes JavaScript in this window.
-     * 
+     *
      * <p>
      * This method allows one to inject javascript from the server to client. A
      * client implementation is not required to implement this functionality,
      * but currently all web-based clients do implement this.
      * </p>
-     * 
+     *
      * <p>
      * Executing javascript this way often leads to cross-browser compatibility
      * issues and regressions that are hard to resolve. Use of this method
@@ -385,10 +385,10 @@ public class LegacyWindow extends UI {
      * with GWT. For more info on creating own, reusable client-side widgets in
      * Java, read the corresponding chapter in Book of Vaadin.
      * </p>
-     * 
+     *
      * @param script
      *            JavaScript snippet that will be executed.
-     * 
+     *
      * @deprecated As of 7.0, use JavaScript.getCurrent().execute(String)
      *             instead
      */
@@ -412,7 +412,7 @@ public class LegacyWindow extends UI {
     /**
      * Set the content of the window. For a {@link LegacyWindow}, the content
      * must be a {@link ComponentContainer}.
-     * 
+     *
      * @param content
      */
     @Override
@@ -427,7 +427,7 @@ public class LegacyWindow extends UI {
     /**
      * This implementation replaces a component in the content container (
      * {@link #getContent()}) instead of in the actual UI.
-     * 
+     *
      * This method should only be called when the content is a
      * {@link ComponentContainer} (default {@link VerticalLayout} or explicitly
      * set).
@@ -440,14 +440,14 @@ public class LegacyWindow extends UI {
     /**
      * Adds a component to this UI. The component is not added directly to the
      * UI, but instead to the content container ({@link #getContent()}).
-     * 
+     *
      * This method should only be called when the content is a
      * {@link ComponentContainer} (default {@link VerticalLayout} or explicitly
      * set).
-     * 
+     *
      * @param component
      *            the component to add to this UI
-     * 
+     *
      * @see #getContent()
      */
     public void addComponent(Component component) {
@@ -457,7 +457,7 @@ public class LegacyWindow extends UI {
     /**
      * This implementation removes the component from the content container (
      * {@link #getContent()}) instead of from the actual UI.
-     * 
+     *
      * This method should only be called when the content is a
      * {@link ComponentContainer} (default {@link VerticalLayout} or explicitly
      * set).
@@ -469,7 +469,7 @@ public class LegacyWindow extends UI {
     /**
      * This implementation removes the components from the content container (
      * {@link #getContent()}) instead of from the actual UI.
-     * 
+     *
      * This method should only be called when the content is a
      * {@link ComponentContainer} (default {@link VerticalLayout} or explicitly
      * set).
diff --git a/server/src/main/java/com/vaadin/ui/Link.java b/server/src/main/java/com/vaadin/ui/Link.java
index c100336180..650aa3bcbd 100644
--- a/server/src/main/java/com/vaadin/ui/Link.java
+++ b/server/src/main/java/com/vaadin/ui/Link.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Link is used to create external or internal URL links.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -63,7 +63,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Creates a new instance of Link.
-     * 
+     *
      * @param caption
      * @param resource
      */
@@ -74,8 +74,8 @@ public class Link extends AbstractComponent {
 
     /**
      * Creates a new instance of Link that opens a new window.
-     * 
-     * 
+     *
+     *
      * @param caption
      *            the Link text.
      * @param targetName
@@ -88,7 +88,7 @@ public class Link extends AbstractComponent {
      *            the Height of the target window.
      * @param border
      *            the Border style of the target window.
-     * 
+     *
      */
     public Link(String caption, Resource resource, String targetName, int width,
             int height, BorderStyle border) {
@@ -112,7 +112,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Returns the target window border.
-     * 
+     *
      * @return the target window border.
      */
     public BorderStyle getTargetBorder() {
@@ -121,7 +121,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Returns the target window height or -1 if not set.
-     * 
+     *
      * @return the target window height.
      */
     public int getTargetHeight() {
@@ -132,7 +132,7 @@ public class Link extends AbstractComponent {
     /**
      * Returns the target window name. Empty name of null implies that the
      * target is opened to the window containing the link.
-     * 
+     *
      * @return the target window name.
      */
     public String getTargetName() {
@@ -141,7 +141,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Returns the target window width or -1 if not set.
-     * 
+     *
      * @return the target window width.
      */
     public int getTargetWidth() {
@@ -151,7 +151,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Sets the border of the target window.
-     * 
+     *
      * @param targetBorder
      *            the targetBorder to set.
      */
@@ -161,7 +161,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Sets the target window height.
-     * 
+     *
      * @param targetHeight
      *            the targetHeight to set.
      */
@@ -171,7 +171,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Sets the target window name.
-     * 
+     *
      * @param targetName
      *            the targetName to set.
      */
@@ -181,7 +181,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Sets the target window width.
-     * 
+     *
      * @param targetWidth
      *            the targetWidth to set.
      */
@@ -191,7 +191,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Returns the resource this link opens.
-     * 
+     *
      * @return the Resource.
      */
     public Resource getResource() {
@@ -200,7 +200,7 @@ public class Link extends AbstractComponent {
 
     /**
      * Sets the resource this link opens.
-     * 
+     *
      * @param resource
      *            the resource to set.
      */
diff --git a/server/src/main/java/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java
index b340e701ad..b091257f5f 100644
--- a/server/src/main/java/com/vaadin/ui/ListSelect.java
+++ b/server/src/main/java/com/vaadin/ui/ListSelect.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
@@ -55,7 +55,7 @@ public class ListSelect extends AbstractSelect {
      * Sets the number of rows in the editor. If the number of rows is set 0,
      * the actual number of displayed rows is determined implicitly by the
      * adapter.
-     * 
+     *
      * @param rows
      *            the number of rows to set.
      */
diff --git a/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java
index b8833ebeb8..e0566497e0 100644
--- a/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.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
@@ -21,7 +21,7 @@ import com.vaadin.shared.ui.ui.UIState.LoadingIndicatorConfigurationState;
 
 /**
  * Provides method for configuring the loading indicator.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -29,7 +29,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
     /**
      * Sets the delay before the loading indicator is shown. The default is
      * 300ms.
-     * 
+     *
      * @param firstDelay
      *            The first delay (in ms)
      */
@@ -37,7 +37,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
 
     /**
      * Returns the delay before the loading indicator is shown.
-     * 
+     *
      * @return The first delay (in ms)
      */
     public int getFirstDelay();
@@ -46,7 +46,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
      * Sets the delay before the loading indicator goes into the "second" state.
      * The delay is calculated from the time when the loading indicator was
      * triggered. The default is 1500ms.
-     * 
+     *
      * @param secondDelay
      *            The delay before going into the "second" state (in ms)
      */
@@ -56,7 +56,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
      * Returns the delay before the loading indicator goes into the "second"
      * state. The delay is calculated from the time when the loading indicator
      * was triggered.
-     * 
+     *
      * @return The delay before going into the "second" state (in ms)
      */
     public int getSecondDelay();
@@ -65,7 +65,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
      * Sets the delay before the loading indicator goes into the "third" state.
      * The delay is calculated from the time when the loading indicator was
      * triggered. The default is 5000ms.
-     * 
+     *
      * @param thirdDelay
      *            The delay before going into the "third" state (in ms)
      */
@@ -75,7 +75,7 @@ public interface LoadingIndicatorConfiguration extends Serializable {
      * Returns the delay before the loading indicator goes into the "third"
      * state. The delay is calculated from the time when the loading indicator
      * was triggered.
-     * 
+     *
      * @return The delay before going into the "third" state (in ms)
      */
     public int getThirdDelay();
@@ -91,7 +91,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#setFirstDelay(int)
      */
     @Override
@@ -101,7 +101,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#getFirstDelay()
      */
     @Override
@@ -111,7 +111,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#setSecondDelay(int)
      */
     @Override
@@ -121,7 +121,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#getSecondDelay()
      */
     @Override
@@ -131,7 +131,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#setThirdDelay(int)
      */
     @Override
@@ -141,7 +141,7 @@ class LoadingIndicatorConfigurationImpl
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.LoadingIndicator#getThirdDelay()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/LoginForm.java b/server/src/main/java/com/vaadin/ui/LoginForm.java
index 9debafb96b..50303fc88f 100644
--- a/server/src/main/java/com/vaadin/ui/LoginForm.java
+++ b/server/src/main/java/com/vaadin/ui/LoginForm.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
@@ -71,7 +71,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
         /**
          * Access method to form values by field names.
-         * 
+         *
          * @param name
          * @return value in given field
          */
@@ -91,7 +91,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
     public interface LoginListener extends Serializable {
         /**
          * This method is fired on each login form post.
-         * 
+         *
          * @param event
          *            Login event
          */
@@ -137,7 +137,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /**
      * Customize the user name field. Only for overriding, do not call.
-     * 
+     *
      * @return the user name field
      * @since 7.7
      */
@@ -152,7 +152,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * Returns the caption set with {@link #setUsernameCaption(String)}. Note
      * that this method might not match what is shown to the user if
      * {@link #createUsernameField()} has been overridden.
-     * 
+     *
      * @return user name field caption
      */
     public String getUsernameCaption() {
@@ -166,7 +166,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * <p>
      * As an alternative to calling this method, the method
      * {@link #createUsernameField()} can be overridden.
-     * 
+     *
      * @param cap
      *            new caption
      */
@@ -176,7 +176,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /**
      * Customize the password field. Only for overriding, do not call.
-     * 
+     *
      * @return the password field
      * @since 7.7
      */
@@ -189,7 +189,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * Returns the caption set with {@link #setPasswordCaption(String)}. Note
      * that this method might not match what is shown to the user if
      * {@link #createPasswordField()} has been overridden.
-     * 
+     *
      * @return password field caption
      */
     public String getPasswordCaption() {
@@ -203,7 +203,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * <p>
      * As an alternative to calling this method, the method
      * {@link #createPasswordField()} can be overridden.
-     * 
+     *
      * @param cap
      *            new caption
      */
@@ -214,7 +214,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /**
      * Customize the login button. Only for overriding, do not call.
-     * 
+     *
      * @return the login button
      * @since 7.7
      */
@@ -227,7 +227,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * Returns the caption set with {@link #setLoginButtonCaption(String)}. Note
      * that this method might not match what is shown to the user if
      * {@link #createLoginButton()} has been overridden.
-     * 
+     *
      * @return login button caption
      */
     public String getLoginButtonCaption() {
@@ -241,7 +241,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * <p>
      * As an alternative to calling this method, the method
      * {@link #createLoginButton()} can be overridden.
-     * 
+     *
      * @param cap
      *            new caption
      */
@@ -277,7 +277,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
      * {@link #getUsernameFieldCaption()}, {@link #getPasswordFieldCaption()}
      * and {@link #getLoginButtonCaption()}. You do not have to use the login
      * button in your layout.
-     * 
+     *
      * @param userNameField
      *            the user name text field
      * @param passwordField
@@ -341,7 +341,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * Handle the login. In deferred mode, this method is called after the dummy
      * POST request that triggers the password manager has been completed. In
      * direct mode (the default setting), it is called directly when the user
@@ -359,7 +359,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /**
      * Adds LoginListener to handle login logic
-     * 
+     *
      * @param listener
      */
     public void addLoginListener(LoginListener listener) {
@@ -377,7 +377,7 @@ public class LoginForm extends AbstractSingleComponentContainer {
 
     /**
      * Removes LoginListener
-     * 
+     *
      * @param listener
      */
     public void removeLoginListener(LoginListener listener) {
diff --git a/server/src/main/java/com/vaadin/ui/MenuBar.java b/server/src/main/java/com/vaadin/ui/MenuBar.java
index 039bde7ea2..8dff0db804 100644
--- a/server/src/main/java/com/vaadin/ui/MenuBar.java
+++ b/server/src/main/java/com/vaadin/ui/MenuBar.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
@@ -212,7 +212,7 @@ public class MenuBar extends AbstractComponent
     /**
      * Add a new item to the menu bar. Command can be null, but a caption must
      * be given.
-     * 
+     *
      * @param caption
      *            the text for the menu item
      * @param command
@@ -226,7 +226,7 @@ public class MenuBar extends AbstractComponent
     /**
      * Add a new item to the menu bar. Icon and command can be null, but a
      * caption must be given.
-     * 
+     *
      * @param caption
      *            the text for the menu item
      * @param icon
@@ -252,7 +252,7 @@ public class MenuBar extends AbstractComponent
      * Add an item before some item. If the given item does not exist the item
      * is added at the end of the menu. Icon and command can be null, but a
      * caption must be given.
-     * 
+     *
      * @param caption
      *            the text for the menu item
      * @param icon
@@ -285,7 +285,7 @@ public class MenuBar extends AbstractComponent
 
     /**
      * Returns a list with all the MenuItem objects in the menu bar
-     * 
+     *
      * @return a list containing the MenuItem objects in the menu bar
      */
     public List<MenuItem> getItems() {
@@ -294,7 +294,7 @@ public class MenuBar extends AbstractComponent
 
     /**
      * Remove first occurrence the specified item from the main menu
-     * 
+     *
      * @param item
      *            The item to be removed
      */
@@ -315,7 +315,7 @@ public class MenuBar extends AbstractComponent
 
     /**
      * Returns the size of the menu.
-     * 
+     *
      * @return The size of the menu
      */
     public int getSize() {
@@ -326,9 +326,9 @@ public class MenuBar extends AbstractComponent
      * Set the item that is used when collapsing the top level menu. All
      * "overflowing" items will be added below this. The item command will be
      * ignored. If set to null, the default item with a downwards arrow is used.
-     * 
+     *
      * The item command (if specified) is ignored.
-     * 
+     *
      * @param item
      */
     public void setMoreMenuItem(MenuItem item) {
@@ -342,7 +342,7 @@ public class MenuBar extends AbstractComponent
 
     /**
      * Get the MenuItem used as the collapse menu item.
-     * 
+     *
      * @return
      */
     public MenuItem getMoreMenuItem() {
@@ -356,7 +356,7 @@ public class MenuBar extends AbstractComponent
      * if the mouse is moved out of the opened menu.
      * <p>
      * Note, that on touch devices the menu still opens on a click event.
-     * 
+     *
      * @param autoOpenTopLevelMenu
      *            true if menus should be opened without click, the default is
      *            false
@@ -373,7 +373,7 @@ public class MenuBar extends AbstractComponent
      * automatically opened when the mouse cursor is moved over the menu.
      * Normally root menu opens only by clicking on the menu. Submenus always
      * open automatically.
-     * 
+     *
      * @return true if the root menus open without click, the default is false
      */
     public boolean isAutoOpen() {
@@ -385,7 +385,7 @@ public class MenuBar extends AbstractComponent
      * captions are passed to the browser as html and the developer is
      * responsible for ensuring no harmful html is used. If set to false, the
      * content is passed to the browser as plain text.
-     * 
+     *
      * @param htmlContentAllowed
      *            true if the captions are used as html, false if used as plain
      *            text
@@ -397,7 +397,7 @@ public class MenuBar extends AbstractComponent
 
     /**
      * Checks whether item captions are interpreted as html or plain text.
-     * 
+     *
      * @return true if the captions are used as html, false if used as plain
      *         text
      * @see #setHtmlContentAllowed(boolean)
@@ -413,7 +413,7 @@ public class MenuBar extends AbstractComponent
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
      */
     @Override
@@ -442,7 +442,7 @@ public class MenuBar extends AbstractComponent
      * be fired on user click by implementing the
      * {@link com.vaadin.ui.MenuBar.Command} interface. You can also add
      * multiple MenuItems to a MenuItem and create a sub-menu.
-     * 
+     *
      */
     public class MenuItem implements Serializable {
 
@@ -465,7 +465,7 @@ public class MenuBar extends AbstractComponent
          * Constructs a new menu item that can optionally have an icon and a
          * command associated with it. Icon and command can be null, but a
          * caption must be given.
-         * 
+         *
          * @param text
          *            The text associated with the command
          * @param command
@@ -485,7 +485,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Checks if the item has children (if it is a sub-menu).
-         * 
+         *
          * @return True if this item has children
          */
         public boolean hasChildren() {
@@ -496,7 +496,7 @@ public class MenuBar extends AbstractComponent
          * Adds a separator to this menu. A separator is a way to visually group
          * items in a menu, to make it easier for users to find what they are
          * looking for in the menu.
-         * 
+         *
          * @author Jouni Koivuviita / Vaadin Ltd.
          * @since 6.2.0
          */
@@ -515,7 +515,7 @@ public class MenuBar extends AbstractComponent
         /**
          * Add a new item inside this item, thus creating a sub-menu. Command
          * can be null, but a caption must be given.
-         * 
+         *
          * @param caption
          *            the text for the menu item
          * @param command
@@ -529,7 +529,7 @@ public class MenuBar extends AbstractComponent
         /**
          * Add a new item inside this item, thus creating a sub-menu. Icon and
          * command can be null, but a caption must be given.
-         * 
+         *
          * @param caption
          *            the text for the menu item
          * @param icon
@@ -572,7 +572,7 @@ public class MenuBar extends AbstractComponent
          * Add an item before some item. If the given item does not exist the
          * item is added at the end of the menu. Icon and command can be null,
          * but a caption must be given.
-         * 
+         *
          * @param caption
          *            the text for the menu item
          * @param icon
@@ -609,7 +609,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * For the associated command.
-         * 
+         *
          * @return The associated command, or null if there is none
          */
         public Command getCommand() {
@@ -618,7 +618,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Gets the objects icon.
-         * 
+         *
          * @return The icon of the item, null if the item doesn't have an icon
          */
         public Resource getIcon() {
@@ -628,7 +628,7 @@ public class MenuBar extends AbstractComponent
         /**
          * For the containing item. This will return null if the item is in the
          * top-level menu bar.
-         * 
+         *
          * @return The containing {@link com.vaadin.ui.MenuBar.MenuItem} , or
          *         null if there is none
          */
@@ -638,7 +638,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * This will return the children of this item or null if there are none.
-         * 
+         *
          * @return List of children items, or null if there are none
          */
         public List<MenuItem> getChildren() {
@@ -647,7 +647,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Gets the objects text
-         * 
+         *
          * @return The text
          */
         public java.lang.String getText() {
@@ -656,7 +656,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Returns the number of children.
-         * 
+         *
          * @return The number of child items
          */
         public int getSize() {
@@ -668,7 +668,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Get the unique identifier for this item.
-         * 
+         *
          * @return The id of this item
          */
         public int getId() {
@@ -677,7 +677,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Set the command for this item. Set null to remove.
-         * 
+         *
          * @param command
          *            The MenuCommand of this item
          */
@@ -687,7 +687,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Sets the icon. Set null to remove.
-         * 
+         *
          * @param icon
          *            The icon for this item
          */
@@ -698,7 +698,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Set the text of this object.
-         * 
+         *
          * @param text
          *            Text for this object
          */
@@ -711,7 +711,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Remove the first occurrence of the item.
-         * 
+         *
          * @param item
          *            The item to be removed
          */
@@ -738,7 +738,7 @@ public class MenuBar extends AbstractComponent
 
         /**
          * Set the parent of this item. This is called by the addItem method.
-         * 
+         *
          * @param parent
          *            The parent item
          */
@@ -786,7 +786,7 @@ public class MenuBar extends AbstractComponent
          * Sets the items's description. See {@link #getDescription()} for more
          * information on what the description is. This method will trigger a
          * {@link RepaintRequestEvent}.
-         * 
+         *
          * @param description
          *            the new description string for the component.
          */
@@ -801,7 +801,7 @@ public class MenuBar extends AbstractComponent
          * describe the state of the item to the user. The description string
          * may contain certain XML tags:
          * </p>
-         * 
+         *
          * <p>
          * <table border=1>
          * <tr>
@@ -844,11 +844,11 @@ public class MenuBar extends AbstractComponent
          * </tr>
          * </table>
          * </p>
-         * 
+         *
          * <p>
          * These tags may be nested.
          * </p>
-         * 
+         *
          * @return item's description <code>String</code>
          */
         public String getDescription() {
@@ -859,11 +859,11 @@ public class MenuBar extends AbstractComponent
          * Gets the checkable state of the item - whether the item has checked
          * and unchecked states. If an item is checkable its checked state (as
          * returned by {@link #isChecked()}) is indicated in the UI.
-         * 
+         *
          * <p>
          * An item is not checkable by default.
          * </p>
-         * 
+         *
          * @return true if the item is checkable, false otherwise
          * @since 6.6.2
          */
@@ -875,15 +875,15 @@ public class MenuBar extends AbstractComponent
          * Sets the checkable state of the item. If an item is checkable its
          * checked state (as returned by {@link #isChecked()}) is indicated in
          * the UI.
-         * 
+         *
          * <p>
          * An item is not checkable by default.
          * </p>
-         * 
+         *
          * <p>
          * Items with sub items cannot be checkable.
          * </p>
-         * 
+         *
          * @param checkable
          *            true if the item should be checkable, false otherwise
          * @throws IllegalStateException
@@ -905,15 +905,15 @@ public class MenuBar extends AbstractComponent
          * if the item is checkable (as indicated by {@link #isCheckable()}).
          * The checked state is indicated in the UI with the item, if the item
          * is checkable.
-         * 
+         *
          * <p>
          * An item is not checked by default.
          * </p>
-         * 
+         *
          * <p>
          * The CSS style corresponding to the checked state is "-checked".
          * </p>
-         * 
+         *
          * @return true if the item is checked, false otherwise
          * @since 6.6.2
          */
@@ -925,15 +925,15 @@ public class MenuBar extends AbstractComponent
          * Sets the checked state of the item. Only used if the item is
          * checkable (indicated by {@link #isCheckable()}). The checked state is
          * indicated in the UI with the item, if the item is checkable.
-         * 
+         *
          * <p>
          * An item is not checked by default.
          * </p>
-         * 
+         *
          * <p>
          * The CSS style corresponding to the checked state is "-checked".
          * </p>
-         * 
+         *
          * @return true if the item is checked, false otherwise
          * @since 6.6.2
          */
diff --git a/server/src/main/java/com/vaadin/ui/NativeButton.java b/server/src/main/java/com/vaadin/ui/NativeButton.java
index 3c220719b5..e04a356e22 100644
--- a/server/src/main/java/com/vaadin/ui/NativeButton.java
+++ b/server/src/main/java/com/vaadin/ui/NativeButton.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/server/src/main/java/com/vaadin/ui/Notification.java b/server/src/main/java/com/vaadin/ui/Notification.java
index 6a619ed543..410493c81f 100644
--- a/server/src/main/java/com/vaadin/ui/Notification.java
+++ b/server/src/main/java/com/vaadin/ui/Notification.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
@@ -59,7 +59,7 @@ import com.vaadin.shared.Position;
  * configured to show up in a custom position, for a specified time (or until
  * clicked), and with a custom stylename. An icon can also be added.
  * </p>
- * 
+ *
  */
 public class Notification implements Serializable {
     public enum Type {
@@ -123,9 +123,9 @@ public class Notification implements Serializable {
 
     /**
      * Creates a "humanized" notification message.
-     * 
+     *
      * The caption is rendered as plain text with HTML automatically escaped.
-     * 
+     *
      * @param caption
      *            The message to show
      */
@@ -135,9 +135,9 @@ public class Notification implements Serializable {
 
     /**
      * Creates a notification message of the specified type.
-     * 
+     *
      * The caption is rendered as plain text with HTML automatically escaped.
-     * 
+     *
      * @param caption
      *            The message to show
      * @param type
@@ -150,10 +150,10 @@ public class Notification implements Serializable {
     /**
      * Creates a "humanized" notification message with a bigger caption and
      * smaller description.
-     * 
+     *
      * The caption and description are rendered as plain text with HTML
      * automatically escaped.
-     * 
+     *
      * @param caption
      *            The message caption
      * @param description
@@ -166,10 +166,10 @@ public class Notification implements Serializable {
     /**
      * Creates a notification message of the specified type, with a bigger
      * caption and smaller description.
-     * 
+     *
      * The caption and description are rendered as plain text with HTML
      * automatically escaped.
-     * 
+     *
      * @param caption
      *            The message caption
      * @param description
@@ -184,9 +184,9 @@ public class Notification implements Serializable {
     /**
      * Creates a notification message of the specified type, with a bigger
      * caption and smaller description.
-     * 
+     *
      * Care should be taken to to avoid XSS vulnerabilities if html is allowed.
-     * 
+     *
      * @param caption
      *            The message caption
      * @param description
@@ -230,7 +230,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the caption part of the notification message.
-     * 
+     *
      * @return The message caption
      */
     public String getCaption() {
@@ -239,7 +239,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the caption part of the notification message
-     * 
+     *
      * @param caption
      *            The message caption
      */
@@ -249,7 +249,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the description part of the notification message.
-     * 
+     *
      * @return The message description.
      */
     public String getDescription() {
@@ -258,7 +258,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the description part of the notification message.
-     * 
+     *
      * @param description
      */
     public void setDescription(String description) {
@@ -267,7 +267,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the position of the notification message.
-     * 
+     *
      * @return The position
      */
     public Position getPosition() {
@@ -276,7 +276,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the position of the notification message.
-     * 
+     *
      * @param position
      *            The desired notification position
      */
@@ -286,7 +286,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the icon part of the notification message.
-     * 
+     *
      * @return The message icon
      */
     public Resource getIcon() {
@@ -295,7 +295,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the icon part of the notification message.
-     * 
+     *
      * @param icon
      *            The desired message icon
      */
@@ -305,7 +305,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the delay before the notification disappears.
-     * 
+     *
      * @return the delay in msec, -1 indicates the message has to be clicked.
      */
     public int getDelayMsec() {
@@ -314,7 +314,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the delay before the notification disappears.
-     * 
+     *
      * @param delayMsec
      *            the desired delay in msec, -1 to require the user to click the
      *            message
@@ -325,7 +325,7 @@ public class Notification implements Serializable {
 
     /**
      * Sets the style name for the notification message.
-     * 
+     *
      * @param styleName
      *            The desired style name.
      */
@@ -335,7 +335,7 @@ public class Notification implements Serializable {
 
     /**
      * Gets the style name for the notification message.
-     * 
+     *
      * @return
      */
     public String getStyleName() {
@@ -347,7 +347,7 @@ public class Notification implements Serializable {
      * true, the texts are passed to the browser as html and the developer is
      * responsible for ensuring no harmful html is used. If set to false, the
      * texts are passed to the browser as plain text.
-     * 
+     *
      * @param htmlContentAllowed
      *            true if the texts are used as html, false if used as plain
      *            text
@@ -359,7 +359,7 @@ public class Notification implements Serializable {
     /**
      * Checks whether caption and description are interpreted as html or plain
      * text.
-     * 
+     *
      * @return true if the texts are used as html, false if used as plain text
      * @see #setHtmlContentAllowed(boolean)
      */
@@ -369,7 +369,7 @@ public class Notification implements Serializable {
 
     /**
      * Shows this notification on a Page.
-     * 
+     *
      * @param page
      *            The page on which the notification should be shown
      */
@@ -381,12 +381,12 @@ public class Notification implements Serializable {
     /**
      * Shows a notification message on the middle of the current page. The
      * message automatically disappears ("humanized message").
-     * 
+     *
      * The caption is rendered as plain text with HTML automatically escaped.
-     * 
+     *
      * @see #Notification(String)
      * @see #show(Page)
-     * 
+     *
      * @param caption
      *            The message
      */
@@ -399,12 +399,12 @@ public class Notification implements Serializable {
      * of the message depends on the type, which is one of the basic types
      * defined in {@link Notification}, for instance
      * Notification.TYPE_WARNING_MESSAGE.
-     * 
+     *
      * The caption is rendered as plain text with HTML automatically escaped.
-     * 
+     *
      * @see #Notification(String, int)
      * @see #show(Page)
-     * 
+     *
      * @param caption
      *            The message
      * @param type
@@ -419,12 +419,12 @@ public class Notification implements Serializable {
      * of the message depends on the type, which is one of the basic types
      * defined in {@link Notification}, for instance
      * Notification.TYPE_WARNING_MESSAGE.
-     * 
+     *
      * The caption is rendered as plain text with HTML automatically escaped.
-     * 
+     *
      * @see #Notification(String, Type)
      * @see #show(Page)
-     * 
+     *
      * @param caption
      *            The message
      * @param description
diff --git a/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java
index 0a6137ff23..37eacab09d 100644
--- a/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.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
@@ -15,7 +15,7 @@
  */
 
 /**
- * 
+ *
  */
 package com.vaadin.ui;
 
diff --git a/server/src/main/java/com/vaadin/ui/Panel.java b/server/src/main/java/com/vaadin/ui/Panel.java
index daa4974e7e..193f0bdcef 100644
--- a/server/src/main/java/com/vaadin/ui/Panel.java
+++ b/server/src/main/java/com/vaadin/ui/Panel.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
@@ -38,7 +38,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Panel - a simple single component container.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -68,7 +68,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /**
      * Creates a new empty panel which contains the given content.
-     * 
+     *
      * @param content
      *            the content for the panel.
      */
@@ -81,7 +81,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /**
      * Creates a new empty panel with caption.
-     * 
+     *
      * @param caption
      *            the caption used in the panel (HTML).
      */
@@ -91,7 +91,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /**
      * Creates a new empty panel with the given caption and content.
-     * 
+     *
      * @param caption
      *            the caption of the panel (HTML).
      * @param content
@@ -104,11 +104,11 @@ public class Panel extends AbstractSingleComponentContainer
 
     /**
      * Sets the caption of the panel.
-     * 
+     *
      * Note that the caption is interpreted as HTML and therefore care should be
      * taken not to enable HTML injection and XSS attacks using panel captions.
      * This behavior may change in future versions.
-     * 
+     *
      * @see AbstractComponent#setCaption(String)
      */
     @Override
@@ -118,7 +118,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.LegacyComponent#paintContent(com.vaadin.server
      * .PaintTarget)
      */
@@ -132,7 +132,7 @@ public class Panel extends AbstractSingleComponentContainer
     /**
      * Called when one or more variables handled by the implementing class are
      * changed.
-     * 
+     *
      * @see com.vaadin.server.VariableOwner#changeVariables(Object, Map)
      */
     @Override
@@ -170,7 +170,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
@@ -180,7 +180,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
@@ -190,7 +190,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Scrollable#setScrollLeft(int)
      */
     @Override
@@ -204,7 +204,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.server.Scrollable#setScrollTop(int)
      */
     @Override
@@ -267,9 +267,9 @@ public class Panel extends AbstractSingleComponentContainer
      * user clicks inside the Panel. Also when the click targets a component
      * inside the Panel, provided the targeted component does not prevent the
      * click event from propagating.
-     * 
+     *
      * Use {@link #removeListener(ClickListener)} to remove the listener.
-     * 
+     *
      * @param listener
      *            The listener to add
      */
@@ -290,7 +290,7 @@ public class Panel extends AbstractSingleComponentContainer
     /**
      * Remove a click listener from the Panel. The listener should earlier have
      * been added using {@link #addListener(ClickListener)}.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
@@ -326,7 +326,7 @@ public class Panel extends AbstractSingleComponentContainer
 
     /**
      * Moves keyboard focus to the component. {@see Focusable#focus()}
-     * 
+     *
      */
     @Override
     public void focus() {
diff --git a/server/src/main/java/com/vaadin/ui/PasswordField.java b/server/src/main/java/com/vaadin/ui/PasswordField.java
index beb7db6409..46aed70fd0 100644
--- a/server/src/main/java/com/vaadin/ui/PasswordField.java
+++ b/server/src/main/java/com/vaadin/ui/PasswordField.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
@@ -38,7 +38,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /**
      * Constructs a PasswordField with given property data source.
-     * 
+     *
      * @param dataSource
      *            the property data source for the field
      */
@@ -48,7 +48,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /**
      * Constructs a PasswordField with given caption and property data source.
-     * 
+     *
      * @param caption
      *            the caption for the field
      * @param dataSource
@@ -61,7 +61,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /**
      * Constructs a PasswordField with given value and caption.
-     * 
+     *
      * @param caption
      *            the caption for the field
      * @param value
@@ -74,7 +74,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /**
      * Constructs a PasswordField with given caption.
-     * 
+     *
      * @param caption
      *            the caption for the field
      */
@@ -85,7 +85,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#readDesign(org.jsoup.nodes.Element ,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -101,7 +101,7 @@ public class PasswordField extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractTextField#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/PopupDateField.java b/server/src/main/java/com/vaadin/ui/PopupDateField.java
index f450536b47..bf892ff12b 100644
--- a/server/src/main/java/com/vaadin/ui/PopupDateField.java
+++ b/server/src/main/java/com/vaadin/ui/PopupDateField.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
@@ -23,7 +23,7 @@ import com.vaadin.shared.ui.datefield.PopupDateFieldState;
 
 /**
  * A date entry component, which displays the actual date selector as a popup.
- * 
+ *
  * @see DateField
  * @see InlineDateField
  * @author Vaadin Ltd.
@@ -43,7 +43,7 @@ public class PopupDateField extends DateField {
     /**
      * Constructs a new <code>PopupDateField</code> with the given caption and
      * initial text contents.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param value
@@ -55,7 +55,7 @@ public class PopupDateField extends DateField {
 
     /**
      * Constructs an empty <code>PopupDateField</code> with caption.
-     * 
+     *
      * @param caption
      *            the caption of the datefield.
      */
@@ -74,7 +74,7 @@ public class PopupDateField extends DateField {
 
     /**
      * Gets the current input prompt.
-     * 
+     *
      * @see #setInputPrompt(String)
      * @return the current input prompt, or null if not enabled
      */
@@ -85,7 +85,7 @@ public class PopupDateField extends DateField {
     /**
      * Sets the input prompt - a textual prompt that is displayed when the field
      * would otherwise be empty, to prompt the user for input.
-     * 
+     *
      * @param inputPrompt
      */
     public void setInputPrompt(String inputPrompt) {
@@ -105,9 +105,9 @@ public class PopupDateField extends DateField {
 
     /**
      * Checks whether the text field is enabled (default) or not.
-     * 
+     *
      * @see PopupDateField#setTextFieldEnabled(boolean);
-     * 
+     *
      * @return <b>true</b> if the text field is enabled, <b>false</b> otherwise.
      */
     public boolean isTextFieldEnabled() {
@@ -118,9 +118,9 @@ public class PopupDateField extends DateField {
      * Enables or disables the text field. By default the text field is enabled.
      * Disabling it causes only the button for date selection to be active, thus
      * preventing the user from entering invalid dates.
-     * 
+     *
      * See {@link http://dev.vaadin.com/ticket/6790}.
-     * 
+     *
      * @param state
      *            <b>true</b> to enable text field, <b>false</b> to disable it.
      */
@@ -131,7 +131,7 @@ public class PopupDateField extends DateField {
     /**
      * Set a description that explains the usage of the Widget for users of
      * assistive devices.
-     * 
+     *
      * @param description
      *            String with the description
      */
@@ -142,7 +142,7 @@ public class PopupDateField extends DateField {
     /**
      * Get the description that explains the usage of the Widget for users of
      * assistive devices.
-     * 
+     *
      * @return String with the description
      */
     public String getAssistiveText() {
diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java
index 4beb8c87ac..04598d4aa6 100644
--- a/server/src/main/java/com/vaadin/ui/PopupView.java
+++ b/server/src/main/java/com/vaadin/ui/PopupView.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
@@ -29,12 +29,12 @@ import com.vaadin.shared.ui.popupview.PopupViewState;
 import com.vaadin.ui.declarative.DesignContext;
 
 /**
- * 
+ *
  * A component for displaying a two different views to data. The minimized view
  * is normally used to render the component, and when it is clicked the full
  * view is displayed on a popup. The inner class {@link PopupView.Content} is
  * used to deliver contents to this component.
- * 
+ *
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
@@ -69,7 +69,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * This is an internal constructor. Use
      * {@link PopupView#PopupView(String, Component)} instead.
-     * 
+     *
      * @since 7.5.0
      */
     @Deprecated
@@ -83,7 +83,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
      * A simple way to create a PopupPanel. Note that the minimal representation
      * may not be dynamically updated, in order to achieve this create your own
      * Content object and use {@link PopupView#PopupView(Content)}.
-     * 
+     *
      * @param small
      *            the minimal textual representation as HTML
      * @param large
@@ -96,7 +96,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Creates a PopupView through the PopupView.Content interface. This allows
      * the creator to dynamically change the contents of the PopupView.
-     * 
+     *
      * @param content
      *            the PopupView.Content that contains the information for this
      */
@@ -107,9 +107,9 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /**
      * Creates a Content from given text representation and popup content.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param minimizedValue
      *            text representation when popup is hidden
      * @param popupContent
@@ -133,7 +133,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /**
      * This method will replace the current content of the panel with a new one.
-     * 
+     *
      * @param newContent
      *            PopupView.Content object containing new information for the
      *            PopupView
@@ -152,7 +152,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /**
      * Returns the content-package for this PopupView.
-     * 
+     *
      * @return the PopupView.Content for this object or null
      */
     public PopupView.Content getContent() {
@@ -162,7 +162,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Set the visibility of the popup. Does not hide the minimal
      * representation.
-     * 
+     *
      * @param visible
      */
     public void setPopupVisible(boolean visible) {
@@ -202,7 +202,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /**
      * Return whether the popup is visible.
-     * 
+     *
      * @return true if the popup is showing
      */
     public boolean isPopupVisible() {
@@ -212,7 +212,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Check if this popup will be hidden when the user takes the mouse cursor
      * out of the popup area.
-     * 
+     *
      * @return true if the popup is hidden on mouse out, false otherwise
      */
     public boolean isHideOnMouseOut() {
@@ -223,9 +223,9 @@ public class PopupView extends AbstractComponent implements HasComponents {
      * Should the popup automatically hide when the user takes the mouse cursor
      * out of the popup area? If this is false, the user must click outside the
      * popup to close it. The default is true.
-     * 
+     *
      * @param hideOnMouseOut
-     * 
+     *
      */
     public void setHideOnMouseOut(boolean hideOnMouseOut) {
         getState().hideOnMouseOut = hideOnMouseOut;
@@ -238,7 +238,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /**
      * This class only contains other components when the popup is showing.
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     @Override
@@ -253,7 +253,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Gets the number of contained components. Consistent with the iterator
      * returned by {@link #getComponentIterator()}.
-     * 
+     *
      * @return the number of contained components (zero or one)
      */
     public int getComponentCount() {
@@ -317,14 +317,14 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
         /**
          * This should return a small view of the full data.
-         * 
+         *
          * @return value in HTML format
          */
         public String getMinimizedValueAsHTML();
 
         /**
          * This should return the full Component representing the data
-         * 
+         *
          * @return a Component for the value
          */
         public Component getPopupComponent();
@@ -333,13 +333,13 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Add a listener that is called whenever the visibility of the popup is
      * changed.
-     * 
+     *
      * @param listener
      *            the listener to add
      * @see PopupVisibilityListener
      * @see PopupVisibilityEvent
      * @see #removeListener(PopupVisibilityListener)
-     * 
+     *
      */
     public void addPopupVisibilityListener(PopupVisibilityListener listener) {
         addListener(PopupVisibilityEvent.class, listener,
@@ -358,7 +358,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Removes a previously added listener, so that it no longer receives events
      * when the visibility of the popup changes.
-     * 
+     *
      * @param listener
      *            the listener to remove
      * @see PopupVisibilityListener
@@ -384,7 +384,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
      * visibility of the popup changes. You can get the new visibility directly
      * with {@link #isPopupVisible()}, or get the PopupView that produced the
      * event with {@link #getPopupView()}.
-     * 
+     *
      */
     public static class PopupVisibilityEvent extends Event {
 
@@ -394,7 +394,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
         /**
          * Get the PopupView instance that is the source of this event.
-         * 
+         *
          * @return the source PopupView
          */
         public PopupView getPopupView() {
@@ -403,7 +403,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
         /**
          * Returns the current visibility of the popup.
-         * 
+         *
          * @return true if the popup is visible
          */
         public boolean isPopupVisible() {
@@ -414,16 +414,16 @@ public class PopupView extends AbstractComponent implements HasComponents {
     /**
      * Defines a listener that can receive a PopupVisibilityEvent when the
      * visibility of the popup changes.
-     * 
+     *
      */
     public interface PopupVisibilityListener extends Serializable {
         /**
          * Pass to {@link PopupView#PopupVisibilityEvent} to start listening for
          * popup visibility changes.
-         * 
+         *
          * @param event
          *            the event
-         * 
+         *
          * @see {@link PopupVisibilityEvent}
          * @see {@link PopupView#addListener(PopupVisibilityListener)}
          */
diff --git a/server/src/main/java/com/vaadin/ui/ProgressBar.java b/server/src/main/java/com/vaadin/ui/ProgressBar.java
index f9935de8c6..fa0a7bd095 100644
--- a/server/src/main/java/com/vaadin/ui/ProgressBar.java
+++ b/server/src/main/java/com/vaadin/ui/ProgressBar.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,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * floating point value between 0 and 1 (inclusive). The progress bar can also
  * be in an indeterminate mode showing an animation indicating that the task is
  * running but without providing any information about the current progress.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -49,7 +49,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
 
     /**
      * Creates a new progress bar with the given initial value.
-     * 
+     *
      * @param progress
      *            the initial progress value
      */
@@ -59,7 +59,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
 
     /**
      * Creates a new progress bar bound to the given data source.
-     * 
+     *
      * @param dataSource
      *            the property to bind this progress bar to
      */
@@ -79,7 +79,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
      * Gets the value of this progress bar. The value is a <code>float</code>
      * between 0 and 1 where 0 represents no progress at all and 1 represents
      * fully completed.
-     * 
+     *
      * @return the current progress value
      */
     @Override
@@ -91,7 +91,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
      * Sets the value of this progress bar. The value is a <code>float</code>
      * between 0 and 1 where 0 represents no progress at all and 1 represents
      * fully completed.
-     * 
+     *
      * @param newValue
      *            the current progress value
      */
@@ -119,7 +119,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
      * Sets whether or not this progress indicator is indeterminate. In
      * indeterminate mode there is an animation indicating that the task is
      * running but without providing any information about the current progress.
-     * 
+     *
      * @param indeterminate
      *            <code>true</code> to set to indeterminate mode; otherwise
      *            <code>false</code>
@@ -132,7 +132,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
      * Gets whether or not this progress indicator is indeterminate. In
      * indeterminate mode there is an animation indicating that the task is
      * running but without providing any information about the current progress.
-     * 
+     *
      * @return <code>true</code> if set to indeterminate mode; otherwise
      *         <code>false</code>
      */
@@ -144,7 +144,7 @@ public class ProgressBar extends LegacyAbstractField<Float>
      * Overridden to keep the shared state in sync with the LegacyAbstractField
      * internal value. Should be removed once LegacyAbstractField is refactored
      * to use shared state.
-     * 
+     *
      * See tickets #10921 and #11064.
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java b/server/src/main/java/com/vaadin/ui/ProgressIndicator.java
index 6e436169e3..dd275782a8 100644
--- a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/main/java/com/vaadin/ui/ProgressIndicator.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.shared.ui.progressindicator.ProgressIndicatorState;
  * centralized management of when messages are sent to the server. Furthermore,
  * polling might not be needed at all if {@link UI#setPushMode(PushMode)} or
  * {@link UI#setPollInterval(int)} is used.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 4
  * @deprecated as of 7.1, use {@link ProgressBar} combined with
@@ -56,7 +56,7 @@ public class ProgressIndicator extends ProgressBar {
 
     /**
      * Creates a new instance of ProgressIndicator with given state.
-     * 
+     *
      * @param value
      */
     public ProgressIndicator(float value) {
@@ -67,7 +67,7 @@ public class ProgressIndicator extends ProgressBar {
     /**
      * Creates a new instance of ProgressIndicator with state read from the
      * given datasource.
-     * 
+     *
      * @param contentSource
      */
     public ProgressIndicator(Property contentSource) {
@@ -87,7 +87,7 @@ public class ProgressIndicator extends ProgressBar {
 
     /**
      * Sets the interval that component checks for progress.
-     * 
+     *
      * @param pollingInterval
      *            the interval in milliseconds.
      */
@@ -97,7 +97,7 @@ public class ProgressIndicator extends ProgressBar {
 
     /**
      * Gets the interval that component checks for progress.
-     * 
+     *
      * @return the interval in milliseconds.
      */
     public int getPollingInterval() {
diff --git a/server/src/main/java/com/vaadin/ui/PushConfiguration.java b/server/src/main/java/com/vaadin/ui/PushConfiguration.java
index 43060ad408..e0f47c494c 100644
--- a/server/src/main/java/com/vaadin/ui/PushConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/PushConfiguration.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.shared.ui.ui.UIState.PushConfigurationState;
 
 /**
  * Provides method for configuring the push channel.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -36,7 +36,7 @@ public interface PushConfiguration extends Serializable {
 
     /**
      * Returns the mode of bidirectional ("push") communication that is used.
-     * 
+     *
      * @return The push mode.
      */
     public PushMode getPushMode();
@@ -49,10 +49,10 @@ public interface PushConfiguration extends Serializable {
      * application developer. An add-on should not set the push mode directly,
      * rather instruct the user to set it.
      * </p>
-     * 
+     *
      * @param pushMode
      *            The push mode to use.
-     * 
+     *
      * @throws IllegalArgumentException
      *             if the argument is null.
      * @throws IllegalStateException
@@ -66,7 +66,7 @@ public interface PushConfiguration extends Serializable {
      * Note that if you set the transport type using
      * {@link #setParameter(String, String)} to an unsupported type this method
      * will return null. Supported types are defined by {@link Transport}.
-     * 
+     *
      * @return The primary transport type
      */
     public Transport getTransport();
@@ -76,7 +76,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * Note that the new transport type will not be used until the push channel
      * is disconnected and reconnected if already active.
-     * 
+     *
      * @param transport
      *            The primary transport type
      */
@@ -88,7 +88,7 @@ public interface PushConfiguration extends Serializable {
      * Note that if you set the transport type using
      * {@link #setParameter(String, String)} to an unsupported type this method
      * will return null. Supported types are defined by {@link Transport}.
-     * 
+     *
      * @return The fallback transport type
      */
     public Transport getFallbackTransport();
@@ -98,7 +98,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * Note that the new transport type will not be used until the push channel
      * is disconnected and reconnected if already active.
-     * 
+     *
      * @param fallbackTransport
      *            The fallback transport type
      */
@@ -109,7 +109,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * This method provides low level access to push parameters and is typically
      * not needed for normal application development.
-     * 
+     *
      * @since 7.1
      * @param parameter
      *            The parameter name
@@ -119,7 +119,7 @@ public interface PushConfiguration extends Serializable {
 
     /**
      * Returns the parameters which have been defined.
-     * 
+     *
      * @since 7.1
      * @return A collection of parameter names
      */
@@ -130,7 +130,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * This method provides low level access to push parameters and is typically
      * not needed for normal application development.
-     * 
+     *
      * @since 7.1
      * @param parameter
      *            The parameter name
@@ -144,7 +144,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * This is only used when overriding the URL to use. Setting this to null
      * (the default) will use the default URL.
-     * 
+     *
      * @since 7.6
      * @param pushUrl
      *            The push URL to use
@@ -156,7 +156,7 @@ public interface PushConfiguration extends Serializable {
      * <p>
      * This is only used when overriding the URL to use. Returns null (the
      * default) when the default URL is used.
-     * 
+     *
      * @since 7.6
      * @return the URL to use for push requests, or null to use to default
      */
@@ -173,7 +173,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#getPushMode()
      */
     @Override
@@ -183,7 +183,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#setPushMode(com.vaadin.shared.
      * communication .PushMode)
      */
@@ -234,7 +234,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#getTransport()
      */
     @Override
@@ -255,7 +255,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.PushConfiguration#setTransport(com.vaadin.shared.ui.ui.
      * Transport)
@@ -276,7 +276,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#getFallbackTransport()
      */
     @Override
@@ -291,7 +291,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.PushConfiguration#setFallbackTransport(com.vaadin.shared
      * .ui.ui.Transport)
@@ -308,7 +308,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#getParameter(java.lang.String)
      */
     @Override
@@ -318,7 +318,7 @@ class PushConfigurationImpl implements PushConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.PushConfiguration#setParameter(java.lang.String,
      * java.lang.String)
      */
diff --git a/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java
index 69df4f6211..da5fa80f04 100644
--- a/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.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
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 /**
  * Provides method for configuring the reconnect dialog.
- * 
+ *
  * @since 7.6
  * @author Vaadin Ltd
  */
@@ -28,7 +28,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Gets the text to show in the reconnect dialog when trying to re-establish
      * the server connection
-     * 
+     *
      * @return the text to show in the reconnect dialog
      */
     public String getDialogText();
@@ -36,7 +36,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Sets the text to show in the reconnect dialog when trying to re-establish
      * the server connection
-     * 
+     *
      * @param dialogText
      *            the text to show in the reconnect dialog
      */
@@ -45,7 +45,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Gets the text to show in the reconnect dialog after giving up trying to
      * reconnect ({@link #getReconnectAttempts()} reached)
-     * 
+     *
      * @return the text to show in the reconnect dialog after giving up
      */
     public String getDialogTextGaveUp();
@@ -53,7 +53,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Sets the text to show in the reconnect dialog after giving up trying to
      * reconnect ({@link #getReconnectAttempts()} reached)
-     * 
+     *
      * @param dialogText
      *            the text to show in the reconnect dialog after giving up
      */
@@ -62,7 +62,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Gets the number of times to try to reconnect to the server before giving
      * up
-     * 
+     *
      * @return the number of times to try to reconnect
      */
     public int getReconnectAttempts();
@@ -70,7 +70,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Sets the number of times to try to reconnect to the server before giving
      * up
-     * 
+     *
      * @param reconnectAttempts
      *            the number of times to try to reconnect
      */
@@ -78,14 +78,14 @@ public interface ReconnectDialogConfiguration extends Serializable {
 
     /**
      * Gets the interval (in milliseconds) between reconnect attempts
-     * 
+     *
      * @return the interval (in ms) between reconnect attempts
      */
     public int getReconnectInterval();
 
     /**
      * Sets the interval (in milliseconds) between reconnect attempts
-     * 
+     *
      * @param reconnectInterval
      *            the interval (in ms) between reconnect attempts
      */
@@ -94,7 +94,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Gets the timeout (in milliseconds) between noticing a loss of connection
      * and showing the dialog.
-     * 
+     *
      * @return the time to wait before showing a dialog
      */
     public int getDialogGracePeriod();
@@ -102,7 +102,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
     /**
      * Sets the timeout (in milliseconds) between noticing a loss of connection
      * and showing the dialog.
-     * 
+     *
      * @param dialogGracePeriod
      *            the time to wait before showing a dialog
      */
@@ -115,7 +115,7 @@ public interface ReconnectDialogConfiguration extends Serializable {
      * application while the dialog is being shown. If not modal, the user can
      * continue to use the application as normally and all server events will be
      * queued until connection has been re-established.
-     * 
+     *
      * @param dialogModal
      *            true to make the dialog modal, false otherwise
      */
diff --git a/server/src/main/java/com/vaadin/ui/RichTextArea.java b/server/src/main/java/com/vaadin/ui/RichTextArea.java
index ea3adfba47..07f33355d1 100644
--- a/server/src/main/java/com/vaadin/ui/RichTextArea.java
+++ b/server/src/main/java/com/vaadin/ui/RichTextArea.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
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * A simple RichTextArea to edit HTML format text.
- * 
+ *
  * Note, that using {@link LegacyTextField#setMaxLength(int)} method in
  * {@link RichTextArea} may produce unexpected results as formatting is counted
  * into length of field.
@@ -63,9 +63,9 @@ public class RichTextArea extends LegacyAbstractField<String>
     }
 
     /**
-     * 
+     *
      * Constructs an empty <code>RichTextArea</code> with the given caption.
-     * 
+     *
      * @param caption
      *            the caption for the editor.
      */
@@ -77,7 +77,7 @@ public class RichTextArea extends LegacyAbstractField<String>
     /**
      * Constructs a new <code>RichTextArea</code> that's bound to the specified
      * <code>Property</code> and has no caption.
-     * 
+     *
      * @param dataSource
      *            the data source for the editor value
      */
@@ -88,7 +88,7 @@ public class RichTextArea extends LegacyAbstractField<String>
     /**
      * Constructs a new <code>RichTextArea</code> that's bound to the specified
      * <code>Property</code> and has the given caption.
-     * 
+     *
      * @param caption
      *            the caption for the editor.
      * @param dataSource
@@ -102,7 +102,7 @@ public class RichTextArea extends LegacyAbstractField<String>
     /**
      * Constructs a new <code>RichTextArea</code> with the given caption and
      * initial text contents.
-     * 
+     *
      * @param caption
      *            the caption for the editor.
      * @param value
@@ -148,7 +148,7 @@ public class RichTextArea extends LegacyAbstractField<String>
     /**
      * Selects all text in the rich text area. As a side effect, focuses the
      * rich text area.
-     * 
+     *
      * @since 6.5
      */
     public void selectAll() {
@@ -201,17 +201,17 @@ public class RichTextArea extends LegacyAbstractField<String>
 
     /**
      * Gets the null-string representation.
-     * 
+     *
      * <p>
      * The null-valued strings are represented on the user interface by
      * replacing the null value with this string. If the null representation is
      * set null (not 'null' string), painting null value throws exception.
      * </p>
-     * 
+     *
      * <p>
      * The default value is string 'null'.
      * </p>
-     * 
+     *
      * @return the String Textual representation for null strings.
      * @see LegacyTextField#isNullSettingAllowed()
      */
@@ -221,7 +221,7 @@ public class RichTextArea extends LegacyAbstractField<String>
 
     /**
      * Is setting nulls with null-string representation allowed.
-     * 
+     *
      * <p>
      * If this property is true, writing null-representation string to text
      * field always sets the field value to real null. If this property is
@@ -230,11 +230,11 @@ public class RichTextArea extends LegacyAbstractField<String>
      * contents to real null, if the text field matches the null-string
      * representation and the current value of the field is null.
      * </p>
-     * 
+     *
      * <p>
      * By default this setting is false
      * </p>
-     * 
+     *
      * @return boolean Should the null-string represenation be always converted
      *         to null-values.
      * @see LegacyTextField#getNullRepresentation()
@@ -245,17 +245,17 @@ public class RichTextArea extends LegacyAbstractField<String>
 
     /**
      * Sets the null-string representation.
-     * 
+     *
      * <p>
      * The null-valued strings are represented on the user interface by
      * replacing the null value with this string. If the null representation is
      * set null (not 'null' string), painting null value throws exception.
      * </p>
-     * 
+     *
      * <p>
      * The default value is string 'null'
      * </p>
-     * 
+     *
      * @param nullRepresentation
      *            Textual representation for null strings.
      * @see LegacyTextField#setNullSettingAllowed(boolean)
@@ -266,7 +266,7 @@ public class RichTextArea extends LegacyAbstractField<String>
 
     /**
      * Sets the null conversion mode.
-     * 
+     *
      * <p>
      * If this property is true, writing null-representation string to text
      * field always sets the field value to real null. If this property is
@@ -275,11 +275,11 @@ public class RichTextArea extends LegacyAbstractField<String>
      * contents to real null, if the text field matches the null-string
      * representation and the current value of the field is null.
      * </p>
-     * 
+     *
      * <p>
      * By default this setting is false.
      * </p>
-     * 
+     *
      * @param nullSettingAllowed
      *            Should the null-string represenation be always converted to
      *            null-values.
diff --git a/server/src/main/java/com/vaadin/ui/Select.java b/server/src/main/java/com/vaadin/ui/Select.java
index e63cba3eaa..21313e6e55 100644
--- a/server/src/main/java/com/vaadin/ui/Select.java
+++ b/server/src/main/java/com/vaadin/ui/Select.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,13 +26,13 @@ import com.vaadin.data.Container;
  * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
  * {@link com.vaadin.data.Container}.
  * </p>
- * 
+ *
  * <p>
  * A <code>Select</code> component may be in single- or multiselect mode.
  * Multiselect mode means that more than one item can be selected
  * simultaneously.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  * @deprecated As of 7.0. Use {@link ComboBox} instead.
diff --git a/server/src/main/java/com/vaadin/ui/SelectiveRenderer.java b/server/src/main/java/com/vaadin/ui/SelectiveRenderer.java
index 5c4d052a53..663e3faaba 100644
--- a/server/src/main/java/com/vaadin/ui/SelectiveRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/SelectiveRenderer.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
@@ -19,11 +19,11 @@ package com.vaadin.ui;
  * Interface implemented by {@link HasComponents} implementors that wish to
  * dynamically be able to prevent given child components from reaching the
  * client side.
- * 
+ *
  * @author Vaadin Ltd
  * @version @VERSION@
  * @since 7.0
- * 
+ *
  */
 public interface SelectiveRenderer extends HasComponents {
     /**
@@ -39,7 +39,7 @@ public interface SelectiveRenderer extends HasComponents {
      * returning false will prevent the child from being sent to the client. If
      * a child is set to invisible, this method has no effect.
      * </p>
-     * 
+     *
      * @param childComponent
      *            The child component to check
      * @return true if the child component may be sent to the client, false
diff --git a/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java
index bb05b2e403..c9379f85b4 100644
--- a/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.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
@@ -21,10 +21,10 @@ import com.vaadin.ui.HasComponents.ComponentAttachDetachNotifier;
 /**
  * Interface for component containers that have one child component and do not
  * support adding or removing components.
- * 
+ *
  * For component containers that support multiple children, see
  * {@link ComponentContainer} instead.
- * 
+ *
  * @since 7.0
  */
 public interface SingleComponentContainer
@@ -34,7 +34,7 @@ public interface SingleComponentContainer
      * Gets the number of children this {@link SingleComponentContainer} has.
      * This must be symmetric with what {@link #iterator()} returns and thus
      * typically return 1 if the content is set, 0 otherwise.
-     * 
+     *
      * @return The number of child components this container has.
      */
     public int getComponentCount();
@@ -42,9 +42,9 @@ public interface SingleComponentContainer
     /**
      * Gets the content of this container. The content is a component that
      * serves as the outermost item of the visual contents.
-     * 
+     *
      * @return a component to use as content
-     * 
+     *
      * @see #setContent(Component)
      */
     public Component getContent();
@@ -52,10 +52,10 @@ public interface SingleComponentContainer
     /**
      * Sets the content of this container. The content is a component that
      * serves as the outermost item of the visual contents.
-     * 
+     *
      * The content should always be set, either as a constructor parameter or by
      * calling this method.
-     * 
+     *
      * @return a component (typically a layout) to use as content
      */
     public void setContent(Component content);
diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java
index 051b616d97..308aa70874 100644
--- a/server/src/main/java/com/vaadin/ui/Table.java
+++ b/server/src/main/java/com/vaadin/ui/Table.java
@@ -83,7 +83,7 @@ import com.vaadin.util.ReflectTools;
  * <code>Table</code> is used for representing data or components in a pageable
  * and selectable table.
  * </p>
- * 
+ *
  * <p>
  * Scalability of the Table is largely dictated by the container. A table does
  * not have a limit for the number of items and is just as fast with hundreds of
@@ -91,11 +91,11 @@ import com.vaadin.util.ReflectTools;
  * scrolling however limits the number of rows to around 500000, depending on
  * the browser and the pixel height of rows.
  * </p>
- * 
+ *
  * <p>
  * Components in a Table will not have their caption nor icon rendered.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -622,7 +622,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Creates a new empty table with caption.
-     * 
+     *
      * @param caption
      */
     public Table(String caption) {
@@ -632,7 +632,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Creates a new table with caption and connect it to a Container.
-     * 
+     *
      * @param caption
      * @param dataSource
      */
@@ -646,11 +646,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the array of visible column id:s, including generated columns.
-     * 
+     *
      * <p>
      * The columns are show in the order of their appearance in this array.
      * </p>
-     * 
+     *
      * @return an array of currently visible propertyIds and generated column
      *         ids.
      */
@@ -663,11 +663,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the array of visible column property id:s.
-     * 
+     *
      * <p>
      * The columns are show in the order of their appearance in this array.
      * </p>
-     * 
+     *
      * @param visibleColumns
      *            the Array of shown property id:s.
      */
@@ -709,7 +709,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the headers of the columns.
-     * 
+     *
      * <p>
      * The headers match the property id:s given by the set visible column
      * headers. The table must be set in either
@@ -718,7 +718,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * headers. In the defaults mode any nulls in the headers array are replaced
      * with id.toString().
      * </p>
-     * 
+     *
      * @return the Array of column headers.
      */
     public String[] getColumnHeaders() {
@@ -736,7 +736,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the headers of the columns.
-     * 
+     *
      * <p>
      * The headers match the property id:s given by the set visible column
      * headers. The table must be set in either
@@ -745,7 +745,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * headers. In the defaults mode any nulls in the headers array are replaced
      * with id.toString() outputs when rendering.
      * </p>
-     * 
+     *
      * @param columnHeaders
      *            the Array of column headers that match the
      *            {@link #getVisibleColumns()} method.
@@ -769,7 +769,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the icons of the columns.
-     * 
+     *
      * <p>
      * The icons in headers match the property id:s given by the set visible
      * column headers. The table must be set in either
@@ -777,7 +777,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * {@link #COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID} mode to show the headers
      * with icons.
      * </p>
-     * 
+     *
      * @return the Array of icons that match the {@link #getVisibleColumns()}.
      */
     public Resource[] getColumnIcons() {
@@ -796,7 +796,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the icons of the columns.
-     * 
+     *
      * <p>
      * The icons in headers match the property id:s given by the set visible
      * column headers. The table must be set in either
@@ -804,7 +804,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * {@link #COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID} mode to show the headers
      * with icons.
      * </p>
-     * 
+     *
      * @param columnIcons
      *            the Array of icons that match the {@link #getVisibleColumns()}
      *            .
@@ -828,7 +828,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the array of column alignments.
-     * 
+     *
      * <p>
      * The items in the array must match the properties identified by
      * {@link #getVisibleColumns()}. The possible values for the alignments
@@ -841,7 +841,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * The alignments default to {@link Align#LEFT}: any null values are
      * rendered as align lefts.
      * </p>
-     * 
+     *
      * @return the Column alignments array.
      */
     public Align[] getColumnAlignments() {
@@ -860,7 +860,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the column alignments.
-     * 
+     *
      * <p>
      * The amount of items in the array must match the amount of properties
      * identified by {@link #getVisibleColumns()}. The possible values for the
@@ -872,7 +872,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * </ul>
      * The alignments default to {@link Align#LEFT}
      * </p>
-     * 
+     *
      * @param columnAlignments
      *            the Column alignments array.
      */
@@ -901,11 +901,11 @@ public class Table extends AbstractSelect implements Action.Container,
      * Sets columns width (in pixels). Theme may not necessarily respect very
      * small or very big values. Setting width to -1 (default) means that theme
      * will make decision of width.
-     * 
+     *
      * <p>
      * Column can either have a fixed width or expand ratio. The latter one set
      * is used. See @link {@link #setColumnExpandRatio(Object, float)}.
-     * 
+     *
      * @param propertyId
      *            columns property id
      * @param width
@@ -939,27 +939,27 @@ public class Table extends AbstractSelect implements Action.Container,
      * naturally. Excess space is the space that is not used by columns with
      * explicit width (see {@link #setColumnWidth(Object, int)}) or with natural
      * width (no width nor expand ratio).
-     * 
+     *
      * <p>
      * By default (without expand ratios) the excess space is divided
      * proportionally to columns natural widths.
-     * 
+     *
      * <p>
      * Only expand ratios of visible columns are used in final calculations.
-     * 
+     *
      * <p>
      * Column can either have a fixed width or expand ratio. The latter one set
      * is used.
-     * 
+     *
      * <p>
      * A column with expand ratio is considered to be minimum width by default
      * (if no excess space exists). The minimum width is defined by terminal
      * implementation.
-     * 
+     *
      * <p>
      * If terminal implementation supports re-sizable columns the column becomes
      * fixed width column if users resizes the column.
-     * 
+     *
      * @param propertyId
      *            columns property id
      * @param expandRatio
@@ -988,7 +988,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the column expand ratio for a column. See
      * {@link #setColumnExpandRatio(Object, float)}
-     * 
+     *
      * @param propertyId
      *            columns property id
      * @return the expandRatio used to divide excess space for this column
@@ -1003,7 +1003,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the pixel width of column
-     * 
+     *
      * @param propertyId
      * @return width of column or -1 when value not set
      */
@@ -1022,11 +1022,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the page length.
-     * 
+     *
      * <p>
      * Setting page length 0 disables paging.
      * </p>
-     * 
+     *
      * @return the Length of one page.
      */
     public int getPageLength() {
@@ -1035,16 +1035,16 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the page length.
-     * 
+     *
      * <p>
      * Setting page length 0 disables paging. The page length defaults to 15.
      * </p>
-     * 
+     *
      * <p>
      * If Table has height set ({@link #setHeight(float, Unit)} ) the client
      * side may update the page length automatically the correct value.
      * </p>
-     * 
+     *
      * @param pageLength
      *            the length of one page.
      */
@@ -1058,18 +1058,18 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * This method adjusts a possible caching mechanism of table implementation.
-     * 
+     *
      * <p>
      * Table component may fetch and render some rows outside visible area. With
      * complex tables (for example containing layouts and components), the
      * client side may become unresponsive. Setting the value lower, UI will
      * become more responsive. With higher values scrolling in client will hit
      * server less frequently.
-     * 
+     *
      * <p>
      * The amount of cached rows will be cacheRate multiplied with pageLength (
      * {@link #setPageLength(int)} both below and above visible area..
-     * 
+     *
      * @param cacheRate
      *            a value over 0 (fastest rendering time). Higher value will
      *            cache more rows on server (smoother scrolling). Default value
@@ -1088,7 +1088,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * @see #setCacheRate(double)
-     * 
+     *
      * @return the current cache rate value
      */
     public double getCacheRate() {
@@ -1097,7 +1097,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Getter for property currentPageFirstItem.
-     * 
+     *
      * @return the Value of property currentPageFirstItem.
      */
     public Object getCurrentPageFirstItemId() {
@@ -1125,14 +1125,14 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Returns the item ID for the item represented by the index given. Assumes
      * that the current container implements {@link Container.Indexed}.
-     * 
+     *
      * See {@link Container.Indexed#getIdByIndex(int)} for more information
      * about the exceptions that can be thrown.
-     * 
+     *
      * @param index
      *            the index for which the item ID should be fetched
      * @return the item ID for the given index
-     * 
+     *
      * @throws ClassCastException
      *             if container does not implement {@link Container.Indexed}
      * @throws IndexOutOfBoundsException
@@ -1145,7 +1145,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Setter for property currentPageFirstItemId.
-     * 
+     *
      * @param currentPageFirstItemId
      *            the New value of property currentPageFirstItemId.
      */
@@ -1202,7 +1202,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the icon Resource for the specified column.
-     * 
+     *
      * @param propertyId
      *            the propertyId identifying the column.
      * @return the icon for the specified column; null if the column has no icon
@@ -1217,7 +1217,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * <p>
      * Throws IllegalArgumentException if the specified column is not visible.
      * </p>
-     * 
+     *
      * @param propertyId
      *            the propertyId identifying the column.
      * @param icon
@@ -1236,7 +1236,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the header for the specified column.
-     * 
+     *
      * @param propertyId
      *            the propertyId identifying the column.
      * @return the header for the specified column if it has one.
@@ -1258,7 +1258,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the column header for the specified column;
-     * 
+     *
      * @param propertyId
      *            the propertyId identifying the column.
      * @param header
@@ -1277,7 +1277,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the specified column's alignment.
-     * 
+     *
      * @param propertyId
      *            the propertyID identifying the column.
      * @return the specified column's alignment if it as one; {@link Align#LEFT}
@@ -1290,13 +1290,13 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the specified column's alignment.
-     * 
+     *
      * <p>
      * Throws IllegalArgumentException if the alignment is not one of the
      * following: {@link Align#LEFT}, {@link Align#CENTER} or
      * {@link Align#RIGHT}
      * </p>
-     * 
+     *
      * @param propertyId
      *            the propertyID identifying the column.
      * @param alignment
@@ -1316,7 +1316,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if the specified column is collapsed.
-     * 
+     *
      * @param propertyId
      *            the propertyID identifying the column.
      * @return true if the column is collapsed; false otherwise;
@@ -1328,8 +1328,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets whether the specified column is collapsed or not.
-     * 
-     * 
+     *
+     *
      * @param propertyId
      *            the propertyID identifying the column.
      * @param collapsed
@@ -1369,7 +1369,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if column collapsing is allowed.
-     * 
+     *
      * @return true if columns can be collapsed; false otherwise.
      */
     public boolean isColumnCollapsingAllowed() {
@@ -1378,7 +1378,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets whether column collapsing is allowed or not.
-     * 
+     *
      * @param collapsingAllowed
      *            specifies whether column collapsing is allowed.
      */
@@ -1400,7 +1400,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * {@link #setColumnCollapsed(Object, boolean) setColumnCollapsed()}) if
      * {@link #isColumnCollapsingAllowed()} is true. By default all columns are
      * collapsible.
-     * 
+     *
      * @param propertyId
      *            the propertyID identifying the column.
      * @param collapsible
@@ -1422,7 +1422,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * UI or with {@link #setColumnCollapsed(Object, boolean)
      * setColumnCollapsed()}) if {@link #isColumnCollapsingAllowed()} is also
      * true.
-     * 
+     *
      * @return true if the column can be collapsed; false otherwise.
      */
     public boolean isColumnCollapsible(Object propertyId) {
@@ -1431,7 +1431,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if column reordering is allowed.
-     * 
+     *
      * @return true if columns can be reordered; false otherwise.
      */
     public boolean isColumnReorderingAllowed() {
@@ -1440,7 +1440,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets whether column reordering is allowed or not.
-     * 
+     *
      * @param columnReorderingAllowed
      *            specifies whether column reordering is allowed.
      */
@@ -1484,7 +1484,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Getter for property currentPageFirstItem.
-     * 
+     *
      * @return the Value of property currentPageFirstItem.
      */
     public int getCurrentPageFirstItemIndex() {
@@ -1617,7 +1617,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Setter for property currentPageFirstItem.
-     * 
+     *
      * @param newIndex
      *            the New value of property currentPageFirstItem.
      */
@@ -1627,12 +1627,12 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Returns whether table is selectable.
-     * 
+     *
      * <p>
      * The table is not selectable until it's explicitly set as selectable or at
      * least one {@link ValueChangeListener} is added.
      * </p>
-     * 
+     *
      * @return whether table is selectable.
      */
     public boolean isSelectable() {
@@ -1644,13 +1644,13 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Setter for property selectable.
-     * 
+     *
      * <p>
      * The table is not selectable until it's explicitly set as selectable via
      * this method or alternatively at least one {@link ValueChangeListener} is
      * added.
      * </p>
-     * 
+     *
      * @param selectable
      *            the New value of property selectable.
      */
@@ -1663,7 +1663,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Getter for property columnHeaderMode.
-     * 
+     *
      * @return the Value of property columnHeaderMode.
      */
     public ColumnHeaderMode getColumnHeaderMode() {
@@ -1672,7 +1672,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Setter for property columnHeaderMode.
-     * 
+     *
      * @param columnHeaderMode
      *            the New value of property columnHeaderMode.
      */
@@ -1781,7 +1781,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * occurred exception is set as the cause of this exception. All occurred
      * exceptions can be accessed using {@link #getCauses()}.
      * </p>
-     * 
+     *
      */
     public static class CacheUpdateException extends RuntimeException {
         private Throwable[] causes;
@@ -1805,7 +1805,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Returns the cause(s) for this exception
-         * 
+         *
          * @return the exception(s) which caused this exception
          */
         public Throwable[] getCauses() {
@@ -1862,11 +1862,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Requests that the Table should be repainted as soon as possible.
-     * 
+     *
      * Note that a {@code Table} does not necessarily repaint its contents when
      * this method has been called. See {@link #refreshRowCache()} for forcing
      * an update of the contents.
-     * 
+     *
      * @deprecated As of 7.0, use {@link #markAsDirty()} instead
      */
 
@@ -1878,7 +1878,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Requests that the Table should be repainted as soon as possible.
-     * 
+     *
      * Note that a {@code Table} does not necessarily repaint its contents when
      * this method has been called. See {@link #refreshRowCache()} for forcing
      * an update of the contents.
@@ -2167,9 +2167,9 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Render rows with index "firstIndex" to "firstIndex+rows-1" to a new
      * buffer.
-     * 
+     *
      * Reuses values from the current page buffer if the rows are found there.
-     * 
+     *
      * @param firstIndex
      * @param rows
      * @param replaceListeners
@@ -2282,7 +2282,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Update a cache array for a row, register any relevant listeners etc.
-     * 
+     *
      * This is an internal method extracted from
      * {@link #getVisibleCellsNoCache(int, int, boolean)} and should be removed
      * when the Table is rewritten.
@@ -2499,7 +2499,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Helper method to remove listeners and maintain correct component
      * hierarchy. Detaches properties and components if those are no more
      * rendered in client.
-     * 
+     *
      * @param oldListenedProperties
      *            set of properties that where listened in last render
      * @param oldVisibleComponents
@@ -2535,12 +2535,12 @@ public class Table extends AbstractSelect implements Action.Container,
      * if it is a field, it needs to be detached from its property data source
      * in order to allow garbage collection to take care of removing the unused
      * component from memory.
-     * 
+     *
      * Override this method and getPropertyValue(Object, Object, Property) with
      * custom logic if you need to deal with buffered fields.
-     * 
+     *
      * @see #getPropertyValue(Object, Object, Property)
-     * 
+     *
      * @param component
      *            component that should be unregistered.
      */
@@ -2588,7 +2588,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * </ul>
      * The default value is {@link #ROW_HEADER_MODE_HIDDEN}
      * </p>
-     * 
+     *
      * @param mode
      *            the One of the modes listed above.
      */
@@ -2607,7 +2607,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the row header mode.
-     * 
+     *
      * @return the Row header mode.
      * @see #setRowHeaderMode
      */
@@ -2618,7 +2618,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds the new row to table and fill the visible cells (except generated
      * columns) with given values.
-     * 
+     *
      * @param cells
      *            the Object array that is used for filling the visible cells
      *            new row. The types must be settable to visible column property
@@ -2687,7 +2687,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * <p>
      * <i>Note that calling this method is not cheap so avoid calling it
      * unnecessarily.</i>
-     * 
+     *
      * @since 6.7.2
      */
     public void refreshRowCache() {
@@ -2708,7 +2708,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Keeps propertyValueConverters if the corresponding id exists in the new
      * data source and is of a compatible type.
      * </p>
-     * 
+     *
      * @param newDataSource
      *            the new data source.
      */
@@ -2747,11 +2747,11 @@ public class Table extends AbstractSelect implements Action.Container,
      * Keeps propertyValueConverters if the corresponding id exists in the new
      * data source and is of a compatible type.
      * </p>
-     * 
+     *
      * @see Table#setContainerDataSource(Container)
      * @see Table#setVisibleColumns(Object[])
      * @see Table#setConverter(Object, Converter<String, ?>)
-     * 
+     *
      * @param newDataSource
      *            the new data source.
      * @param visibleIds
@@ -2826,7 +2826,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if class b can be safely assigned to class a.
-     * 
+     *
      * @param a
      * @param b
      * @return
@@ -2840,7 +2840,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets items ids from a range of key values
-     * 
+     *
      * @param itemId
      *            The start key
      * @param length
@@ -2861,7 +2861,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Handles selection if selection is a multiselection
-     * 
+     *
      * @param variables
      *            The variables
      */
@@ -2940,7 +2940,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Invoked when the value of a variable has changed.
-     * 
+     *
      * @see com.vaadin.ui.Select#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
@@ -3141,7 +3141,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Handles click event
-     * 
+     *
      * @param variables
      */
     private void handleClickEvent(Map<String, Object> variables) {
@@ -3195,7 +3195,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Handles the column resize event sent by the client.
-     * 
+     *
      * @param variables
      */
     private void handleColumnResizeEvent(Map<String, Object> variables) {
@@ -3258,7 +3258,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Go to mode where content updates are not done. This is due we want to
      * bypass expensive content for some reason (like when we know we may have
      * other content changes on their way).
-     * 
+     *
      * @return true if content refresh flag was enabled prior this call
      */
     protected boolean disableContentRefreshing() {
@@ -3269,7 +3269,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Go to mode where content content refreshing has effect.
-     * 
+     *
      * @param refreshContent
      *            true if content refresh needs to be done
      */
@@ -3293,7 +3293,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractSelect#paintContent(com.vaadin.
      * terminal.PaintTarget)
      */
@@ -3470,7 +3470,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Subclass and override this to enable partial row updates and additions,
      * which bypass the normal caching mechanism. This is useful for e.g.
      * TreeTable.
-     * 
+     *
      * @return true if this update is a partial row update, false if not. For
      *         plain Table it is always false.
      */
@@ -3482,7 +3482,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Subclass and override this to enable partial row additions, bypassing the
      * normal caching mechanism. This is useful for e.g. TreeTable, where
      * expanding a node should only fetch and add the items inside of that node.
-     * 
+     *
      * @return The index of the first added item. For plain Table it is always
      *         0.
      */
@@ -3494,7 +3494,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Subclass and override this to enable partial row additions, bypassing the
      * normal caching mechanism. This is useful for e.g. TreeTable, where
      * expanding a node should only fetch and add the items inside of that node.
-     * 
+     *
      * @return the number of rows to be added, starting at the index returned by
      *         {@link #getFirstAddedItemIndex()}. For plain Table it is always
      *         0.
@@ -3507,11 +3507,11 @@ public class Table extends AbstractSelect implements Action.Container,
      * Subclass and override this to enable removing of rows, bypassing the
      * normal caching and lazy loading mechanism. This is useful for e.g.
      * TreeTable, when you need to hide certain rows as a node is collapsed.
-     * 
+     *
      * This should return true if the rows pointed to by
      * {@link #getFirstAddedItemIndex()} and {@link #getAddedRowCount()} should
      * be hidden instead of added.
-     * 
+     *
      * @return whether the rows to add (see {@link #getFirstAddedItemIndex()}
      *         and {@link #getAddedRowCount()}) should be added or hidden. For
      *         plain Table it is always false.
@@ -3525,7 +3525,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * normal caching and lazy loading mechanism. This is useful for updating
      * the state of certain rows, e.g. in the TreeTable the collapsed state of a
      * single node is updated using this mechanism.
-     * 
+     *
      * @return the index of the first item to be updated. For plain Table it is
      *         always 0.
      */
@@ -3538,7 +3538,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * normal caching and lazy loading mechanism. This is useful for updating
      * the state of certain rows, e.g. in the TreeTable the collapsed state of a
      * single node is updated using this mechanism.
-     * 
+     *
      * @return the number of rows to update, starting at the index returned by
      *         {@link #getFirstUpdatedItemIndex()}. For plain table it is always
      *         0.
@@ -3899,7 +3899,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks whether row headers are visible.
-     * 
+     *
      * @return {@code false} if row headers are hidden, {@code true} otherwise
      * @since 7.3.9
      */
@@ -4065,7 +4065,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * A method where extended Table implementations may add their custom
      * attributes for rows.
-     * 
+     *
      * @param target
      * @param itemId
      */
@@ -4076,7 +4076,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the cached visible table contents.
-     * 
+     *
      * @return the cached visible table contents.
      */
     private Object[][] getVisibleCells() {
@@ -4088,11 +4088,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the value of property.
-     * 
+     *
      * By default if the table is editable the fieldFactory is used to create
      * editors for table cells. Otherwise formatPropertyValue is used to format
      * the value representation.
-     * 
+     *
      * @param rowId
      *            the Id of the row (same as item Id).
      * @param colId
@@ -4124,7 +4124,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * default behavior is to bind property straight to LegacyField. If
      * Property.Viewer type property (e.g. PropertyFormatter) is already set for
      * field, the property is bound to that Property.Viewer.
-     * 
+     *
      * @param rowId
      * @param colId
      * @param property
@@ -4149,7 +4149,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Formats table cell property values. By default the property.toString()
      * and return a empty string for null properties.
-     * 
+     *
      * @param rowId
      *            the Id of the row (same as item Id).
      * @param colId
@@ -4184,7 +4184,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Registers a new action handler for this container
-     * 
+     *
      * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler)
      */
 
@@ -4212,7 +4212,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes a previously registered action handler for the contents of this
      * container.
-     * 
+     *
      * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
 
@@ -4251,9 +4251,9 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Notifies this listener that the Property's value has changed.
-     * 
+     *
      * Also listens changes in rendered items to refresh content area.
-     * 
+     *
      * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
 
@@ -4284,7 +4284,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Notifies the component that it is connected to an application.
-     * 
+     *
      * @see com.vaadin.ui.Component#attach()
      */
 
@@ -4297,7 +4297,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Notifies the component that it is detached from the application
-     * 
+     *
      * @see com.vaadin.ui.Component#detach()
      */
 
@@ -4308,7 +4308,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes all Items from the Container.
-     * 
+     *
      * @see com.vaadin.data.Container#removeAllItems()
      */
 
@@ -4321,7 +4321,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes the Item identified by <code>ItemId</code> from the Container.
-     * 
+     *
      * @see com.vaadin.data.Container#removeItem(Object)
      */
 
@@ -4341,7 +4341,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a Property specified by the given Property ID from the Container.
-     * 
+     *
      * @see com.vaadin.data.Container#removeContainerProperty(Object)
      */
 
@@ -4363,7 +4363,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Adds a new property to the table and show it as a visible column.
-     * 
+     *
      * @param propertyId
      *            the Id of the property.
      * @param type
@@ -4398,7 +4398,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Adds a new property to the table and show it as a visible column.
-     * 
+     *
      * @param propertyId
      *            the Id of the property
      * @param type
@@ -4454,7 +4454,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Also note that getVisibleColumns() will return the generated columns,
      * while getContainerPropertyIds() will not.
      * </p>
-     * 
+     *
      * @param id
      *            the id of the column to be added
      * @param generatedColumn
@@ -4483,7 +4483,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Returns the ColumnGenerator used to generate the given column.
-     * 
+     *
      * @param columnId
      *            The id of the generated column
      * @return The ColumnGenerator used for the given columnId or null.
@@ -4495,7 +4495,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a generated column previously added with addGeneratedColumn.
-     * 
+     *
      * @param columnId
      *            id of the generated column to remove
      * @return true if the column could be removed (existed in the Table)
@@ -4526,7 +4526,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * architecture. Using {@link #getCurrentPageFirstItemId()} combined with
      * {@link #getPageLength()} may produce good enough estimates in some
      * situations.
-     * 
+     *
      * @see com.vaadin.ui.Select#getVisibleItemIds()
      */
 
@@ -4550,7 +4550,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Container datasource item set change. Table must flush its buffers on
      * change.
-     * 
+     *
      * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
      */
 
@@ -4575,7 +4575,7 @@ public class Table extends AbstractSelect implements Action.Container,
                 currentFirstItemIndex = repairOnReAddAllRowsDataScrollPositionItemIndex;
                 /*
                  * Reset repairOnReAddAllRowsDataScrollPositionItemIndex.
-                 * 
+                 *
                  * Next string should be commented (removed) if we want to have
                  * possibility to restore scroll position during adding items to
                  * container one by one via add() but not only addAll(). The
@@ -4596,7 +4596,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Container datasource property set change. Table must flush its buffers on
      * change.
-     * 
+     *
      * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
      */
 
@@ -4642,7 +4642,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Adding new items is not supported.
-     * 
+     *
      * @throws UnsupportedOperationException
      *             if set to true.
      * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
@@ -4658,7 +4658,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the ID of the Item following the Item that corresponds to itemId.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
 
@@ -4670,7 +4670,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the Item preceding the Item that corresponds to the
      * itemId.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
 
@@ -4681,7 +4681,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the ID of the first Item in the Container.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
 
@@ -4692,7 +4692,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the ID of the last Item in the Container.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
 
@@ -4704,7 +4704,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Tests if the Item corresponding to the given Item ID is the first Item in
      * the Container.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
 
@@ -4716,7 +4716,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Tests if the Item corresponding to the given Item ID is the last Item in
      * the Container.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
 
@@ -4727,7 +4727,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Adds new item after the given item.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
 
@@ -4744,7 +4744,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Adds new item after the given item.
-     * 
+     *
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
@@ -4762,10 +4762,10 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the TableFieldFactory that is used to create editor for table cells.
-     * 
+     *
      * The TableFieldFactory is only used if the Table is editable. By default
      * the DefaultFieldFactory is used.
-     * 
+     *
      * @param fieldFactory
      *            the field factory to set.
      * @see #isEditable
@@ -4780,9 +4780,9 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the TableFieldFactory that is used to create editor for table cells.
-     * 
+     *
      * The FieldFactory is only used if the Table is editable.
-     * 
+     *
      * @return TableFieldFactory used to create the LegacyField instances.
      * @see #isEditable
      */
@@ -4792,18 +4792,18 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Is table editable.
-     * 
+     *
      * If table is editable a editor of type LegacyField is created for each
      * table cell. The assigned FieldFactory is used to create the instances.
-     * 
+     *
      * To provide custom editors for table cells create a class implementing the
      * FieldFactory interface, and assign it to table, and set the editable
      * property to true.
-     * 
+     *
      * @return true if table is editable, false otherwise.
      * @see LegacyField
      * @see FieldFactory
-     * 
+     *
      */
     public boolean isEditable() {
         return editable;
@@ -4811,19 +4811,19 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the editable property.
-     * 
+     *
      * If table is editable a editor of type LegacyField is created for each
      * table cell. The assigned FieldFactory is used to create the instances.
-     * 
+     *
      * To provide custom editors for table cells create a class implementing the
      * FieldFactory interface, and assign it to table, and set the editable
      * property to true.
-     * 
+     *
      * @param editable
      *            true if table should be editable by user.
      * @see LegacyField
      * @see FieldFactory
-     * 
+     *
      */
     public void setEditable(boolean editable) {
         this.editable = editable;
@@ -4834,13 +4834,13 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sorts the table.
-     * 
+     *
      * @throws UnsupportedOperationException
      *             if the container data source does not implement
      *             Container.Sortable
      * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
-     * 
+     *
      */
 
     @Override
@@ -4872,7 +4872,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sorts the table by currently selected sorting column.
-     * 
+     *
      * @throws UnsupportedOperationException
      *             if the container data source does not implement
      *             Container.Sortable
@@ -4892,7 +4892,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * returns. Disabling sorting causes this method to always return an empty
      * collection.
      * </p>
-     * 
+     *
      * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
 
@@ -4908,7 +4908,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the currently sorted column property ID.
-     * 
+     *
      * @return the Container property id of the currently sorted column.
      */
     public Object getSortContainerPropertyId() {
@@ -4917,7 +4917,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the currently sorted column property id.
-     * 
+     *
      * @param propertyId
      *            the Container property id of the currently sorted column.
      */
@@ -4928,7 +4928,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Internal method to set currently sorted column property id. With doSort
      * flag actual sorting may be bypassed.
-     * 
+     *
      * @param propertyId
      * @param doSort
      */
@@ -4949,7 +4949,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Is the table currently sorted in ascending order.
-     * 
+     *
      * @return <code>true</code> if ascending, <code>false</code> if descending.
      */
     public boolean isSortAscending() {
@@ -4958,7 +4958,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Sets the table in ascending order.
-     * 
+     *
      * @param ascending
      *            <code>true</code> if ascending, <code>false</code> if
      *            descending.
@@ -4970,7 +4970,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Internal method to set sort ascending. With doSort flag actual sort can
      * be bypassed.
-     * 
+     *
      * @param ascending
      * @param doSort
      */
@@ -4988,10 +4988,10 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Is sorting disabled altogether.
-     * 
+     *
      * True iff no sortable columns are given even in the case where data source
      * would support this.
-     * 
+     *
      * @return True iff sorting is disabled.
      * @deprecated As of 7.0, use {@link #isSortEnabled()} instead
      */
@@ -5002,7 +5002,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if sorting is enabled.
-     * 
+     *
      * @return true if sorting by the user is allowed, false otherwise
      */
     public boolean isSortEnabled() {
@@ -5011,7 +5011,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Disables the sorting by the user altogether.
-     * 
+     *
      * @param sortDisabled
      *            True iff sorting is disabled.
      * @deprecated As of 7.0, use {@link #setSortEnabled(boolean)} instead
@@ -5027,7 +5027,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Setting this to false disallows sorting by the user. It is still possible
      * to call {@link #sort()}.
      * </p>
-     * 
+     *
      * @param sortEnabled
      *            true to allow the user to sort the table, false to disallow it
      */
@@ -5042,14 +5042,14 @@ public class Table extends AbstractSelect implements Action.Container,
      * Used to create "generated columns"; columns that exist only in the Table,
      * not in the underlying Container. Implement this interface and pass it to
      * Table.addGeneratedColumn along with an id for the column to be generated.
-     * 
+     *
      */
     public interface ColumnGenerator extends Serializable {
 
         /**
          * Called by Table when a cell in a generated column needs to be
          * generated.
-         * 
+         *
          * @param source
          *            the source Table
          * @param itemId
@@ -5067,7 +5067,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Set cell style generator for Table.
-     * 
+     *
      * @param cellStyleGenerator
      *            New cell style generator or null to remove generator.
      */
@@ -5081,7 +5081,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Get the current cell style generator.
-     * 
+     *
      */
     public CellStyleGenerator getCellStyleGenerator() {
         return cellStyleGenerator;
@@ -5098,7 +5098,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Called by Table when a cell (and row) is painted.
-         * 
+         *
          * @param source
          *            the source Table
          * @param itemId
@@ -5161,7 +5161,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Sets the drag start mode of the Table. Drag start mode controls how Table
      * behaves as a drag source.
-     * 
+     *
      * @param newDragMode
      */
     public void setDragMode(TableDragMode newDragMode) {
@@ -5180,9 +5180,9 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Concrete implementation of {@link DataBoundTransferable} for data
      * transferred from a table.
-     * 
+     *
      * @see {@link DataBoundTransferable}.
-     * 
+     *
      * @since 6.3
      */
     public class TableTransferable extends DataBoundTransferable {
@@ -5244,7 +5244,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Note, that on some clients the mode may not be respected. E.g. on touch
      * based devices CTRL/SHIFT base selection method is invalid, so touch based
      * browsers always use the {@link MultiSelectMode#SIMPLE}.
-     * 
+     *
      * @param mode
      *            The select mode of the table
      */
@@ -5255,7 +5255,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Returns the select mode in which multi-select is used.
-     * 
+     *
      * @return The multi select mode
      */
     public MultiSelectMode getMultiSelectMode() {
@@ -5267,7 +5267,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * from server once per drag and drop operation. Developer must override one
      * method that decides on which rows the currently dragged data can be
      * dropped.
-     * 
+     *
      * <p>
      * Initially pretty much no data is sent to client. On first required
      * criterion check (per drag request) the client side data structure is
@@ -5283,7 +5283,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptcriteria.ServerSideCriterion#getIdentifier
          * ()
@@ -5296,7 +5296,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#accepts(com.vaadin
          * .event.dd.DragAndDropEvent)
@@ -5316,7 +5316,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse(
          * com.vaadin.server.PaintTarget)
@@ -5385,7 +5385,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Gets the property id of the column which header was pressed
-         * 
+         *
          * @return The column property id
          */
         public Object getPropertyId() {
@@ -5419,7 +5419,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Constructor
-         * 
+         *
          * @param source
          *            The source of the component
          * @param propertyId
@@ -5435,7 +5435,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Gets the property id of the column which header was pressed
-         * 
+         *
          * @return The column property id
          */
         public Object getPropertyId() {
@@ -5451,7 +5451,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Called when a user clicks a header column cell
-         * 
+         *
          * @param event
          *            The event which contains information about the column and
          *            the mouse click event
@@ -5467,7 +5467,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Called when a user clicks a footer column cell
-         * 
+         *
          * @param event
          *            The event which contains information about the column and
          *            the mouse click event
@@ -5482,7 +5482,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * The listener will receive events which contain information about which
      * column was clicked and some details about the mouse event.
      * </p>
-     * 
+     *
      * @param listener
      *            The handler which should handle the header click events.
      */
@@ -5503,7 +5503,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a header click listener
-     * 
+     *
      * @param listener
      *            The listener to remove.
      */
@@ -5528,7 +5528,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * The listener will receive events which contain information about which
      * column was clicked and some details about the mouse event.
      * </p>
-     * 
+     *
      * @param listener
      *            The handler which should handle the footer click events.
      */
@@ -5549,7 +5549,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a footer click listener
-     * 
+     *
      * @param listener
      *            The listener to remove.
      */
@@ -5569,7 +5569,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Gets the footer caption beneath the rows
-     * 
+     *
      * @param propertyId
      *            The propertyId of the column *
      * @return The caption of the footer or NULL if not set
@@ -5581,10 +5581,10 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Sets the column footer caption. The column footer caption is the text
      * displayed beneath the column if footers have been set visible.
-     * 
+     *
      * @param propertyId
      *            The properyId of the column
-     * 
+     *
      * @param footer
      *            The caption of the footer
      */
@@ -5604,7 +5604,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * The footer can be used to add column related data like sums to the bottom
      * of the Table using setColumnFooter(Object propertyId, String footer).
      * </p>
-     * 
+     *
      * @param visible
      *            Should the footer be visible
      */
@@ -5617,7 +5617,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Is the footer currently visible?
-     * 
+     *
      * @return Returns true if visible else false
      */
     public boolean isFooterVisible() {
@@ -5649,7 +5649,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Constructor
-         * 
+         *
          * @param source
          *            The source of the event
          * @param propertyId
@@ -5669,7 +5669,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Get the column property id of the column that was resized.
-         * 
+         *
          * @return The column property id
          */
         public Object getPropertyId() {
@@ -5678,7 +5678,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Get the width in pixels of the column before the resize event
-         * 
+         *
          * @return Width in pixels
          */
         public int getPreviousWidth() {
@@ -5687,7 +5687,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Get the width in pixels of the column after the resize event
-         * 
+         *
          * @return Width in pixels
          */
         public int getCurrentWidth() {
@@ -5702,7 +5702,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * This method is triggered when the column has been resized
-         * 
+         *
          * @param event
          *            The event which contains the column property id, the
          *            previous width of the column and the current width of the
@@ -5714,7 +5714,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds a column resize listener to the Table. A column resize listener is
      * called when a user resizes a columns width.
-     * 
+     *
      * @param listener
      *            The listener to attach to the Table
      */
@@ -5735,7 +5735,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a column resize listener from the Table.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
@@ -5772,7 +5772,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Constructor
-         * 
+         *
          * @param source
          *            The source of the event
          */
@@ -5789,7 +5789,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * This method is triggered when the column has been reordered
-         * 
+         *
          * @param event
          */
         public void columnReorder(ColumnReorderEvent event);
@@ -5797,7 +5797,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * This event is fired when the collapse state of a column changes.
-     * 
+     *
      * @since 7.6
      */
     public static class ColumnCollapseEvent extends Component.Event {
@@ -5809,7 +5809,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Constructor
-         * 
+         *
          * @param source
          *            The source of the event
          * @param propertyId
@@ -5822,7 +5822,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Gets the id of the column whose collapse state changed
-         * 
+         *
          * @return the property id of the column
          */
         public Object getPropertyId() {
@@ -5832,7 +5832,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Interface for listening to column collapse events.
-     * 
+     *
      * @since 7.6
      */
     public interface ColumnCollapseListener extends Serializable {
@@ -5840,7 +5840,7 @@ public class Table extends AbstractSelect implements Action.Container,
         /**
          * This method is triggered when the collapse state for a column has
          * changed
-         * 
+         *
          * @param event
          */
         public void columnCollapseStateChange(ColumnCollapseEvent event);
@@ -5849,7 +5849,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds a column reorder listener to the Table. A column reorder listener is
      * called when a user reorders columns.
-     * 
+     *
      * @param listener
      *            The listener to attach to the Table
      */
@@ -5869,7 +5869,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Removes a column reorder listener from the Table.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
@@ -5890,9 +5890,9 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds a column collapse listener to the Table. A column collapse listener
      * is called when the collapsed state of a column changes.
-     * 
+     *
      * @since 7.6
-     * 
+     *
      * @param listener
      *            The listener to attach
      */
@@ -5917,7 +5917,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Set the item description generator which generates tooltips for cells and
      * rows in the Table
-     * 
+     *
      * @param generator
      *            The generator to use or null to disable
      */
@@ -5943,7 +5943,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Row generators can be used to replace certain items in a table with a
      * generated string. The generator is called each time the table is
      * rendered, which means that new strings can be generated each time.
-     * 
+     *
      * Row generators can be used for e.g. summary rows or grouping of items.
      */
     public interface RowGenerator extends Serializable {
@@ -5969,7 +5969,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * For custom styling of a generated row you can combine a RowGenerator
          * with a CellStyleGenerator.
          * <p>
-         * 
+         *
          * @param table
          *            The Table that is being painted
          * @param itemId
@@ -5988,7 +5988,7 @@ public class Table extends AbstractSelect implements Action.Container,
         /**
          * Creates a new generated row. If only one string is passed in, columns
          * are automatically spanned.
-         * 
+         *
          * @param text
          */
         public GeneratedRow(String... text) {
@@ -6023,7 +6023,7 @@ public class Table extends AbstractSelect implements Action.Container,
         /**
          * If set to true, all strings passed to {@link #setText(String...)}
          * will be rendered as HTML.
-         * 
+         *
          * @param htmlContentAllowed
          */
         public void setHtmlContentAllowed(boolean htmlContentAllowed) {
@@ -6037,7 +6037,7 @@ public class Table extends AbstractSelect implements Action.Container,
         /**
          * If set to true, only one string will be rendered, spanning the entire
          * row.
-         * 
+         *
          * @param spanColumns
          */
         public void setSpanColumns(boolean spanColumns) {
@@ -6048,7 +6048,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Assigns a row generator to the table. The row generator will be able to
      * replace rows in the table when it is rendered.
-     * 
+     *
      * @param generator
      *            the new row generator
      */
@@ -6070,7 +6070,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * The converter is used to format the the data for the given property id
      * before displaying it in the table.
      * </p>
-     * 
+     *
      * @param propertyId
      *            The propertyId to format using the converter
      * @param converter
@@ -6096,7 +6096,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Checks if there is a converter set explicitly for the given property id.
-     * 
+     *
      * @param propertyId
      *            The propertyId to check
      * @return true if a converter has been set for the property id, false
@@ -6108,7 +6108,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     /**
      * Returns the converter used to format the given propertyId.
-     * 
+     *
      * @param propertyId
      *            The propertyId to check
      * @return The converter used to format the propertyId or null if no
@@ -6441,7 +6441,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Returns the item id of context clicked row.
-         * 
+         *
          * @return item id of clicked row; <code>null</code> if header, footer
          *         or empty area of Table
          */
@@ -6451,7 +6451,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Returns the property id of context clicked column.
-         * 
+         *
          * @return property id; or <code>null</code> if we've clicked on the
          *         empty area of the Table
          */
@@ -6461,7 +6461,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
         /**
          * Returns the clicked section of Table.
-         * 
+         *
          * @return section of Table
          */
         public Section getSection() {
@@ -6509,8 +6509,8 @@ public class Table extends AbstractSelect implements Action.Container,
      * Sets whether only collapsible columns should be shown to the user in the
      * column collapse menu. The default is
      * {@link CollapseMenuContent#ALL_COLUMNS}.
-     * 
-     * 
+     *
+     *
      * @since 7.6
      * @param content
      *            the desired collapsible menu content setting
@@ -6523,7 +6523,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Checks whether only collapsible columns are shown to the user in the
      * column collapse menu. The default is
      * {@link CollapseMenuContent#ALL_COLUMNS} .
-     * 
+     *
      * @since 7.6
      * @return the current collapsible menu content setting
      */
diff --git a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java
index 3c955746fe..4e7606c9f2 100644
--- a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java
+++ b/server/src/main/java/com/vaadin/ui/TableFieldFactory.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,9 +26,9 @@ import com.vaadin.legacy.ui.LegacyField;
  * for displaying fields). Currently this interface is used by {@link Table},
  * but might later be used by some other components for {@link LegacyField}
  * generation.
- * 
+ *
  * <p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 6.0
  * @see FormFieldFactory
@@ -38,7 +38,7 @@ public interface TableFieldFactory extends Serializable {
      * Creates a field based on the Container, item id, property id and the
      * component responsible for displaying the field (most commonly
      * {@link Table}).
-     * 
+     *
      * @param container
      *            the Container where the property belongs to.
      * @param itemId
diff --git a/server/src/main/java/com/vaadin/ui/TextArea.java b/server/src/main/java/com/vaadin/ui/TextArea.java
index 60ae1239d0..c744213128 100644
--- a/server/src/main/java/com/vaadin/ui/TextArea.java
+++ b/server/src/main/java/com/vaadin/ui/TextArea.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
@@ -38,7 +38,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Constructs an empty TextArea with given caption.
-     * 
+     *
      * @param caption
      *            the caption for the field.
      */
@@ -49,7 +49,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Constructs a TextArea with given property data source.
-     * 
+     *
      * @param dataSource
      *            the data source for the field
      */
@@ -60,7 +60,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Constructs a TextArea with given caption and property data source.
-     * 
+     *
      * @param caption
      *            the caption for the field
      * @param dataSource
@@ -73,7 +73,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Constructs a TextArea with given caption and value.
-     * 
+     *
      * @param caption
      *            the caption for the field
      * @param value
@@ -97,7 +97,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Sets the number of rows in the text area.
-     * 
+     *
      * @param rows
      *            the number of rows for this text area.
      */
@@ -110,7 +110,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Gets the number of rows in the text area.
-     * 
+     *
      * @return number of explicitly set rows.
      */
     public int getRows() {
@@ -119,7 +119,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Sets the text area's word-wrap mode on or off.
-     * 
+     *
      * @param wordwrap
      *            the boolean value specifying if the text area should be in
      *            word-wrap mode.
@@ -130,7 +130,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /**
      * Tests if the text area is in word-wrap mode.
-     * 
+     *
      * @return <code>true</code> if the component is in word-wrap mode,
      *         <code>false</code> if not.
      */
@@ -140,7 +140,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractField#readDesign(org.jsoup.nodes.Element ,
      * com.vaadin.ui.declarative.DesignContext)
      */
@@ -153,7 +153,7 @@ public class TextArea extends LegacyAbstractTextField {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractTextField#writeDesign(org.jsoup.nodes.Element
      * , com.vaadin.ui.declarative.DesignContext)
      */
diff --git a/server/src/main/java/com/vaadin/ui/TextField.java b/server/src/main/java/com/vaadin/ui/TextField.java
index af4fcf24d1..f8aaf1e8fc 100644
--- a/server/src/main/java/com/vaadin/ui/TextField.java
+++ b/server/src/main/java/com/vaadin/ui/TextField.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.ui.declarative.DesignContext;
 /**
  * A component for editing textual data that fits on a single line. For a
  * multi-line textarea, see the {@link TextArea} component.
- * 
+ *
  * @author Vaadin Ltd.
  */
 @SuppressWarnings("serial")
@@ -41,7 +41,7 @@ public class TextField extends AbstractTextField {
 
     /**
      * Constructs an empty <code>TextField</code> with given caption.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      */
@@ -56,7 +56,7 @@ public class TextField extends AbstractTextField {
      * to a Property unless
      * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
-     * 
+     *
      * @param caption
      *            the caption <code>String</code> for the editor.
      * @param value
diff --git a/server/src/main/java/com/vaadin/ui/TooltipConfiguration.java b/server/src/main/java/com/vaadin/ui/TooltipConfiguration.java
index ecb8ac7534..968940f702 100644
--- a/server/src/main/java/com/vaadin/ui/TooltipConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/TooltipConfiguration.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
@@ -21,7 +21,7 @@ import com.vaadin.shared.ui.ui.UIState.TooltipConfigurationState;
 
 /**
  * Provides method for configuring the tooltip.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
@@ -30,7 +30,7 @@ public interface TooltipConfiguration extends Serializable {
      * Returns the time (in ms) the tooltip should be displayed after an event
      * that will cause it to be closed (e.g. mouse click outside the component,
      * key down).
-     * 
+     *
      * @return The close timeout
      */
     public int getCloseTimeout();
@@ -39,7 +39,7 @@ public interface TooltipConfiguration extends Serializable {
      * Sets the time (in ms) the tooltip should be displayed after an event that
      * will cause it to be closed (e.g. mouse click outside the component, key
      * down).
-     * 
+     *
      * @param closeTimeout
      *            The close timeout
      */
@@ -50,7 +50,7 @@ public interface TooltipConfiguration extends Serializable {
      * be used instead of {@link #getOpenDelay()}. The quick open delay is used
      * when the tooltip has very recently been shown, is currently hidden but
      * about to be shown again.
-     * 
+     *
      * @return The quick open timeout
      */
     public int getQuickOpenTimeout();
@@ -60,7 +60,7 @@ public interface TooltipConfiguration extends Serializable {
      * should be used instead of {@link #getOpenDelay()}. The quick open delay
      * is used when the tooltip has very recently been shown, is currently
      * hidden but about to be shown again.
-     * 
+     *
      * @param quickOpenTimeout
      *            The quick open timeout
      */
@@ -70,7 +70,7 @@ public interface TooltipConfiguration extends Serializable {
      * Returns the time (in ms) that should elapse before a tooltip will be
      * shown, in the situation when a tooltip has very recently been shown
      * (within {@link #getQuickOpenDelay()} ms).
-     * 
+     *
      * @return The quick open delay
      */
     public int getQuickOpenDelay();
@@ -79,7 +79,7 @@ public interface TooltipConfiguration extends Serializable {
      * Sets the time (in ms) that should elapse before a tooltip will be shown,
      * in the situation when a tooltip has very recently been shown (within
      * {@link #getQuickOpenDelay()} ms).
-     * 
+     *
      * @param quickOpenDelay
      *            The quick open delay
      */
@@ -90,7 +90,7 @@ public interface TooltipConfiguration extends Serializable {
      * tooltip showing has occurred (e.g. mouse over) before the tooltip is
      * shown. If a tooltip has recently been shown, then
      * {@link #getQuickOpenDelay()} is used instead of this.
-     * 
+     *
      * @return The open delay
      */
     public int getOpenDelay();
@@ -100,7 +100,7 @@ public interface TooltipConfiguration extends Serializable {
      * tooltip showing has occurred (e.g. mouse over) before the tooltip is
      * shown. If a tooltip has recently been shown, then
      * {@link #getQuickOpenDelay()} is used instead of this.
-     * 
+     *
      * @param openDelay
      *            The open delay
      */
@@ -108,14 +108,14 @@ public interface TooltipConfiguration extends Serializable {
 
     /**
      * Returns the maximum width of the tooltip popup.
-     * 
+     *
      * @return The maximum width the tooltip popup
      */
     public int getMaxWidth();
 
     /**
      * Sets the maximum width of the tooltip popup.
-     * 
+     *
      * @param maxWidth
      *            The maximum width the tooltip popup
      */
@@ -131,7 +131,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.UI.Tooltip#getCloseTimeout()
      */
     @Override
@@ -141,7 +141,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#setCloseTimeout(int)
      */
     @Override
@@ -151,7 +151,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#getQuickOpenTimeout()
      */
     @Override
@@ -161,7 +161,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#setQuickOpenTimeout(int)
      */
     @Override
@@ -171,7 +171,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#getQuickOpenDelay()
      */
     @Override
@@ -181,7 +181,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#setQuickOpenDelay(int)
      */
     @Override
@@ -191,7 +191,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#getOpenDelay()
      */
     @Override
@@ -201,7 +201,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#setOpenDelay(int)
      */
     @Override
@@ -211,7 +211,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#getMaxWidth()
      */
     @Override
@@ -221,7 +221,7 @@ class TooltipConfigurationImpl implements TooltipConfiguration {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Tooltip#setMaxWidth(int)
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java
index 844295d824..c56acff883 100644
--- a/server/src/main/java/com/vaadin/ui/Tree.java
+++ b/server/src/main/java/com/vaadin/ui/Tree.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
@@ -70,7 +70,7 @@ import com.vaadin.util.ReflectTools;
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
  * a hierarchical set of items.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -100,7 +100,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * Returns the item id of context clicked row.
-         * 
+         *
          * @return item id of clicked row; <code>null</code> if no row is
          *         present at the location
          */
@@ -200,7 +200,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Creates a new empty tree with caption.
-     * 
+     *
      * @param caption
      */
     public Tree(String caption) {
@@ -209,7 +209,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Creates a new tree with caption and connect it to a Container.
-     * 
+     *
      * @param caption
      * @param dataSource
      */
@@ -224,12 +224,12 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Sets the icon for an item.
-     * 
+     *
      * @param itemId
      *            the id of the item to be assigned an icon.
      * @param icon
      *            the icon to use or null.
-     * 
+     *
      * @param altText
      *            the alternative text for the icon
      */
@@ -250,9 +250,9 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Set the alternate text for an item.
-     * 
+     *
      * Used when the item has an icon.
-     * 
+     *
      * @param itemId
      *            the id of the item to be assigned an icon.
      * @param altText
@@ -270,7 +270,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Return the alternate text of an icon in a tree item.
-     * 
+     *
      * @param itemId
      *            Object with the ID of the item
      * @return String with the alternate text of the icon, or null when no icon
@@ -285,7 +285,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Check is an item is expanded
-     * 
+     *
      * @param itemId
      *            the item id.
      * @return true iff the item is expanded.
@@ -296,7 +296,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Expands an item.
-     * 
+     *
      * @param itemId
      *            the item id.
      * @return True iff the expand operation succeeded
@@ -309,7 +309,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Expands an item.
-     * 
+     *
      * @param itemId
      *            the item id.
      * @param sendChildTree
@@ -356,10 +356,10 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Expands the items recursively
-     * 
+     *
      * Expands all the children recursively starting from an item. Operation
      * succeeds only if all expandable items are expanded.
-     * 
+     *
      * @param startItemId
      * @return True iff the expand operation succeeded
      */
@@ -387,7 +387,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Collapses an item.
-     * 
+     *
      * @param itemId
      *            the item id.
      * @return True iff the collapse operation succeeded
@@ -409,10 +409,10 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Collapses the items recursively.
-     * 
+     *
      * Collapse all the children recursively starting from an item. Operation
      * succeeds only if all expandable items are collapsed.
-     * 
+     *
      * @param startItemId
      * @return True iff the collapse operation succeeded
      */
@@ -442,11 +442,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Returns the current selectable state. Selectable determines if the a node
      * can be selected on the client side. Selectable does not affect
      * {@link #setValue(Object)} or {@link #select(Object)}.
-     * 
+     *
      * <p>
      * The tree is selectable by default.
      * </p>
-     * 
+     *
      * @return the current selectable state.
      */
     public boolean isSelectable() {
@@ -457,11 +457,11 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Sets the selectable state. Selectable determines if the a node can be
      * selected on the client side. Selectable does not affect
      * {@link #setValue(Object)} or {@link #select(Object)}.
-     * 
+     *
      * <p>
      * The tree is selectable by default.
      * </p>
-     * 
+     *
      * @param selectable
      *            The new selectable state.
      */
@@ -474,7 +474,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Sets the behavior of the multiselect mode
-     * 
+     *
      * @param mode
      *            The mode to set
      */
@@ -488,7 +488,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Returns the mode the multiselect is in. The mode controls how
      * multiselection can be done.
-     * 
+     *
      * @return The mode
      */
     public MultiSelectMode getMultiselectMode() {
@@ -499,7 +499,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.AbstractSelect#changeVariables(java.lang.Object,
      * java.util.Map)
      */
@@ -586,7 +586,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Handles the selection
-     * 
+     *
      * @param variables
      *            The variables sent to the server from the client
      */
@@ -617,7 +617,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Paints any needed component-specific things to the given UIDL stream.
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#paintContent(PaintTarget)
      */
     @Override
@@ -856,7 +856,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Tests if the Item with given ID can have any children.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object)
      */
     @Override
@@ -866,7 +866,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Gets the IDs of all Items that are children of the specified Item.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#getChildren(Object)
      */
     @Override
@@ -876,7 +876,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Gets the ID of the parent Item of the specified Item.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#getParent(Object)
      */
     @Override
@@ -886,7 +886,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Tests if the Item specified with <code>itemId</code> has child Items.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object)
      */
     @Override
@@ -896,7 +896,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Tests if the Item specified with <code>itemId</code> is a root Item.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#isRoot(Object)
      */
     @Override
@@ -906,7 +906,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Gets the IDs of all Items in the container that don't have a parent.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#rootItemIds()
      */
     @Override
@@ -916,7 +916,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Sets the given Item's capability to have children.
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object,
      *      boolean)
      */
@@ -933,7 +933,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.data.Container.Hierarchical#setParent(java.lang.Object ,
      * java.lang.Object)
      */
@@ -951,7 +951,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Sets the Container that serves as the data source of the viewer.
-     * 
+     *
      * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
      */
     @Override
@@ -999,7 +999,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                  * by either adding or removing items to the container. To
                  * prevent a memory leak we should cleanup the expanded list
                  * from items which was removed.
-                 * 
+                 *
                  * However, there will still be a leak if the container is
                  * filtered to show only a subset of the items in the tree and
                  * later unfiltered items are removed from the container. In
@@ -1023,7 +1023,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Event to fired when a node is expanded. ExapandEvent is fired when a node
      * is to be expanded. it can me used to dynamically fill the sub-nodes of
      * the node.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -1033,7 +1033,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * New instance of options change event
-         * 
+         *
          * @param source
          *            the Source of the event.
          * @param expandedItemId
@@ -1045,7 +1045,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * Node where the event occurred.
-         * 
+         *
          * @return the Source of the event.
          */
         public Object getItemId() {
@@ -1055,7 +1055,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Expand event listener.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -1066,7 +1066,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * A node has been expanded.
-         * 
+         *
          * @param event
          *            the Expand event.
          */
@@ -1075,7 +1075,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Adds the expand listener.
-     * 
+     *
      * @param listener
      *            the Listener to be added.
      */
@@ -1094,7 +1094,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Removes the expand listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -1114,7 +1114,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Emits the expand event.
-     * 
+     *
      * @param itemId
      *            the item id.
      */
@@ -1126,7 +1126,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Collapse event
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -1136,7 +1136,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * New instance of options change event.
-         * 
+         *
          * @param source
          *            the Source of the event.
          * @param collapsedItemId
@@ -1148,7 +1148,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * Gets tge Collapsed Item id.
-         * 
+         *
          * @return the collapsed item id.
          */
         public Object getItemId() {
@@ -1158,7 +1158,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Collapse event listener.
-     * 
+     *
      * @author Vaadin Ltd.
      * @since 3.0
      */
@@ -1169,7 +1169,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * A node has been collapsed.
-         * 
+         *
          * @param event
          *            the Collapse event.
          */
@@ -1178,7 +1178,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Adds the collapse listener.
-     * 
+     *
      * @param listener
      *            the Listener to be added.
      */
@@ -1198,7 +1198,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Removes the collapse listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -1218,7 +1218,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Emits collapse event.
-     * 
+     *
      * @param itemId
      *            the item id.
      */
@@ -1230,7 +1230,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Adds an action handler.
-     * 
+     *
      * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler)
      */
     @Override
@@ -1252,7 +1252,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Removes an action handler.
-     * 
+     *
      * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
     @Override
@@ -1282,7 +1282,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Gets the visible item ids.
-     * 
+     *
      * @see com.vaadin.ui.Select#getVisibleItemIds()
      */
     @Override
@@ -1326,7 +1326,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Tree does not support <code>setNullSelectionItemId</code>.
-     * 
+     *
      * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
      */
     @Override
@@ -1340,7 +1340,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Adding new items is not supported.
-     * 
+     *
      * @throws UnsupportedOperationException
      *             if set to true.
      * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
@@ -1393,7 +1393,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Sets the {@link ItemStyleGenerator} to be used with this tree.
-     * 
+     *
      * @param itemStyleGenerator
      *            item style generator or null to remove generator
      */
@@ -1421,7 +1421,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /**
          * Called by Tree when an item is painted.
-         * 
+         *
          * @param source
          *            the source Tree
          * @param itemId
@@ -1450,7 +1450,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * A {@link TargetDetails} implementation with Tree specific api.
-     * 
+     *
      * @since 6.3
      */
     public class TreeTargetDetails extends AbstractSelectTargetDetails {
@@ -1497,7 +1497,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * ), this method returns the item id of the node after the drag was
          * targeted. This method is useful when implementing drop into specific
          * location (between specific nodes) in tree.
-         * 
+         *
          * @return the id of the item after the user targets the drop or null if
          *         "target" is a first item in node list (or the first in root
          *         node list)
@@ -1534,7 +1534,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map)
      */
@@ -1546,7 +1546,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Helper API for {@link TreeDropCriterion}
-     * 
+     *
      * @param itemId
      * @return
      */
@@ -1557,7 +1557,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the drag mode that controls how Tree behaves as a {@link DragSource}
      * .
-     * 
+     *
      * @param dragMode
      */
     public void setDragMode(TreeDragMode dragMode) {
@@ -1568,7 +1568,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * @return the drag mode that controls how Tree behaves as a
      *         {@link DragSource}.
-     * 
+     *
      * @see TreeDragMode
      */
     public TreeDragMode getDragMode() {
@@ -1578,9 +1578,9 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Concrete implementation of {@link DataBoundTransferable} for data
      * transferred from a tree.
-     * 
+     *
      * @see {@link DataBoundTransferable}.
-     * 
+     *
      * @since 6.3
      */
     protected class TreeTransferable extends DataBoundTransferable {
@@ -1603,7 +1603,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.event.dd.DragSource#getTransferable(java.util.Map)
      */
     @Override
@@ -1622,7 +1622,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Lazy loading accept criterion for Tree. Accepted target nodes are loaded
      * from server once per drag and drop operation. Developer must override one
      * method that decides accepted tree nodes for the whole Tree.
-     * 
+     *
      * <p>
      * Initially pretty much no data is sent to client. On first required
      * criterion check (per drag request) the client side data structure is
@@ -1637,7 +1637,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptCriteria.ServerSideCriterion#getIdentifier
          * ()
@@ -1649,7 +1649,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#accepts(com.vaadin
          * .event.dd.DragAndDropEvent)
@@ -1666,7 +1666,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#paintResponse(
          * com.vaadin.server.PaintTarget)
@@ -1696,9 +1696,9 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * <p>
      * Class is singleton, use {@link TargetItemAllowsChildren#get()} to get the
      * instance.
-     * 
+     *
      * @see Tree#setChildrenAllowed(Object, boolean)
-     * 
+     *
      * @since 6.3
      */
     public static class TargetItemAllowsChildren extends TargetDetailIs {
@@ -1755,7 +1755,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         /**
          * Constructs a criteria that accepts the drag if the targeted Item is a
          * descendant of Item identified by given id
-         * 
+         *
          * @param parentItemId
          *            the item identifier of the parent node
          */
@@ -1766,7 +1766,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         /**
          * Constructs a criteria that accepts drops within given level below the
          * subtree root identified by given id.
-         * 
+         *
          * @param rootId
          *            the item identifier to be sought for
          * @param depthToCheck
@@ -1814,7 +1814,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Set the item description generator which generates tooltips for the tree
      * items
-     * 
+     *
      * @param generator
      *            The generator to use or null to disable
      */
@@ -1850,7 +1850,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Reads an Item from a design and inserts it into the data source.
      * Recursively handles any children of the item as well.
-     * 
+     *
      * @since 7.5.0
      * @param node
      *            an element representing the item (tree node).
@@ -1860,7 +1860,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @param context
      *            the DesignContext instance used in parsing
      * @return the item id of the new item
-     * 
+     *
      * @throws DesignException
      *             if the tag name of the {@code node} element is not
      *             {@code node}.
@@ -1894,7 +1894,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Recursively writes the root items and their children to a design.
-     * 
+     *
      * @since 7.5.0
      * @param design
      *            the element into which to insert the items
@@ -1910,7 +1910,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Recursively writes a data source Item and its children to a design.
-     * 
+     *
      * @since 7.5.0
      * @param design
      *            the element into which to insert the item
@@ -1954,7 +1954,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * developer is responsible for ensuring no harmful html is used. If set to
      * <code>false</code>, the content is passed to the browser as plain text.
      * The default setting is <code>false</code>
-     * 
+     *
      * @since 7.6
      * @param htmlContentAllowed
      *            <code>true</code> if the captions are used as html,
@@ -1967,7 +1967,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     /**
      * Checks whether captions are interpreted as html or plain text.
-     * 
+     *
      * @since 7.6
      * @return <code>true</code> if the captions are displayed as html,
      *         <code>false</code> if displayed as plain text
diff --git a/server/src/main/java/com/vaadin/ui/TreeTable.java b/server/src/main/java/com/vaadin/ui/TreeTable.java
index df10992e5e..e36f672988 100644
--- a/server/src/main/java/com/vaadin/ui/TreeTable.java
+++ b/server/src/main/java/com/vaadin/ui/TreeTable.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
@@ -123,7 +123,7 @@ public class TreeTable extends Table implements Hierarchical {
     /**
      * This strategy is used if current container implements {@link Collapsible}
      * .
-     * 
+     *
      * open-collapsed logic diverted to container, otherwise use default
      * implementations.
      */
@@ -190,7 +190,7 @@ public class TreeTable extends Table implements Hierarchical {
     /**
      * Strategy for Hierarchical but not Collapsible container like
      * {@link HierarchicalContainer}.
-     * 
+     *
      * Store collapsed/open states internally, fool Table to use preorder when
      * accessing items from container via Ordered/Indexed methods.
      */
@@ -278,7 +278,7 @@ public class TreeTable extends Table implements Hierarchical {
 
         /**
          * Preorder of ids currently visible
-         * 
+         *
          * @return
          */
         private List<Object> getPreOrder() {
@@ -336,7 +336,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Creates an empty TreeTable with a default container.
-     * 
+     *
      * @param caption
      *            the caption for the TreeTable
      */
@@ -347,7 +347,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Creates a TreeTable instance with given captions and data source.
-     * 
+     *
      * @param caption
      *            the caption for the component
      * @param dataSource
@@ -365,7 +365,7 @@ public class TreeTable extends Table implements Hierarchical {
      * The item id that was expanded or collapsed during this request. Reset at
      * the end of paint and only used for determining if a partial or full paint
      * should be done.
-     * 
+     *
      * Can safely be reset to null whenever a change occurs that would prevent a
      * partial update from rendering the correct result, e.g. rows added or
      * removed during an expand operation.
@@ -713,7 +713,7 @@ public class TreeTable extends Table implements Hierarchical {
     /**
      * Sets the Item specified by given identifier as collapsed or expanded. If
      * the Item is collapsed, its children are not displayed to the user.
-     * 
+     *
      * @param itemId
      *            the identifier of the Item
      * @param collapsed
@@ -738,9 +738,9 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Checks if Item with given identifier is collapsed in the UI.
-     * 
+     *
      * <p>
-     * 
+     *
      * @param itemId
      *            the identifier of the checked Item
      * @return true if the Item with given id is collapsed
@@ -754,7 +754,7 @@ public class TreeTable extends Table implements Hierarchical {
      * Explicitly sets the column in which the TreeTable visualizes the
      * hierarchy. If hierarchyColumnId is not set, the hierarchy is visualized
      * in the first visible column.
-     * 
+     *
      * @param hierarchyColumnId
      */
     public void setHierarchyColumn(Object hierarchyColumnId) {
@@ -771,7 +771,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Adds an expand listener.
-     * 
+     *
      * @param listener
      *            the Listener to be added.
      */
@@ -790,7 +790,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Removes an expand listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -810,7 +810,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Emits an expand event.
-     * 
+     *
      * @param itemId
      *            the item id.
      */
@@ -820,7 +820,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Adds a collapse listener.
-     * 
+     *
      * @param listener
      *            the Listener to be added.
      */
@@ -840,7 +840,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Removes a collapse listener.
-     * 
+     *
      * @param listener
      *            the Listener to be removed.
      */
@@ -860,7 +860,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     /**
      * Emits a collapse event.
-     * 
+     *
      * @param itemId
      *            the item id.
      */
@@ -879,7 +879,7 @@ public class TreeTable extends Table implements Hierarchical {
      * Animations can be enabled by passing true to this method. Currently
      * expanding rows slide in from the top and collapsing rows slide out the
      * same way. NOTE! not supported in Internet Explorer 6 or 7.
-     * 
+     *
      * @param animationsEnabled
      *            true or false whether to enable animations or not.
      */
diff --git a/server/src/main/java/com/vaadin/ui/TwinColSelect.java b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
index 60ab09b24c..8451d27e8a 100644
--- a/server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/main/java/com/vaadin/ui/TwinColSelect.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
@@ -37,7 +37,7 @@ public class TwinColSelect extends AbstractSelect {
     private String rightColumnCaption;
 
     /**
-     * 
+     *
      */
     public TwinColSelect() {
         super();
@@ -74,8 +74,8 @@ public class TwinColSelect extends AbstractSelect {
      * {@link #setHeight(float, int)}) it overrides the number of rows. Leave
      * the height undefined to use this method. This is the opposite of how
      * {@link #setColumns(int)} work.
-     * 
-     * 
+     *
+     *
      * @param rows
      *            the number of rows to set.
      */
@@ -123,7 +123,7 @@ public class TwinColSelect extends AbstractSelect {
 
     /**
      * Sets the text shown above the right column.
-     * 
+     *
      * @param caption
      *            The text to show
      */
@@ -134,7 +134,7 @@ public class TwinColSelect extends AbstractSelect {
 
     /**
      * Returns the text shown above the right column.
-     * 
+     *
      * @return The text shown or null if not set.
      */
     public String getRightColumnCaption() {
@@ -143,7 +143,7 @@ public class TwinColSelect extends AbstractSelect {
 
     /**
      * Sets the text shown above the left column.
-     * 
+     *
      * @param caption
      *            The text to show
      */
@@ -154,7 +154,7 @@ public class TwinColSelect extends AbstractSelect {
 
     /**
      * Returns the text shown above the left column.
-     * 
+     *
      * @return The text shown or null if not set.
      */
     public String getLeftColumnCaption() {
diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
index 299cecd92a..fcae3c7b2e 100644
--- a/server/src/main/java/com/vaadin/ui/UI.java
+++ b/server/src/main/java/com/vaadin/ui/UI.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
@@ -98,10 +98,10 @@ import com.vaadin.util.CurrentInstance;
  * passing a {@link Component} with the main layout or other content of the view
  * to {@link #setContent(Component)} or to the constructor of the UI.
  * </p>
- * 
+ *
  * @see #init(VaadinRequest)
  * @see UIProvider
- * 
+ *
  * @since 7.0
  */
 public abstract class UI extends AbstractSingleComponentContainer
@@ -128,7 +128,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * The id of this UI, used to find the server side instance of the UI form
      * which a request originates. A negative value indicates that the UI id has
      * not yet been assigned by the Application.
-     * 
+     *
      * @see VaadinSession#getNextUIid()
      */
     private int uiId = -1;
@@ -280,10 +280,10 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Creates a new UI with the given component (often a layout) as its
      * content.
-     * 
+     *
      * @param content
      *            the component to use as this UIs content.
-     * 
+     *
      * @see #setContent(Component)
      */
     public UI(Component content) {
@@ -312,9 +312,9 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Overridden to return a value instead of referring to the parent.
-     * 
+     *
      * @return this UI
-     * 
+     *
      * @see com.vaadin.ui.AbstractComponent#getUI()
      */
     @Override
@@ -324,12 +324,12 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Gets the application object to which the component is attached.
-     * 
+     *
      * <p>
      * The method will return {@code null} if the component is not currently
      * attached to an application.
      * </p>
-     * 
+     *
      * <p>
      * Getting a null value is often a problem in constructors of regular
      * components and in the initializers of custom composite components. A
@@ -338,7 +338,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Another way is to move the problematic initialization to
      * {@link #attach()}, as described in the documentation of the method.
      * </p>
-     * 
+     *
      * @return the parent application of the component or <code>null</code>.
      * @see #attach()
      */
@@ -376,7 +376,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Fire a click event to all click listeners.
-     * 
+     *
      * @param object
      *            The raw "value" of the variable change from the client side.
      */
@@ -408,7 +408,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.HasComponents#iterator()
      */
     @Override
@@ -428,7 +428,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.ComponentContainer#getComponentCount()
      */
     @Override
@@ -442,13 +442,13 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is for internal use by the framework. To explicitly close a
      * UI, see {@link #close()}.
      * </p>
-     * 
+     *
      * @param session
      *            the session to set
-     * 
+     *
      * @throws IllegalStateException
      *             if the session has already been set
-     * 
+     *
      * @see #getSession()
      */
     public void setSession(VaadinSession session) {
@@ -501,7 +501,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is not intended to be overridden. If it is overridden, care
      * should be taken since this method might be called in situations where
      * {@link UI#getCurrent()} does not return this UI.
-     * 
+     *
      * @return the id of this UI
      */
     public int getUIId() {
@@ -511,7 +511,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Adds a window as a subwindow inside this UI. To open a new browser window
      * or tab, you should instead use a {@link UIProvider}.
-     * 
+     *
      * @param window
      * @throws IllegalArgumentException
      *             if the window is already added to an application
@@ -535,7 +535,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Helper method to attach a window.
-     * 
+     *
      * @param w
      *            the window to add
      */
@@ -548,13 +548,13 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Remove the given subwindow from this UI.
-     * 
+     *
      * Since Vaadin 6.5, {@link Window.CloseListener}s are called also when
      * explicitly removing a window by calling this method.
-     * 
+     *
      * Since Vaadin 6.5, returns a boolean indicating if the window was removed
      * or not.
-     * 
+     *
      * @param window
      *            Window to be removed.
      * @return true if the subwindow was removed, false otherwise
@@ -574,7 +574,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Gets all the windows added to this UI.
-     * 
+     *
      * @return an unmodifiable collection of windows
      */
     public Collection<Window> getWindows() {
@@ -609,10 +609,10 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Component.Focusable) due we want the last focused component to be focused
      * in client too. Not the one that is rendered last (the case we'd get if
      * implemented in Focusable only).
-     * 
+     *
      * To focus component from Vaadin application, use Focusable.focus(). See
      * {@link Focusable}.
-     * 
+     *
      * @param focusable
      *            to be focused on next paint
      */
@@ -625,7 +625,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Scrolls any component between the component and UI to a suitable position
      * so the component is visible to the user. The given component must belong
      * to this UI.
-     * 
+     *
      * @param component
      *            the component to be scrolled into view
      * @throws IllegalArgumentException
@@ -645,7 +645,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Internal initialization method, should not be overridden. This method is
      * not declared as final because that would break compatibility with e.g.
      * CDI.
-     * 
+     *
      * @param request
      *            the initialization request
      * @param uiId
@@ -653,7 +653,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * @param embedId
      *            the embed id of this UI, or <code>null</code> if no id is
      *            known
-     * 
+     *
      * @see #getUIId()
      * @see #getEmbedId()
      */
@@ -699,7 +699,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * The {@link VaadinRequest} can be used to get information about the
      * request that caused this UI to be created.
      * </p>
-     * 
+     *
      * @param request
      *            the Vaadin request that caused this UI to be created
      */
@@ -707,7 +707,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Internal reinitialization method, should not be overridden.
-     * 
+     *
      * @since 7.2
      * @param request
      *            the request that caused this UI to be reloaded
@@ -751,7 +751,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * <p>
      * The {@link VaadinRequest} can be used to get information about the
      * request that caused this UI to be reloaded.
-     * 
+     *
      * @since 7.2
      * @param request
      *            the request that caused this UI to be reloaded
@@ -770,10 +770,10 @@ public abstract class UI extends AbstractSingleComponentContainer
      * <p>
      * The UI is stored using a weak reference to avoid leaking memory in case
      * it is not explicitly cleared.
-     * 
+     *
      * @param ui
      *            the UI to register as the current UI
-     * 
+     *
      * @see #getCurrent()
      * @see ThreadLocal
      */
@@ -788,9 +788,9 @@ public abstract class UI extends AbstractSingleComponentContainer
      * <p>
      * The UI is stored using a weak reference to avoid leaking memory in case
      * it is not explicitly cleared.
-     * 
+     *
      * @return the current UI instance if available, otherwise <code>null</code>
-     * 
+     *
      * @see #setCurrent(UI)
      */
     public static UI getCurrent() {
@@ -799,7 +799,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Set top offset to which the UI should scroll to.
-     * 
+     *
      * @param scrollTop
      */
     public void setScrollTop(int scrollTop) {
@@ -819,7 +819,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Set left offset to which the UI should scroll to.
-     * 
+     *
      * @param scrollLeft
      */
     public void setScrollLeft(int scrollLeft) {
@@ -883,7 +883,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * When there are active window resize listeners, lazy resize mode should be
      * used to avoid a large number of events during resize.
      * </p>
-     * 
+     *
      * @param resizeLazy
      *            true to use a delay before recalculating sizes, false to
      *            calculate immediately.
@@ -895,7 +895,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Checks whether lazy resize is enabled.
-     * 
+     *
      * @return <code>true</code> if lazy resize is enabled, <code>false</code>
      *         if lazy resize is not enabled
      */
@@ -908,9 +908,9 @@ public abstract class UI extends AbstractSingleComponentContainer
      * clicks inside the UI. Also when the click targets a component inside the
      * UI, provided the targeted component does not prevent the click event from
      * propagating.
-     * 
+     *
      * Use {@link #removeListener(ClickListener)} to remove the listener.
-     * 
+     *
      * @param listener
      *            The listener to add
      */
@@ -931,7 +931,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Remove a click listener from the UI. The listener should earlier have
      * been added using {@link #addListener(ClickListener)}.
-     * 
+     *
      * @param listener
      *            The listener to remove
      */
@@ -966,7 +966,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Returns the navigator attached to this UI or null if there is no
      * navigator.
-     * 
+     *
      * @return
      */
     public Navigator getNavigator() {
@@ -975,7 +975,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * For internal use only.
-     * 
+     *
      * @param navigator
      */
     public void setNavigator(Navigator navigator) {
@@ -985,7 +985,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Setting the caption of a UI is not supported. To set the title of the
      * HTML page, use Page.setTitle
-     * 
+     *
      * @deprecated As of 7.0, use {@link Page#setTitle(String)}
      */
     @Override
@@ -998,16 +998,16 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Shows a notification message on the middle of the UI. The message
      * automatically disappears ("humanized message").
-     * 
+     *
      * Care should be taken to to avoid XSS vulnerabilities as the caption is
      * rendered as html.
-     * 
+     *
      * @see #showNotification(Notification)
      * @see Notification
-     * 
+     *
      * @param caption
      *            The message
-     * 
+     *
      * @deprecated As of 7.0, use Notification.show instead but be aware that
      *             Notification.show does not allow HTML.
      */
@@ -1022,18 +1022,18 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Shows a notification message the UI. The position and behavior of the
      * message depends on the type, which is one of the basic types defined in
      * {@link Notification}, for instance Notification.TYPE_WARNING_MESSAGE.
-     * 
+     *
      * Care should be taken to to avoid XSS vulnerabilities as the caption is
      * rendered as html.
-     * 
+     *
      * @see #showNotification(Notification)
      * @see Notification
-     * 
+     *
      * @param caption
      *            The message
      * @param type
      *            The message type
-     * 
+     *
      * @deprecated As of 7.0, use Notification.show instead but be aware that
      *             Notification.show does not allow HTML.
      */
@@ -1048,18 +1048,18 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Shows a notification consisting of a bigger caption and a smaller
      * description on the middle of the UI. The message automatically disappears
      * ("humanized message").
-     * 
+     *
      * Care should be taken to to avoid XSS vulnerabilities as the caption and
      * description are rendered as html.
-     * 
+     *
      * @see #showNotification(Notification)
      * @see Notification
-     * 
+     *
      * @param caption
      *            The caption of the message
      * @param description
      *            The message description
-     * 
+     *
      * @deprecated As of 7.0, use new Notification(...).show(Page) instead but
      *             be aware that HTML by default not allowed.
      */
@@ -1075,20 +1075,20 @@ public abstract class UI extends AbstractSingleComponentContainer
      * description. The position and behavior of the message depends on the
      * type, which is one of the basic types defined in {@link Notification} ,
      * for instance Notification.TYPE_WARNING_MESSAGE.
-     * 
+     *
      * Care should be taken to to avoid XSS vulnerabilities as the caption and
      * description are rendered as html.
-     * 
+     *
      * @see #showNotification(Notification)
      * @see Notification
-     * 
+     *
      * @param caption
      *            The caption of the message
      * @param description
      *            The message description
      * @param type
      *            The message type
-     * 
+     *
      * @deprecated As of 7.0, use new Notification(...).show(Page) instead but
      *             be aware that HTML by default not allowed.
      */
@@ -1106,13 +1106,13 @@ public abstract class UI extends AbstractSingleComponentContainer
      * description. The position and behavior of the message depends on the
      * type, which is one of the basic types defined in {@link Notification} ,
      * for instance Notification.TYPE_WARNING_MESSAGE.
-     * 
+     *
      * Care should be taken to avoid XSS vulnerabilities if html content is
      * allowed.
-     * 
+     *
      * @see #showNotification(Notification)
      * @see Notification
-     * 
+     *
      * @param caption
      *            The message caption
      * @param description
@@ -1122,7 +1122,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * @param htmlContentAllowed
      *            Whether html in the caption and description should be
      *            displayed as html or as plain text
-     * 
+     *
      * @deprecated As of 7.0, use new Notification(...).show(Page).
      */
     @Deprecated
@@ -1134,16 +1134,16 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Shows a notification message.
-     * 
+     *
      * @see Notification
      * @see #showNotification(String)
      * @see #showNotification(String, int)
      * @see #showNotification(String, String)
      * @see #showNotification(String, String, int)
-     * 
+     *
      * @param notification
      *            The notification message to show
-     * 
+     *
      * @deprecated As of 7.0, use Notification.show instead
      */
     @Deprecated
@@ -1157,9 +1157,9 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is not intended to be overridden. If it is overridden, care
      * should be taken since this method might be called in situations where
      * {@link UI#getCurrent()} does not return this UI.
-     * 
+     *
      * @see VaadinService#closeInactiveUIs(VaadinSession)
-     * 
+     *
      * @return The time the last heartbeat request occurred, in milliseconds
      *         since the epoch.
      */
@@ -1175,7 +1175,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is not intended to be overridden. If it is overridden, care
      * should be taken since this method might be called in situations where
      * {@link UI#getCurrent()} does not return this UI.
-     * 
+     *
      * @param lastHeartbeat
      *            The time the last heartbeat request occurred, in milliseconds
      *            since the epoch.
@@ -1186,7 +1186,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Gets the theme currently in use by this UI
-     * 
+     *
      * @return the theme name
      */
     public String getTheme() {
@@ -1203,7 +1203,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * other environment where there are multiple UIs on the same page. The old
      * CSS file will be removed even if there are other UIs on the page which
      * are still using it.
-     * 
+     *
      * @since 7.3
      * @param theme
      *            The new theme name
@@ -1258,9 +1258,9 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is not intended to be overridden. If it is overridden, care
      * should be taken since this method might be called in situations where
      * {@link UI#getCurrent()} does not return this UI.
-     * 
+     *
      * @see #close()
-     * 
+     *
      * @return whether this UI is closing.
      */
     public boolean isClosing() {
@@ -1271,7 +1271,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * Called after the UI is added to the session. A UI instance is attached
      * exactly once, before its {@link #init(VaadinRequest) init} method is
      * called.
-     * 
+     *
      * @see Component#attach
      */
     @Override
@@ -1300,7 +1300,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.ui.AbstractSingleComponentContainer#setContent(com.vaadin.
      * ui.Component)
@@ -1346,9 +1346,9 @@ public abstract class UI extends AbstractSingleComponentContainer
      * later point in time.</li>
      * </ul>
      * </p>
-     * 
+     *
      * @since 7.1
-     * 
+     *
      * @param runnable
      *            the runnable which accesses the UI
      * @throws UIDetachedException
@@ -1356,7 +1356,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      *             therefore not be done)
      * @throws IllegalStateException
      *             if the current thread holds the lock for another session
-     * 
+     *
      * @see #access(Runnable)
      * @see VaadinSession#accessSynchronously(Runnable)
      */
@@ -1420,14 +1420,14 @@ public abstract class UI extends AbstractSingleComponentContainer
      * The returned future can be used to check for task completion and to
      * cancel the task.
      * </p>
-     * 
+     *
      * @see #getCurrent()
      * @see #accessSynchronously(Runnable)
      * @see VaadinSession#access(Runnable)
      * @see VaadinSession#lock()
-     * 
+     *
      * @since 7.1
-     * 
+     *
      * @param runnable
      *            the runnable which accesses the UI
      * @throws UIDetachedException
@@ -1478,7 +1478,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Retrieves the object used for configuring tooltips.
-     * 
+     *
      * @return The instance used for tooltip configuration
      */
     public TooltipConfiguration getTooltipConfiguration() {
@@ -1487,7 +1487,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Retrieves the object used for configuring notifications.
-     * 
+     *
      * @return The instance used for notification configuration
      */
     public NotificationConfiguration getNotificationConfiguration() {
@@ -1496,7 +1496,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Retrieves the object used for configuring the loading indicator.
-     * 
+     *
      * @return The instance used for configuring the loading indicator
      */
     public LoadingIndicatorConfiguration getLoadingIndicatorConfiguration() {
@@ -1515,14 +1515,14 @@ public abstract class UI extends AbstractSingleComponentContainer
      * return this UI since writing the response may invoke logic in any
      * attached component or extension. The recommended way of fulfilling these
      * conditions is to use {@link #access(Runnable)}.
-     * 
+     *
      * @throws IllegalStateException
      *             if push is disabled.
      * @throws UIDetachedException
      *             if this UI is not attached to a session.
-     * 
+     *
      * @see #getPushConfiguration()
-     * 
+     *
      * @since 7.1
      */
     public void push() {
@@ -1560,7 +1560,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This method is not intended to be overridden. If it is overridden, care
      * should be taken since this method might be called in situations where
      * {@link UI#getCurrent()} does not return this UI.
-     * 
+     *
      * @return the push connection used by this UI, or {@code null} if push is
      *         not available.
      */
@@ -1576,7 +1576,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * <p>
      * The {@code pushConnection} argument must be non-null if and only if
      * {@code getPushConfiguration().getPushMode().isEnabled()}.
-     * 
+     *
      * @param pushConnection
      *            the push connection to use for this UI
      */
@@ -1609,7 +1609,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * application developer. An add-on should not set the poll interval
      * directly, rather instruct the user to set it.
      * </p>
-     * 
+     *
      * @param intervalInMillis
      *            The interval (in ms) with which the UI should poll the server
      *            or -1 to disable polling
@@ -1620,7 +1620,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Returns the interval with which the UI polls the server.
-     * 
+     *
      * @return The interval (in ms) with which the UI polls the server or -1 if
      *         polling is disabled
      */
@@ -1641,7 +1641,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Retrieves the object used for configuring the push channel.
-     * 
+     *
      * @since 7.1
      * @return The instance used for push configuration
      */
@@ -1651,7 +1651,7 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Retrieves the object used for configuring the reconnect dialog.
-     * 
+     *
      * @since 7.6
      * @return The instance used for reconnect dialog configuration
      */
@@ -1662,7 +1662,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Get the label that is added to the container element, where tooltip,
      * notification and dialogs are added to.
-     * 
+     *
      * @return the label of the container
      */
     public String getOverlayContainerLabel() {
@@ -1676,7 +1676,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * This is helpful for users of assistive devices, as this element is
      * reachable for them.
      * </p>
-     * 
+     *
      * @param overlayContainerLabel
      *            label to use for the container
      */
@@ -1687,7 +1687,7 @@ public abstract class UI extends AbstractSingleComponentContainer
     /**
      * Returns the locale service which handles transmission of Locale data to
      * the client.
-     * 
+     *
      * @since 7.1
      * @return The LocaleService for this UI
      */
@@ -1704,7 +1704,7 @@ public abstract class UI extends AbstractSingleComponentContainer
      * it is embedded. The embed identifier is based on the
      * <code>window.name</code> DOM attribute of the browser window where the UI
      * is displayed and the id of the div element where the UI is embedded.
-     * 
+     *
      * @since 7.2
      * @return the embed id for this UI, or <code>null</code> if no id known
      */
@@ -1714,9 +1714,9 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Gets the last processed server message id.
-     * 
+     *
      * Used internally for communication tracking.
-     * 
+     *
      * @return lastProcessedServerMessageId the id of the last processed server
      *         message
      * @since 7.6
@@ -1727,9 +1727,9 @@ public abstract class UI extends AbstractSingleComponentContainer
 
     /**
      * Sets the last processed server message id.
-     * 
+     *
      * Used internally for communication tracking.
-     * 
+     *
      * @param lastProcessedServerMessageId
      *            the id of the last processed server message
      * @since 7.6
diff --git a/server/src/main/java/com/vaadin/ui/UIDetachedException.java b/server/src/main/java/com/vaadin/ui/UIDetachedException.java
index 7cd7f0889e..4454f8279e 100644
--- a/server/src/main/java/com/vaadin/ui/UIDetachedException.java
+++ b/server/src/main/java/com/vaadin/ui/UIDetachedException.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
@@ -17,7 +17,7 @@ package com.vaadin.ui;
 
 /**
  * Exception thrown if the UI has been detached when it should not be.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.1
  */
diff --git a/server/src/main/java/com/vaadin/ui/UniqueSerializable.java b/server/src/main/java/com/vaadin/ui/UniqueSerializable.java
index f5d68e8a71..8f5fc9c053 100644
--- a/server/src/main/java/com/vaadin/ui/UniqueSerializable.java
+++ b/server/src/main/java/com/vaadin/ui/UniqueSerializable.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
@@ -22,10 +22,10 @@ import java.io.Serializable;
  * <p>
  * This class is abstract but has no abstract methods to force users to create
  * an anonymous inner class. Otherwise each instance will not be unique.
- * 
+ *
  * @author Vaadin Ltd
  * @since 6.8.0
- * 
+ *
  */
 public abstract class UniqueSerializable implements Serializable {
 
diff --git a/server/src/main/java/com/vaadin/ui/VerticalLayout.java b/server/src/main/java/com/vaadin/ui/VerticalLayout.java
index 7002fbc7e6..fe133c1bb0 100644
--- a/server/src/main/java/com/vaadin/ui/VerticalLayout.java
+++ b/server/src/main/java/com/vaadin/ui/VerticalLayout.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
@@ -19,11 +19,11 @@ import com.vaadin.shared.ui.orderedlayout.VerticalLayoutState;
 
 /**
  * Vertical layout
- * 
+ *
  * <code>VerticalLayout</code> is a component container, which shows the
  * subcomponents in the order of their addition (vertically). A vertical layout
  * is by default 100% wide.
- * 
+ *
  * @author Vaadin Ltd.
  * @since 5.3
  */
@@ -40,9 +40,9 @@ public class VerticalLayout extends AbstractOrderedLayout {
     /**
      * Constructs a VerticalLayout with the given components. The components are
      * added in the given order.
-     * 
+     *
      * @see AbstractOrderedLayout#addComponents(Component...)
-     * 
+     *
      * @param children
      *            The components to add.
      */
diff --git a/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.java b/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.java
index e5e6eb60e1..b2e6f115aa 100644
--- a/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.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
@@ -20,7 +20,7 @@ import com.vaadin.shared.ui.splitpanel.VerticalSplitPanelState;
 /**
  * A vertical split panel contains two components and lays them vertically. The
  * first component is above the second component.
- * 
+ *
  * <pre>
  *      +--------------------------+
  *      |                          |
@@ -32,7 +32,7 @@ import com.vaadin.shared.ui.splitpanel.VerticalSplitPanelState;
  *      |                          |
  *      +--------------------------+
  * </pre>
- * 
+ *
  */
 public class VerticalSplitPanel extends AbstractSplitPanel {
 
@@ -43,7 +43,7 @@ public class VerticalSplitPanel extends AbstractSplitPanel {
 
     /**
      * Creates a horizontal split panel containing the given components
-     * 
+     *
      * @param firstComponent
      *            The component to be placed above the splitter
      * @param secondComponent
diff --git a/server/src/main/java/com/vaadin/ui/Video.java b/server/src/main/java/com/vaadin/ui/Video.java
index 02498533cd..1bacc8c5ec 100644
--- a/server/src/main/java/com/vaadin/ui/Video.java
+++ b/server/src/main/java/com/vaadin/ui/Video.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
@@ -33,19 +33,19 @@ import com.vaadin.ui.declarative.DesignContext;
  * such is only supported in browsers that support HTML5 media markup. Browsers
  * that do not support HTML5 display the text or HTML set by calling
  * {@link #setAltText(String)}.
- * 
+ *
  * A flash-player fallback can be implemented by setting HTML content allowed (
  * {@link #setHtmlContentAllowed(boolean)} and calling
  * {@link #setAltText(String)} with the flash player markup. An example of flash
  * fallback can be found at the <a href=
  * "https://developer.mozilla.org/En/Using_audio_and_video_in_Firefox#Using_Flash"
  * >Mozilla Developer Network</a>.
- * 
+ *
  * Multiple sources can be specified. Which of the sources is used is selected
  * by the browser depending on which file formats it supports. See
  * <a href="http://en.wikipedia.org/wiki/HTML5_video#Table">wikipedia</a> for a
  * table of formats supported by different browsers.
- * 
+ *
  * @author Vaadin Ltd
  * @since 6.7.0
  */
@@ -83,7 +83,7 @@ public class Video extends AbstractMedia {
     /**
      * Sets the poster image, which is shown in place of the video before the
      * user presses play.
-     * 
+     *
      * @param poster
      */
     public void setPoster(Resource poster) {
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
index dfb59e148b..86d9e4951a 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.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
@@ -20,20 +20,20 @@ import com.vaadin.ui.Component;
 
 /**
  * All Calendar events extends this class.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class CalendarComponentEvent extends Component.Event {
 
     /**
      * Set the source of the event
-     * 
+     *
      * @param source
      *            The source calendar
-     * 
+     *
      */
     public CalendarComponentEvent(Calendar source) {
         super(source);
@@ -41,7 +41,7 @@ public class CalendarComponentEvent extends Component.Event {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.ui.Component.Event#getComponent()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
index 4b088cb2e1..1ecf18a682 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.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
@@ -27,7 +27,7 @@ import com.vaadin.util.ReflectTools;
 
 /**
  * Interface for all Vaadin Calendar events.
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -39,7 +39,7 @@ public interface CalendarComponentEvents extends Serializable {
     public interface CalendarEventNotifier extends Serializable {
         /**
          * Get the assigned event handler for the given eventId.
-         * 
+         *
          * @param eventId
          * @return the assigned eventHandler, or null if no handler is assigned
          */
@@ -53,7 +53,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Set the EventMoveHandler.
-         * 
+         *
          * @param listener
          *            EventMoveHandler to be added
          */
@@ -77,7 +77,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * MoveEvent needs the target event and new start date.
-         * 
+         *
          * @param source
          *            Calendar component.
          * @param calendarEvent
@@ -95,7 +95,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get target event.
-         * 
+         *
          * @return Target event.
          */
         public CalendarEvent getCalendarEvent() {
@@ -104,7 +104,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get new start date.
-         * 
+         *
          * @return New start date.
          */
         public Date getNewStart() {
@@ -114,7 +114,7 @@ public interface CalendarComponentEvents extends Serializable {
 
     /**
      * Handler interface for when events are being dragged on the calendar
-     * 
+     *
      */
     public interface EventMoveHandler extends EventListener, Serializable {
 
@@ -125,7 +125,7 @@ public interface CalendarComponentEvents extends Serializable {
         /**
          * This method will be called when event has been moved to a new
          * position.
-         * 
+         *
          * @param event
          *            MoveEvent containing specific information of the new
          *            position and target event.
@@ -141,7 +141,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Set the RangeSelectHandler that listens for drag-marking.
-         * 
+         *
          * @param listener
          *            RangeSelectHandler to be added.
          */
@@ -170,7 +170,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * RangeSelectEvent needs a start and end date.
-         * 
+         *
          * @param source
          *            Calendar component.
          * @param start
@@ -190,7 +190,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get start date.
-         * 
+         *
          * @return Start date.
          */
         public Date getStart() {
@@ -199,7 +199,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get end date.
-         * 
+         *
          * @return End date.
          */
         public Date getEnd() {
@@ -209,9 +209,9 @@ public interface CalendarComponentEvents extends Serializable {
         /**
          * Gets the event's view mode. Calendar can be be either in monthly or
          * weekly mode, depending on the active date range.
-         * 
+         *
          * @deprecated User {@link Calendar#isMonthlyMode()} instead
-         * 
+         *
          * @return Returns true when monthly view is active.
          */
         @Deprecated
@@ -231,7 +231,7 @@ public interface CalendarComponentEvents extends Serializable {
         /**
          * This method will be called when day or time cells are drag-marked
          * with mouse.
-         * 
+         *
          * @param event
          *            RangeSelectEvent that contains range start and end date.
          */
@@ -242,7 +242,7 @@ public interface CalendarComponentEvents extends Serializable {
     public interface NavigationNotifier extends Serializable {
         /**
          * Add a forward navigation listener.
-         * 
+         *
          * @param handler
          *            ForwardHandler to be added.
          */
@@ -250,7 +250,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Add a backward navigation listener.
-         * 
+         *
          * @param handler
          *            BackwardHandler to be added.
          */
@@ -258,7 +258,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Add a date click listener.
-         * 
+         *
          * @param handler
          *            DateClickHandler to be added.
          */
@@ -266,7 +266,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Add a event click listener.
-         * 
+         *
          * @param handler
          *            EventClickHandler to be added.
          */
@@ -274,7 +274,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Add a week click listener.
-         * 
+         *
          * @param handler
          *            WeekClickHandler to be added.
          */
@@ -291,7 +291,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * ForwardEvent needs only the source component.
-         * 
+         *
          * @param source
          *            Calendar component.
          */
@@ -309,7 +309,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * This method will be called when date range is moved forward.
-         * 
+         *
          * @param event
          *            ForwardEvent
          */
@@ -326,7 +326,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * BackwardEvent needs only the source source component.
-         * 
+         *
          * @param source
          *            Calendar component.
          */
@@ -344,7 +344,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * This method will be called when date range is moved backwards.
-         * 
+         *
          * @param event
          *            BackwardEvent
          */
@@ -370,7 +370,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get clicked date.
-         * 
+         *
          * @return Clicked date.
          */
         public Date getDate() {
@@ -387,7 +387,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * This method will be called when a date is clicked.
-         * 
+         *
          * @param event
          *            DateClickEvent containing the target date.
          */
@@ -413,7 +413,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get the clicked event.
-         * 
+         *
          * @return Clicked event.
          */
         public CalendarEvent getCalendarEvent() {
@@ -430,7 +430,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * This method will be called when an event is clicked.
-         * 
+         *
          * @param event
          *            EventClick containing the target event.
          */
@@ -453,7 +453,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * WeekClick needs a target year and week.
-         * 
+         *
          * @param source
          *            Target source.
          * @param week
@@ -470,7 +470,7 @@ public interface CalendarComponentEvents extends Serializable {
         /**
          * Get week as a integer. See {@link java.util.Calendar} for the allowed
          * values.
-         * 
+         *
          * @return Week as a integer.
          */
         public int getWeek() {
@@ -480,7 +480,7 @@ public interface CalendarComponentEvents extends Serializable {
         /**
          * Get year as a integer. See {@link java.util.Calendar} for the allowed
          * values.
-         * 
+         *
          * @return Year as a integer
          */
         public int getYear() {
@@ -497,7 +497,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * This method will be called when a week is clicked.
-         * 
+         *
          * @param event
          *            WeekClick containing the target week and year.
          */
@@ -528,7 +528,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Get target event.
-         * 
+         *
          * @return Target event.
          */
         public CalendarEvent getCalendarEvent() {
@@ -537,7 +537,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * @deprecated Use {@link #getNewStart()} instead
-         * 
+         *
          * @return the new start time
          */
         @Deprecated
@@ -547,7 +547,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Returns the updated start date/time of the event
-         * 
+         *
          * @return The new date for the event
          */
         public Date getNewStart() {
@@ -556,7 +556,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * @deprecated Use {@link #getNewEnd()} instead
-         * 
+         *
          * @return the new end time
          */
         @Deprecated
@@ -566,7 +566,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Returns the updates end date/time of the event
-         * 
+         *
          * @return The new date for the event
          */
         public Date getNewEnd() {
@@ -581,7 +581,7 @@ public interface CalendarComponentEvents extends Serializable {
 
         /**
          * Set a EventResizeHandler.
-         * 
+         *
          * @param handler
          *            EventResizeHandler to be set
          */
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
index 18b98e1f6c..9919dba414 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.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
@@ -21,10 +21,10 @@ import java.util.TimeZone;
 
 /**
  * Class for representing a date range.
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
- * 
+ *
  */
 @SuppressWarnings("serial")
 public class CalendarDateRange implements Serializable {
@@ -37,7 +37,7 @@ public class CalendarDateRange implements Serializable {
 
     /**
      * Constructor
-     * 
+     *
      * @param start
      *            The start date and time of the date range
      * @param end
@@ -52,7 +52,7 @@ public class CalendarDateRange implements Serializable {
 
     /**
      * Get the start date of the date range
-     * 
+     *
      * @return the start Date of the range
      */
     public Date getStart() {
@@ -61,7 +61,7 @@ public class CalendarDateRange implements Serializable {
 
     /**
      * Get the end date of the date range
-     * 
+     *
      * @return the end Date of the range
      */
     public Date getEnd() {
@@ -70,7 +70,7 @@ public class CalendarDateRange implements Serializable {
 
     /**
      * Is a date in the date range
-     * 
+     *
      * @param date
      *            The date to check
      * @return true if the date range contains a date start and end of range
@@ -86,7 +86,7 @@ public class CalendarDateRange implements Serializable {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#toString()
      */
     @Override
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
index 3ea6c4d8f4..76598cf79b 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.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.Calendar;
  * details of the drop point. Specifically, this class gives access to the date
  * where the drop happened. If the Calendar was in weekly mode, the date also
  * includes the start time of the slot.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -52,7 +52,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl {
 
     /**
      * Does the dropped item have a time associated with it
-     * 
+     *
      * @param hasDropTime
      */
     public void setHasDropTime(boolean hasDropTime) {
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index 5610f037c4..f9e4db0510 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.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
@@ -43,9 +43,9 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha
 /**
  * A event provider which uses a {@link Container} as a datasource. Container
  * used as data source.
- * 
+ *
  * NOTE: The data source must be sorted by date!
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -66,7 +66,7 @@ public class ContainerEventProvider
     /**
      * Internal class to keep the container index which item this event
      * represents
-     * 
+     *
      */
     private class ContainerCalendarEvent extends BasicEvent {
         private final int index;
@@ -111,7 +111,7 @@ public class ContainerEventProvider
 
     /**
      * Constructor
-     * 
+     *
      * @param container
      *            Container to use as a data source.
      */
@@ -122,10 +122,10 @@ public class ContainerEventProvider
 
     /**
      * Set the container data source
-     * 
+     *
      * @param container
      *            The container to use as datasource
-     * 
+     *
      */
     public void setContainerDataSource(Container.Indexed container) {
         // Detach the previous container
@@ -137,7 +137,7 @@ public class ContainerEventProvider
 
     /**
      * Returns the container used as data source
-     * 
+     *
      */
     public Container.Indexed getContainerDataSource() {
         return container;
@@ -170,7 +170,7 @@ public class ContainerEventProvider
 
     /**
      * Converts an event in the container to an {@link CalendarEvent}
-     * 
+     *
      * @param index
      *            The index of the item in the container to get the event for
      * @return
@@ -242,7 +242,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
@@ -281,7 +281,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEventProvider.
      * EventSetChangeNotifier
      * #addListener(com.vaadin.addon.calendar.event.CalendarEventProvider.
@@ -296,7 +296,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEventProvider.
      * EventSetChangeNotifier
      * #removeListener(com.vaadin.addon.calendar.event.CalendarEventProvider.
@@ -309,7 +309,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier#
      * addListener
      * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener)
@@ -323,7 +323,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent.EventChangeNotifier#
      * removeListener
      * (com.vaadin.addon.calendar.event.CalendarEvent.EventChangeListener)
@@ -423,7 +423,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange
      * (com.vaadin.data.Container.ItemSetChangeEvent)
@@ -440,7 +440,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.data.Property.ValueChangeListener#valueChange(com.vaadin.data
      * .Property.ValueChangeEvent)
@@ -456,7 +456,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveHandler
      * #eventMove
@@ -487,7 +487,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeHandler
      * #eventResize
@@ -524,7 +524,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
@@ -554,7 +554,7 @@ public class ContainerEventProvider
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
index bd15e316f4..fe734d1246 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier
  * Simple implementation of {@link com.vaadin.addon.calendar.event.CalendarEvent
  * CalendarEvent}. Has setters for all required fields and fires events when
  * this event is changed.
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -50,7 +50,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /**
      * Constructor for creating an event with the same start and end date
-     * 
+     *
      * @param caption
      *            The caption for the event
      * @param description
@@ -68,7 +68,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
     /**
      * Constructor for creating an event with a start date and an end date.
      * Start date should be before the end date
-     * 
+     *
      * @param caption
      *            The caption for the event
      * @param description
@@ -88,7 +88,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getCaption()
      */
     @Override
@@ -98,7 +98,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getDescription()
      */
     @Override
@@ -108,7 +108,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getEnd()
      */
     @Override
@@ -118,7 +118,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getStart()
      */
     @Override
@@ -128,7 +128,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#getStyleName()
      */
     @Override
@@ -138,7 +138,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.event.CalendarEvent#isAllDay()
      */
     @Override
@@ -148,7 +148,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setCaption(java.lang
      * .String)
@@ -161,7 +161,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setDescription(java
      * .lang.String)
@@ -174,7 +174,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setEnd(java.util.
      * Date)
@@ -187,7 +187,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setStart(java.util
      * .Date)
@@ -200,7 +200,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setStyleName(java
      * .lang.String)
@@ -213,7 +213,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventEditor#setAllDay(boolean)
      */
@@ -225,7 +225,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventChangeNotifier
      * #addListener
@@ -239,7 +239,7 @@ public class BasicEvent implements EditableCalendarEvent, EventChangeNotifier {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventChangeNotifier
      * #removeListener
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
index 0e18a382a2..d9006ae570 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha
  * CalendarEventProvider}. Use {@link #addEvent(CalendarEvent)} and
  * {@link #removeEvent(CalendarEvent)} to add / remove events.
  * </p>
- * 
+ *
  * <p>
  * {@link com.vaadin.addon.calendar.event.CalendarEventProvider.EventSetChangeNotifier
  * EventSetChangeNotifier} and
@@ -37,7 +37,7 @@ import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetCha
  * EventChangeListener} are also implemented, so the Calendar is notified when
  * an event is added, changed or removed.
  * </p>
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -51,7 +51,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEventProvider#getEvents(java.
      * util.Date, java.util.Date)
@@ -81,7 +81,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /**
      * Does this event provider container this event
-     * 
+     *
      * @param event
      *            The event to check for
      * @return If this provider has the event then true is returned, else false
@@ -92,7 +92,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents.
      * EventSetChangeNotifier #addListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.
@@ -106,7 +106,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents.
      * EventSetChangeNotifier #removeListener
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.
@@ -131,7 +131,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventChangeListener
      * #eventChange
@@ -145,7 +145,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#addEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
@@ -161,7 +161,7 @@ public class BasicEventProvider implements CalendarEditableEventProvider,
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.event.CalendarEditableEventProvider#removeEvent
      * (com.vaadin.addon.calendar.event.CalendarEvent)
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
index 920600368e..d161f0d0c7 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.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
@@ -18,7 +18,7 @@ package com.vaadin.ui.components.calendar.event;
 
 /**
  * An event provider which allows adding and removing events
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -26,7 +26,7 @@ public interface CalendarEditableEventProvider extends CalendarEventProvider {
 
     /**
      * Adds an event to the event provider
-     * 
+     *
      * @param event
      *            The event to add
      */
@@ -34,7 +34,7 @@ public interface CalendarEditableEventProvider extends CalendarEventProvider {
 
     /**
      * Removes an event from the event provider
-     * 
+     *
      * @param event
      *            The event
      */
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
index c6d2e03ebb..93592e2ea5 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.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
@@ -23,42 +23,42 @@ import java.util.Date;
  * Event in the calendar. Customize your own event by implementing this
  * interface.
  * </p>
- * 
+ *
  * <li>Start and end fields are mandatory.</li>
- * 
+ *
  * <li>In "allDay" events longer than one day, starting and ending clock times
  * are omitted in UI and only dates are shown.</li>
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
- * 
+ *
  */
 public interface CalendarEvent extends Serializable {
 
     /**
      * Gets start date of event.
-     * 
+     *
      * @return Start date.
      */
     public Date getStart();
 
     /**
      * Get end date of event.
-     * 
+     *
      * @return End date;
      */
     public Date getEnd();
 
     /**
      * Gets caption of event.
-     * 
+     *
      * @return Caption text
      */
     public String getCaption();
 
     /**
      * Gets description of event. Shown as a tooltip over the event.
-     * 
+     *
      * @return Description text.
      */
     public String getDescription();
@@ -75,7 +75,7 @@ public interface CalendarEvent extends Serializable {
      * CSS:</br>
      * .v-calendar-event-color1 {</br>
      * &nbsp;&nbsp;&nbsp;background-color: #9effae;</br>}</code>
-     * 
+     *
      * @return Style name.
      */
     public String getStyleName();
@@ -84,7 +84,7 @@ public interface CalendarEvent extends Serializable {
      * An all-day event typically does not occur at a specific time but targets
      * a whole day or days. The rendering of all-day events differs from normal
      * events.
-     * 
+     *
      * @return true if this event is an all-day event, false otherwise
      */
     public boolean isAllDay();
@@ -129,7 +129,7 @@ public interface CalendarEvent extends Serializable {
         /**
          * Add a listener to listen for EventChangeEvents. These events are
          * fired when a events properties are changed.
-         * 
+         *
          * @param listener
          *            The listener to add
          */
@@ -137,7 +137,7 @@ public interface CalendarEvent extends Serializable {
 
         /**
          * Remove a listener from the event provider.
-         * 
+         *
          * @param listener
          *            The listener to remove
          */
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
index 2a8ec7e834..802242d2d7 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.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
@@ -22,7 +22,7 @@ import java.util.List;
 /**
  * Interface for querying events. The Vaadin Calendar always has a
  * CalendarEventProvider set.
- * 
+ *
  * @since 7.1.0
  * @author Vaadin Ltd.
  */
@@ -34,14 +34,14 @@ public interface CalendarEventProvider extends Serializable {
      * shown, which is not guaranteed to be the same as the date range that is
      * set.
      * </p>
-     * 
+     *
      * <p>
      * For example, if you set the date range to be monday 22.2.2010 - wednesday
      * 24.2.2010, the used Event Provider will be queried for events between
      * monday 22.2.2010 00:00 and sunday 28.2.2010 23:59. Generally you can
      * expect the date range to be expanded to whole days and whole weeks.
      * </p>
-     * 
+     *
      * @param startDate
      *            Start date
      * @param endDate
@@ -55,7 +55,7 @@ public interface CalendarEventProvider extends Serializable {
      * should refresh its view from the
      * {@link com.vaadin.addon.calendar.event.CalendarEventProvider
      * CalendarEventProvider} .
-     * 
+     *
      */
     @SuppressWarnings("serial")
     public class EventSetChangeEvent implements Serializable {
@@ -95,7 +95,7 @@ public interface CalendarEventProvider extends Serializable {
         /**
          * Add a listener for listening to when new events are adding or removed
          * from the event provider.
-         * 
+         *
          * @param listener
          *            The listener to add
          */
@@ -103,7 +103,7 @@ public interface CalendarEventProvider extends Serializable {
 
         /**
          * Remove a listener which listens to {@link EventSetChangeEvent}-events
-         * 
+         *
          * @param listener
          *            The listener to remove
          */
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
index df708697b8..9ff136c3ce 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.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
@@ -25,13 +25,13 @@ import java.util.Date;
  * CalendarEvent} fields. For descriptions on the fields, refer to the extended
  * interface.
  * </p>
- * 
+ *
  * <p>
  * This interface is used by some of the basic Calendar event handlers in the
  * <code>com.vaadin.addon.calendar.ui.handler</code> package to determine
  * whether an event can be edited.
  * </p>
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -39,7 +39,7 @@ public interface EditableCalendarEvent extends CalendarEvent {
 
     /**
      * Set the visible text in the calendar for the event.
-     * 
+     *
      * @param caption
      *            The text to show in the calendar
      */
@@ -48,7 +48,7 @@ public interface EditableCalendarEvent extends CalendarEvent {
     /**
      * Set the description of the event. This is shown in the calendar when
      * hoovering over the event.
-     * 
+     *
      * @param description
      *            The text which describes the event
      */
@@ -56,7 +56,7 @@ public interface EditableCalendarEvent extends CalendarEvent {
 
     /**
      * Set the end date of the event. Must be after the start date.
-     * 
+     *
      * @param end
      *            The end date to set
      */
@@ -64,7 +64,7 @@ public interface EditableCalendarEvent extends CalendarEvent {
 
     /**
      * Set the start date for the event. Must be before the end date
-     * 
+     *
      * @param start
      *            The start date of the event
      */
@@ -72,16 +72,16 @@ public interface EditableCalendarEvent extends CalendarEvent {
 
     /**
      * Set the style name for the event used for styling the event cells
-     * 
+     *
      * @param styleName
      *            The stylename to use
-     * 
+     *
      */
     void setStyleName(String styleName);
 
     /**
      * Does the event span the whole day. If so then set this to true
-     * 
+     *
      * @param isAllDay
      *            True if the event spans the whole day. In this case the start
      *            and end times are ignored.
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
index 41250a61e5..db8cc3627e 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.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.ui.components.calendar.CalendarComponentEvents.BackwardHandler
 
 /**
  * Implements basic functionality needed to enable backwards navigation.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -33,7 +33,7 @@ public class BasicBackwardHandler implements BackwardHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler#
      * backward
@@ -81,7 +81,7 @@ public class BasicBackwardHandler implements BackwardHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
index 8d366ed52f..a42d741b04 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.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.ui.components.calendar.CalendarComponentEvents.DateClickHandle
 /**
  * Implements basic functionality needed to switch to day view when a single day
  * is clicked.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -33,7 +33,7 @@ public class BasicDateClickHandler implements DateClickHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler
      * #dateClick
@@ -55,7 +55,7 @@ public class BasicDateClickHandler implements DateClickHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
index 5a9c27300b..b9f2758f1d 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.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.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable moving events.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -33,7 +33,7 @@ public class BasicEventMoveHandler implements EventMoveHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventMoveHandler
      * #eventMove
@@ -59,7 +59,7 @@ public class BasicEventMoveHandler implements EventMoveHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
index 6141c84c5b..96055fa3b6 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.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.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable event resizing.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -33,7 +33,7 @@ public class BasicEventResizeHandler implements EventResizeHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.EventResizeHandler
      * #eventResize
@@ -55,7 +55,7 @@ public class BasicEventResizeHandler implements EventResizeHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
index 6ba405364f..242ceca573 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.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.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
 
 /**
  * Implements basic functionality needed to enable forward navigation.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -33,7 +33,7 @@ public class BasicForwardHandler implements ForwardHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler#
      * forward
      * (com.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent)
@@ -79,7 +79,7 @@ public class BasicForwardHandler implements ForwardHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
index c52d0a5a82..824204f632 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandle
 /**
  * Implements basic functionality needed to change to week view when a week
  * number is clicked.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd.
  */
@@ -34,7 +34,7 @@ public class BasicWeekClickHandler implements WeekClickHandler {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see
      * com.vaadin.addon.calendar.ui.CalendarComponentEvents.WeekClickHandler
      * #weekClick
@@ -66,7 +66,7 @@ public class BasicWeekClickHandler implements WeekClickHandler {
 
     /**
      * Set the start and end dates for the event
-     * 
+     *
      * @param event
      *            The event that the start and end dates should be set
      * @param start
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
index b55b55357f..b94c267b47 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.Component.Event;
 /**
  * The color changed event which is passed to the listeners when a color change
  * occurs.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorChangeEvent extends Event {
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
index 6db148989c..316935a727 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.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,16 +24,16 @@ import java.io.Serializable;
  * component using the component's <code>addColorChangeListener</code> method.
  * When the colorChange event occurs, that object's appropriate method is
  * invoked.
- * 
+ *
  * @since 7.0.0
- * 
+ *
  * @see ColorChangeEvent
  */
 public interface ColorChangeListener extends Serializable {
 
     /**
      * Called when a new color has been selected.
-     * 
+     *
      * @param event
      *            An event containing information about the color change.
      */
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
index dac20cba42..7bdf7afcdc 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.AbstractComponent;
 
 /**
  * A component that represents a color gradient within a color picker.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorPickerGradient extends AbstractComponent
@@ -77,7 +77,7 @@ public class ColorPickerGradient extends AbstractComponent
 
     /**
      * Instantiates a new color picker gradient.
-     * 
+     *
      * @param id
      *            the id
      * @param converter
@@ -114,7 +114,7 @@ public class ColorPickerGradient extends AbstractComponent
 
     /**
      * Sets the background color.
-     * 
+     *
      * @param color
      *            the new background color
      */
@@ -129,7 +129,7 @@ public class ColorPickerGradient extends AbstractComponent
 
     /**
      * Notifies the listeners that the color has changed
-     * 
+     *
      * @param color
      *            The color which it changed to
      */
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
index fdeb4ce8ff..41c1cacf36 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.AbstractComponent;
 
 /**
  * A component that represents a color selection grid within a color picker.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorPickerGrid extends AbstractComponent
@@ -99,7 +99,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Instantiates a new color picker grid.
-     * 
+     *
      * @param rows
      *            the rows
      * @param columns
@@ -114,7 +114,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Instantiates a new color picker grid.
-     * 
+     *
      * @param colors
      *            the colors
      */
@@ -163,7 +163,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Sets the color grid.
-     * 
+     *
      * @param colors
      *            the new color grid
      */
@@ -184,7 +184,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Adds a color change listener
-     * 
+     *
      * @param listener
      *            The color change listener
      */
@@ -200,7 +200,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Removes a color change listener
-     * 
+     *
      * @param listener
      *            The listener
      */
@@ -219,7 +219,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Sets the position.
-     * 
+     *
      * @param x
      *            the x
      * @param y
@@ -234,7 +234,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Gets the position.
-     * 
+     *
      * @return the position
      */
     public int[] getPosition() {
@@ -243,7 +243,7 @@ public class ColorPickerGrid extends AbstractComponent
 
     /**
      * Notifies the listeners that a color change has occurred
-     * 
+     *
      * @param color
      *            The color which it changed to
      */
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
index 9c1f252c5a..e1b312c1e5 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.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.CustomComponent;
 
 /**
  * A component that represents color selection history within a color picker.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorPickerHistory extends CustomComponent
@@ -167,7 +167,7 @@ public class ColorPickerHistory extends CustomComponent
 
     /**
      * Gets the history.
-     * 
+     *
      * @return the history
      */
     public List<Color> getHistory() {
@@ -178,10 +178,10 @@ public class ColorPickerHistory extends CustomComponent
 
     /**
      * Checks if the history contains given color.
-     * 
+     *
      * @param c
      *            the color
-     * 
+     *
      * @return true, if successful
      */
     public boolean hasColor(Color c) {
@@ -190,7 +190,7 @@ public class ColorPickerHistory extends CustomComponent
 
     /**
      * Adds a color change listener
-     * 
+     *
      * @param listener
      *            The listener
      */
@@ -201,7 +201,7 @@ public class ColorPickerHistory extends CustomComponent
 
     /**
      * Removes a color change listener
-     * 
+     *
      * @param listener
      *            The listener
      */
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
index 2fed3faae3..75773ee85c 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.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.ui.CssLayout;
 
 /**
  * A component that represents color selection preview within a color picker.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorPickerPreview extends CssLayout
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 5ae3173ce0..f247e9c6a7 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
@@ -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.ui.VerticalLayout;
 
 /**
  * A component that represents color selection swatches within a color picker.
- * 
+ *
  * @since 7.0.0
  */
 public class ColorPickerSelect extends CustomComponent
@@ -48,7 +48,7 @@ public class ColorPickerSelect extends CustomComponent
 
         /**
          * Instantiates a new color range property id.
-         * 
+         *
          * @param caption
          *            the caption
          */
@@ -64,7 +64,7 @@ public class ColorPickerSelect extends CustomComponent
 
     /**
      * Instantiates a new color picker select.
-     * 
+     *
      * @param rows
      *            the rows
      * @param columns
@@ -101,12 +101,12 @@ public class ColorPickerSelect extends CustomComponent
 
     /**
      * Creates the all colors.
-     * 
+     *
      * @param rows
      *            the rows
      * @param columns
      *            the columns
-     * 
+     *
      * @return the color[][]
      */
     private Color[][] createAllColors(int rows, int columns) {
@@ -151,14 +151,14 @@ public class ColorPickerSelect extends CustomComponent
 
     /**
      * Creates the color.
-     * 
+     *
      * @param color
      *            the color
      * @param rows
      *            the rows
      * @param columns
      *            the columns
-     * 
+     *
      * @return the color[][]
      */
     private Color[][] createColors(Color color, int rows, int columns) {
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
index c282c22f62..28e6781aee 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.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
@@ -21,14 +21,14 @@ import com.vaadin.shared.ui.colorpicker.Color;
 
 /**
  * An interface for a color selector.
- * 
+ *
  * @since 7.0.0
  */
 public interface ColorSelector extends Serializable, HasColorChangeListener {
 
     /**
      * Sets the color.
-     * 
+     *
      * @param color
      *            the new color
      */
@@ -36,7 +36,7 @@ public interface ColorSelector extends Serializable, HasColorChangeListener {
 
     /**
      * Gets the color.
-     * 
+     *
      * @return the color
      */
     public Color getColor();
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
index eb16d8cbbe..c34a191175 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.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
@@ -21,14 +21,14 @@ public interface HasColorChangeListener extends Serializable {
 
     /**
      * Adds a {@link ColorChangeListener} to the component.
-     * 
+     *
      * @param listener
      */
     void addColorChangeListener(ColorChangeListener listener);
 
     /**
      * Removes a {@link ColorChangeListener} from the component.
-     * 
+     *
      * @param listener
      */
     void removeColorChangeListener(ColorChangeListener listener);
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 5c81a1efa2..7641a84cf2 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/Design.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/Design.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
@@ -45,18 +45,18 @@ import com.vaadin.ui.declarative.DesignContext.ComponentCreationListener;
  * Design is used for reading a component hierarchy from an html string or input
  * stream and, conversely, for writing an html representation corresponding to a
  * given component hierarchy.
- * 
+ *
  * <p>
  * In html form a valid nonempty component hierarchy contains a single root
  * element located under the &lt;body&gt; tag. A hierarchy of components is
  * achieved by nesting other elements under the root element. An empty component
  * hierarchy is represented as no elements under the &lt;body&gt; tag.
- * 
+ *
  * <p>
  * For writing a component hierarchy the root element is specified as a
  * Component parameter or as a DesignContext object containing the root
  * Component. An empty hierarchy can be written by giving a null root Component.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -73,19 +73,19 @@ public class Design implements Serializable {
      * <p>
      * Use {@link Design#setComponentFactory(ComponentFactory)} to configure
      * Vaadin to use a custom component factory.
-     * 
+     *
      * @since 7.4.1
      */
     public interface ComponentFactory extends Serializable {
         /**
          * Creates a component based on the fully qualified name derived from
          * the tag name in the design.
-         * 
+         *
          * @param fullyQualifiedClassName
          *            the fully qualified name of the component to create
          * @param context
          *            the design context for which the component is created
-         * 
+         *
          * @return a newly created component
          */
         public Component createComponent(String fullyQualifiedClassName,
@@ -98,7 +98,7 @@ public class Design implements Serializable {
      * <p>
      * Use {@link Design#setComponentMapper(ComponentMapper)} to configure
      * Vaadin to use a custom component mapper.
-     * 
+     *
      * @since 7.5.0
      * @author Vaadin Ltd
      */
@@ -111,7 +111,7 @@ public class Design implements Serializable {
          * {@link #componentToTag(Component, DesignContext)} so that the
          * resolved tag for a created component is the same as the tag for which
          * the component was created.
-         * 
+         *
          * @param tag
          *            the tag name to create a component for
          * @param componentFactory
@@ -126,7 +126,7 @@ public class Design implements Serializable {
 
         /**
          * Resolves a tag name from a component.
-         * 
+         *
          * @param component
          *            the component to get a tag name for
          * @param context
@@ -141,7 +141,7 @@ public class Design implements Serializable {
      * Default implementation of {@link ComponentFactory}, using
      * <code>Class.forName(className).newInstance()</code> for finding the
      * component class and creating a component instance.
-     * 
+     *
      * @since 7.4.1
      */
     public static class DefaultComponentFactory implements ComponentFactory {
@@ -182,7 +182,7 @@ public class Design implements Serializable {
         /**
          * Resolves a component class based on the fully qualified name of the
          * class.
-         * 
+         *
          * @param qualifiedClassName
          *            the fully qualified name of the resolved class
          * @param context
@@ -204,7 +204,7 @@ public class Design implements Serializable {
 
     /**
      * Default implementation of {@link ComponentMapper},
-     * 
+     *
      * @since 7.5.0
      */
     public static class DefaultComponentMapper implements ComponentMapper {
@@ -284,7 +284,7 @@ public class Design implements Serializable {
          * name. The name is derived by converting each uppercase letter to
          * lowercase and inserting a dash before the letter. No dash is inserted
          * before the first letter of the class name.
-         * 
+         *
          * @param className
          *            the name of the class without a package name
          * @return the html tag name corresponding to className
@@ -315,10 +315,10 @@ public class Design implements Serializable {
      * <p>
      * Please note that this setting is global, so care should be taken to avoid
      * conflicting changes.
-     * 
+     *
      * @param componentFactory
      *            the component factory to set; not <code>null</code>
-     * 
+     *
      * @since 7.4.1
      */
     public static void setComponentFactory(ComponentFactory componentFactory) {
@@ -331,11 +331,11 @@ public class Design implements Serializable {
 
     /**
      * Gets the currently used component factory.
-     * 
+     *
      * @see #setComponentFactory(ComponentFactory)
-     * 
+     *
      * @return the component factory
-     * 
+     *
      * @since 7.4.1
      */
     public static ComponentFactory getComponentFactory() {
@@ -348,10 +348,10 @@ public class Design implements Serializable {
      * <p>
      * Please note that this setting is global, so care should be taken to avoid
      * conflicting changes.
-     * 
+     *
      * @param componentMapper
      *            the component mapper to set; not <code>null</code>
-     * 
+     *
      * @since 7.5.0
      */
     public static void setComponentMapper(ComponentMapper componentMapper) {
@@ -364,11 +364,11 @@ public class Design implements Serializable {
 
     /**
      * Gets the currently used component mapper.
-     * 
+     *
      * @see #setComponentMapper(ComponentMapper)
-     * 
+     *
      * @return the component mapper
-     * 
+     *
      * @since 7.5.0
      */
     public static ComponentMapper getComponentMapper() {
@@ -377,7 +377,7 @@ public class Design implements Serializable {
 
     /**
      * Parses the given input stream into a jsoup document
-     * 
+     *
      * @param html
      *            the stream containing the design
      * @return the parsed jsoup document
@@ -396,12 +396,12 @@ public class Design implements Serializable {
     /**
      * Constructs a component hierarchy from the design specified as an html
      * tree.
-     * 
+     *
      * <p>
      * If a component root is given, the component instances created during
      * reading the design are assigned to its member fields based on their id,
      * local id, and caption
-     * 
+     *
      * @param doc
      *            the html tree
      * @param componentRoot
@@ -424,12 +424,12 @@ public class Design implements Serializable {
     /**
      * Constructs a component hierarchy from the design specified as an html
      * tree.
-     * 
+     *
      * <p>
      * If a component root is given, the component instances created during
      * reading the design are assigned to its member fields based on their id,
      * local id, and caption
-     * 
+     *
      * @param doc
      *            the html tree
      * @param componentRoot
@@ -504,8 +504,8 @@ public class Design implements Serializable {
      * the root designContext.getRootComponent(). The hierarchy is stored under
      * &lt;body&gt; in the tree. The generated tree represents a valid html
      * document.
-     * 
-     * 
+     *
+     *
      * @param designContext
      *            a DesignContext object specifying the root component
      *            (designContext.getRootComponent()) of the hierarchy
@@ -549,7 +549,7 @@ public class Design implements Serializable {
      * id/local id/caption in the design file.
      * <p>
      * The type of the root component must match the root element in the design
-     * 
+     *
      * @param rootComponent
      *            The root component of the layout
      * @return The design context used in the load operation
@@ -603,7 +603,7 @@ public class Design implements Serializable {
     /**
      * Find the first class with the given annotation, starting the search from
      * the given class and moving upwards in the class hierarchy.
-     * 
+     *
      * @param componentClass
      *            the class to check
      * @param annotationClass
@@ -640,7 +640,7 @@ public class Design implements Serializable {
      * id/local id/caption in the design file.
      * <p>
      * The type of the root component must match the root element in the design.
-     * 
+     *
      * @param filename
      *            The file name to load. Loaded from the same package as the
      *            root component
@@ -681,7 +681,7 @@ public class Design implements Serializable {
      * <p>
      * If rootComponent is not null, its type must match the type of the root
      * element in the design
-     * 
+     *
      * @param stream
      *            The stream to read the design from
      * @param rootComponent
@@ -703,7 +703,7 @@ public class Design implements Serializable {
 
     /**
      * Loads a design from the given input stream
-     * 
+     *
      * @param design
      *            The stream to read the design from
      * @return The root component of the design
@@ -716,7 +716,7 @@ public class Design implements Serializable {
     /**
      * Writes the given component tree in design format to the given output
      * stream.
-     * 
+     *
      * @param component
      *            the root component of the component tree, null can be used for
      *            generating an empty design
@@ -737,7 +737,7 @@ public class Design implements Serializable {
      * Writes the component, given in the design context, in design format to
      * the given output stream. The design context is used for writing local ids
      * and other information not available in the component tree.
-     * 
+     *
      * @param designContext
      *            The DesignContext object specifying the component hierarchy
      *            and the local id values of the objects. If
@@ -757,7 +757,7 @@ public class Design implements Serializable {
 
     /**
      * Writes the given jsoup document to the output stream (in UTF-8)
-     * 
+     *
      * @param doc
      *            the document to write
      * @param outputStream
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
index 34ed98f113..72cc2bf356 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.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
@@ -45,7 +45,7 @@ import com.vaadin.ui.Alignment;
  * Default attribute handler implementation used when parsing designs to
  * component trees. Handles all the component attributes that do not require
  * custom handling.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -63,7 +63,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Returns the currently used formatter. All primitive types and all types
      * needed by Vaadin components are handled by that formatter.
-     * 
+     *
      * @return An instance of the formatter.
      */
     public static DesignFormatter getFormatter() {
@@ -72,7 +72,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Clears the children and attributes of the given element
-     * 
+     *
      * @param design
      *            the element to be cleared
      */
@@ -90,7 +90,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Assigns the specified design attribute to the given component.
-     * 
+     *
      * @param target
      *            the target to which the attribute should be set
      * @param attribute
@@ -133,7 +133,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Searches for supported setter and getter types from the specified class
      * and returns the list of corresponding design attributes
-     * 
+     *
      * @param clazz
      *            the class scanned for setters
      * @return the list of supported design attributes
@@ -147,7 +147,7 @@ public class DesignAttributeHandler implements Serializable {
      * Resolves the supported attributes and corresponding getters and setters
      * for the class using introspection. After resolving, the information is
      * cached internally by this class
-     * 
+     *
      * @param clazz
      *            the class to resolve the supported attributes for
      */
@@ -184,7 +184,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Writes the specified attribute to the design if it differs from the
      * default value got from the <code> defaultInstance <code>
-     * 
+     *
      * @param component
      *            the component used to get the attribute value
      * @param attribute
@@ -219,7 +219,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Writes the given attribute value to a set of attributes if it differs
      * from the default attribute value.
-     * 
+     *
      * @param attribute
      *            the attribute key
      * @param attributes
@@ -252,7 +252,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Reads the given attribute from a set of attributes. If attribute does not
      * exist return a given default value.
-     * 
+     *
      * @param attribute
      *            the attribute key
      * @param attributes
@@ -275,7 +275,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Reads the given attribute from a set of attributes.
-     * 
+     *
      * @param attribute
      *            the attribute key
      * @param attributes
@@ -307,7 +307,7 @@ public class DesignAttributeHandler implements Serializable {
      * Returns the design attribute name corresponding the given method name.
      * For example given a method name <code>setPrimaryStyleName</code> the
      * return value would be <code>primary-style-name</code>
-     * 
+     *
      * @param propertyName
      *            the property name returned by {@link IntroSpector}
      * @return the design attribute name corresponding the given method name
@@ -329,7 +329,7 @@ public class DesignAttributeHandler implements Serializable {
      * Replaces subsequent UPPERCASE strings of length 2 or more followed either
      * by another uppercase letter or an end of string. This is to generalise
      * handling of method names like <tt>showISOWeekNumbers</tt>.
-     * 
+     *
      * @param param
      *            Input string.
      * @return Input string with sequences of UPPERCASE turned into Normalcase.
@@ -366,7 +366,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Serializes the given value to valid design attribute representation
-     * 
+     *
      * @param sourceType
      *            the type of the value
      * @param value
@@ -391,7 +391,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Returns a setter that can be used for assigning the given design
      * attribute to the class
-     * 
+     *
      * @param clazz
      *            the class that is scanned for setters
      * @param attribute
@@ -407,7 +407,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Returns a getter that can be used for reading the given design attribute
      * value from the class
-     * 
+     *
      * @param clazz
      *            the class that is scanned for getters
      * @param attribute
@@ -423,7 +423,7 @@ public class DesignAttributeHandler implements Serializable {
     /**
      * Cache object for caching supported attributes and their getters and
      * setters
-     * 
+     *
      * @author Vaadin Ltd
      */
     private static class AttributeCacheEntry implements Serializable {
@@ -456,7 +456,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Read the alignment from the given child component attributes.
-     * 
+     *
      * @since 7.6.4
      * @param attr
      *            the child component attributes
@@ -484,7 +484,7 @@ public class DesignAttributeHandler implements Serializable {
 
     /**
      * Writes the alignment to the given child element attributes.
-     * 
+     *
      * @since 7.6.4
      * @param childElement
      *            the child element
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
index d153e1b13e..a9eeddb416 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.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
@@ -44,13 +44,13 @@ import com.vaadin.ui.declarative.Design.ComponentMapper;
  * mappings from local ids, global ids and captions to components , as well as a
  * mapping between prefixes and package names (such as "vaadin" ->
  * "com.vaadin.ui").
- * 
+ *
  * Versions prior to 7.6 use "v" as the default prefix. Versions starting with
  * 7.6 support reading designs with either "v" or "vaadin" as the prefix, but
  * only write "vaadin" by default. Writing with the legacy prefix can be
  * activated with the property or context parameter
  * {@link Constants#SERVLET_PARAMETER_LEGACY_DESIGN_PREFIX}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -111,7 +111,7 @@ public class DesignContext implements Serializable {
     /**
      * Returns a component having the specified local id. If no component is
      * found, returns null.
-     * 
+     *
      * @param localId
      *            The local id of the component
      * @return a component whose local id equals localId
@@ -123,7 +123,7 @@ public class DesignContext implements Serializable {
     /**
      * Returns a component having the specified global id. If no component is
      * found, returns null.
-     * 
+     *
      * @param globalId
      *            The global id of the component
      * @return a component whose global id equals globalId
@@ -135,7 +135,7 @@ public class DesignContext implements Serializable {
     /**
      * Returns a component having the specified caption. If no component is
      * found, returns null.
-     * 
+     *
      * @param caption
      *            The caption of the component
      * @return a component whose caption equals the caption given as a parameter
@@ -148,15 +148,15 @@ public class DesignContext implements Serializable {
      * Creates a mapping between the given global id and the component. Returns
      * true if globalId was already mapped to some component. Otherwise returns
      * false. Also sets the id of the component to globalId.
-     * 
+     *
      * If there is a mapping from the component to a global id (gid) different
      * from globalId, the mapping from gid to component is removed.
-     * 
+     *
      * If the string was mapped to a component c different from the given
      * component, the mapping from c to the string is removed. Similarly, if
      * component was mapped to some string s different from globalId, the
      * mapping from s to component is removed.
-     * 
+     *
      * @param globalId
      *            The new global id of the component.
      * @param component
@@ -182,19 +182,19 @@ public class DesignContext implements Serializable {
      * Creates a mapping between the given local id and the component. Returns
      * true if localId was already mapped to some component or if component was
      * mapped to some string. Otherwise returns false.
-     * 
+     *
      * If the string was mapped to a component c different from the given
      * component, the mapping from c to the string is removed. Similarly, if
      * component was mapped to some string s different from localId, the mapping
      * from s to component is removed.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param component
      *            The component whose local id is to be set.
      * @param localId
      *            The new local id of the component.
-     * 
+     *
      * @return true, if there already was a local id mapping from the string to
      *         some component or from the component to some string. Otherwise
      *         returns false.
@@ -206,9 +206,9 @@ public class DesignContext implements Serializable {
 
     /**
      * Returns the local id for a component.
-     * 
+     *
      * @since 7.5.0
-     * 
+     *
      * @param component
      *            The component whose local id to get.
      * @return the local id of the component, or null if the component has no
@@ -221,13 +221,13 @@ public class DesignContext implements Serializable {
     /**
      * Creates a mapping between the given caption and the component. Returns
      * true if caption was already mapped to some component.
-     * 
+     *
      * Note that unlike mapGlobalId, if some component already has the given
      * caption, the caption is not cleared from the component. This allows
      * non-unique captions. However, only one of the components corresponding to
      * a given caption can be found using the map captionToComponent. Hence, any
      * captions that are used to identify an object should be unique.
-     * 
+     *
      * @param caption
      *            The new caption of the component.
      * @param component
@@ -245,10 +245,10 @@ public class DesignContext implements Serializable {
      * value v different from the given value, the mapping from v to key is
      * removed. Similarly, if value was mapped to some key k different from key,
      * the mapping from k to value is removed.
-     * 
+     *
      * Returns true if there already was a mapping from key to some value v or
      * if there was a mapping from value to some key k. Otherwise returns false.
-     * 
+     *
      * @param key
      *            The new key in keyToValue.
      * @param value
@@ -275,18 +275,18 @@ public class DesignContext implements Serializable {
 
     /**
      * Creates a two-way mapping between a prefix and a package name.
-     * 
+     *
      * Note that modifying the mapping for {@value #VAADIN_UI_PACKAGE} may
      * invalidate the backwards compatibility mechanism supporting reading such
      * components with either {@value #LEGACY_PREFIX} or {@value #VAADIN_PREFIX}
      * as prefix.
-     * 
+     *
      * @param prefix
      *            the prefix name without an ending dash (for instance, "vaadin"
      *            is by default used for "com.vaadin.ui")
      * @param packageName
      *            the name of the package corresponding to prefix
-     * 
+     *
      * @see #getPackagePrefixes()
      * @see #getPackagePrefix(String)
      * @see #getPackage(String)
@@ -299,10 +299,10 @@ public class DesignContext implements Serializable {
     /**
      * Gets the prefix mapping for a given package, or <code>null</code> if
      * there is no mapping for the package.
-     * 
+     *
      * @see #addPackagePrefix(String, String)
      * @see #getPackagePrefixes()
-     * 
+     *
      * @since 7.5.0
      * @param packageName
      *            the package name to get a prefix for
@@ -319,8 +319,8 @@ public class DesignContext implements Serializable {
 
     /**
      * Gets all registered package prefixes.
-     * 
-     * 
+     *
+     *
      * @since 7.5.0
      * @see #getPackage(String)
      * @return a collection of package prefixes
@@ -332,7 +332,7 @@ public class DesignContext implements Serializable {
     /**
      * Gets the package corresponding to the give prefix, or <code>null</code>
      * no package has been registered for the prefix
-     * 
+     *
      * @since 7.5.0
      * @see #addPackagePrefix(String, String)
      * @param prefix
@@ -347,7 +347,7 @@ public class DesignContext implements Serializable {
     /**
      * Returns the default instance for the given class. The instance must not
      * be modified by the caller.
-     * 
+     *
      * @param abstractComponent
      * @return the default instance for the given class. The return value must
      *         not be modified by the caller
@@ -413,7 +413,7 @@ public class DesignContext implements Serializable {
      * the specified document.
      * <p>
      * The prefixes are stored as <meta> tags under <head> in the document.
-     * 
+     *
      * @param doc
      *            the Jsoup document tree where the package mappings are written
      */
@@ -438,7 +438,7 @@ public class DesignContext implements Serializable {
      * be used when writing designs. The property or context parameter
      * {@link Constants#SERVLET_PARAMETER_LEGACY_DESIGN_PREFIX} can be used to
      * switch to the legacy prefix.
-     * 
+     *
      * @since 7.5.7
      * @return true to use the legacy prefix, false by default
      */
@@ -463,7 +463,7 @@ public class DesignContext implements Serializable {
      * initializes its attributes by calling writeDesign. As a result of the
      * writeDesign() call, this method creates the entire subtree rooted at the
      * returned Node.
-     * 
+     *
      * @param childComponent
      *            The component with state that is written in to the node
      * @return An html tree node corresponding to the given component. The tag
@@ -488,7 +488,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Reads the given design node and creates the corresponding component tree
-     * 
+     *
      * @param componentDesign
      *            The design element containing the description of the component
      *            to be created.
@@ -503,13 +503,13 @@ public class DesignContext implements Serializable {
     }
 
     /**
-     * 
+     *
      * Reads the given design node and populates the given component with the
      * corresponding component tree
      * <p>
      * Additionally registers the component id, local id and caption of the
      * given component and all its children in the context
-     * 
+     *
      * @param componentDesign
      *            The design element containing the description of the component
      *            to be created
@@ -551,7 +551,7 @@ public class DesignContext implements Serializable {
     /**
      * Creates a Component corresponding to the given node. Does not set the
      * attributes for the created object.
-     * 
+     *
      * @param node
      *            a node of an html tree
      * @return a Component corresponding to node, with no attributes set.
@@ -580,7 +580,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Instantiates given class via ComponentFactory.
-     * 
+     *
      * @param qualifiedClassName
      *            class name to instantiate
      * @return instance of a given class
@@ -600,7 +600,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Returns the root component of a created component hierarchy.
-     * 
+     *
      * @return the root component of the hierarchy
      */
     public Component getRootComponent() {
@@ -609,7 +609,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Sets the root component of a created component hierarchy.
-     * 
+     *
      * @param rootComponent
      *            the root component of the hierarchy
      */
@@ -620,7 +620,7 @@ public class DesignContext implements Serializable {
     /**
      * Adds a component creation listener. The listener will be notified when
      * components are created while parsing a design template
-     * 
+     *
      * @param listener
      *            the component creation listener to be added
      */
@@ -631,7 +631,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Removes a component creation listener.
-     * 
+     *
      * @param listener
      *            the component creation listener to be removed
      */
@@ -642,7 +642,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Fires component creation event
-     * 
+     *
      * @param localId
      *            localId of the component
      * @param component
@@ -659,14 +659,14 @@ public class DesignContext implements Serializable {
 
     /**
      * Interface to be implemented by component creation listeners
-     * 
+     *
      * @author Vaadin Ltd
      */
     public interface ComponentCreationListener extends Serializable {
 
         /**
          * Called when component has been created in the design context
-         * 
+         *
          * @param event
          *            the component creation event containing information on the
          *            created component
@@ -677,7 +677,7 @@ public class DesignContext implements Serializable {
     /**
      * Component creation event that is fired when a component is created in the
      * context
-     * 
+     *
      * @author Vaadin Ltd
      */
     public class ComponentCreatedEvent implements Serializable {
@@ -687,7 +687,7 @@ public class DesignContext implements Serializable {
 
         /**
          * Creates a new instance of ComponentCreatedEvent
-         * 
+         *
          * @param localId
          *            the local id of the created component
          * @param component
@@ -701,7 +701,7 @@ public class DesignContext implements Serializable {
 
         /**
          * Returns the local id of the created component or null if not exist
-         * 
+         *
          * @return the localId
          */
         public String getLocalId() {
@@ -710,7 +710,7 @@ public class DesignContext implements Serializable {
 
         /**
          * Returns the created component
-         * 
+         *
          * @return the component
          */
         public Component getComponent() {
@@ -721,7 +721,7 @@ public class DesignContext implements Serializable {
     /**
      * Helper method for component write implementors to determine whether their
      * children should be written out or not
-     * 
+     *
      * @param c
      *            The component being written
      * @param defaultC
@@ -751,7 +751,7 @@ public class DesignContext implements Serializable {
      * delegate assumes that all component data is provided by a data source
      * connected to a back end system and that the data should thus not be
      * written.
-     * 
+     *
      * @since 7.5.0
      * @see #setShouldWriteDataDelegate(ShouldWriteDataDelegate)
      * @param component
@@ -766,7 +766,7 @@ public class DesignContext implements Serializable {
     /**
      * Sets the delegate that determines whether the container data of a
      * component should be written out.
-     * 
+     *
      * @since 7.5.0
      * @see #shouldWriteChildren(Component, Component)
      * @see #getShouldWriteDataDelegate()
@@ -786,7 +786,7 @@ public class DesignContext implements Serializable {
     /**
      * Gets the delegate that determines whether the container data of a
      * component should be written out.
-     * 
+     *
      * @since 7.5.0
      * @see #setShouldWriteDataDelegate(ShouldWriteDataDelegate)
      * @see #shouldWriteChildren(Component, Component)
@@ -798,7 +798,7 @@ public class DesignContext implements Serializable {
 
     /**
      * Gets the attributes that the component did not handle
-     * 
+     *
      * @since 7.7
      * @param component
      *            the component to get the attributes for
@@ -811,7 +811,7 @@ public class DesignContext implements Serializable {
     /**
      * Sets a custom attribute not handled by the component. These attributes
      * are directly written to the component tag.
-     * 
+     *
      * @since 7.7
      * @param component
      *            the component to set the attribute for
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignException.java b/server/src/main/java/com/vaadin/ui/declarative/DesignException.java
index 85204cad14..b80e13ef0a 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignException.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignException.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
@@ -18,7 +18,7 @@ package com.vaadin.ui.declarative;
 @SuppressWarnings("serial")
 /**
  * An exception that is used when reading or writing a design fails.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
index bced72f98f..64a9ed0dd4 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.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
@@ -49,7 +49,7 @@ import com.vaadin.ui.declarative.converters.DesignToStringConverter;
  * Class focused on flexible and consistent formatting and parsing of different
  * values throughout reading and writing {@link Design}. An instance of this
  * class is used by {@link DesignAttributeHandler}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -68,7 +68,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Maps default types to their converters.
-     * 
+     *
      */
     protected void mapDefaultTypes() {
         // numbers use standard toString/valueOf approach
@@ -206,7 +206,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Adds a converter for a new type.
-     * 
+     *
      * @param converter
      *            Converter to add.
      */
@@ -216,7 +216,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Adds a converter for a given type.
-     * 
+     *
      * @param type
      *            Type to convert to/from.
      * @param converter
@@ -229,7 +229,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Removes the converter for given type, if it was present.
-     * 
+     *
      * @param type
      *            Type to remove converter for.
      */
@@ -241,7 +241,7 @@ public class DesignFormatter implements Serializable {
      * Returns a set of classes that have a converter registered. This is <b>not
      * the same</b> as the list of supported classes - subclasses of classes in
      * this set are also supported.
-     * 
+     *
      * @return An unmodifiable set of classes that have a converter registered.
      */
     protected Set<Class<?>> getRegisteredClasses() {
@@ -250,7 +250,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Parses a given string as a value of given type
-     * 
+     *
      * @param value
      *            String value to convert.
      * @param type
@@ -269,7 +269,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Finds a formatter for a given object and attempts to format it.
-     * 
+     *
      * @param object
      *            Object to format.
      * @return String representation of the object, as returned by the
@@ -282,7 +282,7 @@ public class DesignFormatter implements Serializable {
 
     /**
      * Formats an object according to a converter suitable for a given type.
-     * 
+     *
      * @param object
      *            Object to format.
      * @param type
@@ -303,7 +303,7 @@ public class DesignFormatter implements Serializable {
     /**
      * Checks whether or not a value of a given type can be converted. If a
      * converter for a superclass is found, this will return true.
-     * 
+     *
      * @param type
      *            Type to check.
      * @return <b>true</b> when either a given type or its supertype has a
@@ -316,7 +316,7 @@ public class DesignFormatter implements Serializable {
     /**
      * Finds a converter for a given type. May return a converter for a
      * superclass instead, if one is found and {@code strict} is false.
-     * 
+     *
      * @param sourceType
      *            Type to find a converter for.
      * @param strict
@@ -356,7 +356,7 @@ public class DesignFormatter implements Serializable {
     /**
      * Finds a converter for a given type. May return a converter for a
      * superclass instead, if one is found.
-     * 
+     *
      * @param sourceType
      *            Type to find a converter for.
      * @return A valid converter for a given type or its subtype, <b>null</b> if
@@ -381,7 +381,7 @@ public class DesignFormatter implements Serializable {
      * Typically, this method will be used by components to encode data (like
      * option items in {@link AbstractSelect}) when dumping to HTML format
      * </p>
-     * 
+     *
      * @since 7.5.7
      * @param input
      *            String to be encoded
@@ -400,13 +400,13 @@ public class DesignFormatter implements Serializable {
      * Decodes HTML entities in a text from text node and replaces them with
      * actual characters.
      * </p>
-     * 
+     *
      * <p>
      * Typically this method will be used by components to read back data (like
      * option items in {@link AbstractSelect}) from HTML. Note that this method
      * unencodes more characters than {@link #encodeForTextNode(String)} encodes
      * </p>
-     * 
+     *
      * @since 7.6
      * @param input
      * @return
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 74dca23639..f9955928d9 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.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,7 +31,7 @@ import com.vaadin.ui.Component;
 /**
  * Binder utility that binds member fields of a design class instance to given
  * component instances. Only fields of type {@link Component} are bound
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -44,7 +44,7 @@ public class FieldBinder implements Serializable {
 
     /**
      * Creates a new instance of LayoutFieldBinder.
-     * 
+     *
      * @param design
      *            the design class instance containing the fields to bind
      * @throws IntrospectionException
@@ -56,7 +56,7 @@ public class FieldBinder implements Serializable {
 
     /**
      * Creates a new instance of LayoutFieldBinder.
-     * 
+     *
      * @param design
      *            the instance containing the fields
      * @param classWithFields
@@ -75,7 +75,7 @@ public class FieldBinder implements Serializable {
 
     /**
      * Returns a collection of field names that are not bound.
-     * 
+     *
      * @return a collection of fields assignable to Component that are not bound
      */
     public Collection<String> getUnboundFields() throws FieldBindingException {
@@ -117,7 +117,7 @@ public class FieldBinder implements Serializable {
      * id or caption of the instance, depending on which one is defined. If a
      * field is already bound (not null), {@link FieldBindingException} is
      * thrown.
-     * 
+     *
      * @param instance
      *            the instance to be bound to a field
      * @return true on success, otherwise false
@@ -131,7 +131,7 @@ public class FieldBinder implements Serializable {
     /**
      * Tries to bind the given {@link Component} instance to a member field of
      * the bind target. The fields are matched based on localId, id and caption.
-     * 
+     *
      * @param instance
      *            the instance to be bound to a field
      * @param localId
@@ -163,7 +163,7 @@ public class FieldBinder implements Serializable {
      * the bind target. The field is matched based on the given identifier. If a
      * field is already bound (not null), {@link FieldBindingException} is
      * thrown.
-     * 
+     *
      * @param identifier
      *            the identifier for the field.
      * @param instance
@@ -218,7 +218,7 @@ public class FieldBinder implements Serializable {
     /**
      * Converts the given identifier to a valid field name by stripping away
      * illegal character and setting the first letter of the name to lower case.
-     * 
+     *
      * @param identifier
      *            the identifier to be converted to field name
      * @return the field name corresponding the identifier
@@ -245,7 +245,7 @@ public class FieldBinder implements Serializable {
      * Returns a list containing Field objects reflecting all the fields of the
      * class or interface represented by this Class object. The fields in
      * superclasses are excluded.
-     * 
+     *
      * @param searchClass
      *            the class to be scanned for fields
      * @return the list of fields in this class
diff --git a/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.java b/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.java
index d8b587a14c..12b830ffef 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.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
@@ -18,7 +18,7 @@ package com.vaadin.ui.declarative;
 /**
  * Exception that is thrown when an error occurs during field binding when
  * reading a design template
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
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 9cb1f1c605..5fbcba0d0c 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.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
@@ -22,9 +22,9 @@ import com.vaadin.ui.Component;
 /**
  * Delegate used by {@link DesignContext} to determine whether container data
  * should be written out for a component.
- * 
+ *
  * @see DesignContext#shouldWriteData(Component)
- * 
+ *
  * @since 7.5.0
  * @author Vaadin Ltd
  */
@@ -45,7 +45,7 @@ public interface ShouldWriteDataDelegate extends Serializable {
     /**
      * Determines whether the container data of a component should be written
      * out.
-     * 
+     *
      * @param component
      *            the component to check
      * @return <code>true</code> if container data should be written out for the
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java
index 5fc7c239e1..2ecb24d907 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.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.ui.declarative.DesignAttributeHandler;
 /**
  * A date converter to be used by {@link DesignAttributeHandler}. Provides
  * ISO-compliant way of storing date and time.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java
index 1f14c0571d..0c7b5ece9b 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.declarative.DesignAttributeHandler;
 /**
  * An converter for Enum to/from String for {@link DesignAttributeHandler} to
  * use internally.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java
index cb950aa821..7dfc57d81c 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.declarative.DesignAttributeHandler;
 /**
  * An converter for Object to/from String for {@link DesignAttributeHandler} to
  * use internally.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
index a006d88bf6..83ab235bc8 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.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
@@ -35,7 +35,7 @@ import com.vaadin.ui.declarative.DesignAttributeHandler;
 /**
  * A converter for {@link Resource} implementations supported by
  * {@link DesignAttributeHandler}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java
index 04738f4043..731c264360 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.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.legacy.data.util.converter.LegacyConverter;
 
 /**
  * Converter for {@link ShortcutActions}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java
index 2fe66285c8..0138909857 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.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.ui.declarative.DesignAttributeHandler;
 /**
  * Utility class for {@link DesignAttributeHandler} that deals with converting
  * various TimeZones to string.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
index 8878b1b4f1..771a98e43c 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.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.ui.declarative.DesignAttributeHandler;
 /**
  * Utility class for {@link DesignAttributeHandler} that deals with converting
  * various types to string.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  * @param <TYPE>
@@ -46,7 +46,7 @@ public class DesignToStringConverter<TYPE>
      * Constructs the converter for a given type. Implicitly requires that a
      * static method {@code valueOf(String)} is present in the type to do the
      * conversion.
-     * 
+     *
      * @param type
      *            Type of values to convert.
      */
@@ -57,7 +57,7 @@ public class DesignToStringConverter<TYPE>
     /**
      * Constructs the converter for a given type, giving the name of the public
      * static method that does the conversion from String.
-     * 
+     *
      * @param type
      *            Type to convert.
      * @param staticMethodName
diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java b/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java
index 2940c82c06..7796ce90d7 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.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
@@ -25,7 +25,7 @@ import com.vaadin.event.ShortcutAction.ModifierKey;
 /**
  * Provides mappings between shortcut keycodes and their representation in
  * design attributes. Contains a default framework implementation as a field.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -33,7 +33,7 @@ public interface ShortcutKeyMapper extends Serializable {
 
     /**
      * Gets the key code for a given string.
-     * 
+     *
      * @param attributePresentation
      *            String
      * @return Key code.
@@ -42,7 +42,7 @@ public interface ShortcutKeyMapper extends Serializable {
 
     /**
      * Returns a string for a given key code.
-     * 
+     *
      * @param keyCode
      *            Key code.
      * @return String.
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 f032d13cae..e196d861c1 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.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
@@ -42,7 +42,7 @@ import elemental.json.JsonValue;
  * <code>com_example_SuperRenderer</code> will also be attempted if
  * <code>com_example_MyRenderer</code> has not been defined.
  * <p>
- * 
+ *
  * In addition to the general JavaScript extension functionality explained in
  * {@link AbstractJavaScriptExtension}, this class also provides some
  * functionality specific for renderers.
@@ -90,7 +90,7 @@ import elemental.json.JsonValue;
  * {@link com.vaadin.client.renderers.ComplexRenderer#onBrowserEvent(com.vaadin.client.widget.grid.CellReference, com.google.gwt.dom.client.NativeEvent)}
  * .</li>
  * </ul>
- * 
+ *
  * <p>
  * The cell object passed to functions defined by the renderer has these
  * properties:
@@ -105,7 +105,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>
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.4
  */
@@ -137,7 +137,7 @@ public abstract class AbstractJavaScriptRenderer<T>
      * available as <code>this</code>). Calling that JavaScript function will
      * cause the call method in the registered {@link JavaScriptFunction} to be
      * invoked with the same arguments.
-     * 
+     *
      * @param functionName
      *            the name that should be used for client-side callback
      * @param function
@@ -158,7 +158,7 @@ public abstract class AbstractJavaScriptRenderer<T>
      * before sending. This can be done either with
      * {@link JsonCodec#encode(Object, JsonValue, java.lang.reflect.Type, com.vaadin.ui.ConnectorTracker)}
      * or using the factory methods in {@link Json}.
-     * 
+     *
      * @param name
      *            the name of the function
      * @param arguments
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
index e7e723ebd6..3c24ecab01 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.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
@@ -21,7 +21,7 @@ import elemental.json.JsonValue;
  * A Renderer that displays a button with a textual caption. The value of the
  * corresponding property is used as the caption. Click listeners can be added
  * to the renderer, invoked when any of the rendered buttons is clicked.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -39,7 +39,7 @@ public class ButtonRenderer extends ClickableRenderer<String> {
 
     /**
      * Creates a new button renderer and adds the given click listener to it.
-     * 
+     *
      * @param listener
      *            the click listener to register
      * @param nullRepresentation
diff --git a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
index 7210eb7840..072fe2d471 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.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
@@ -30,10 +30,10 @@ import com.vaadin.util.ReflectTools;
  * An abstract superclass for Renderers that render clickable items. Click
  * listeners can be added to a renderer to be notified when any of the rendered
  * items is clicked.
- * 
+ *
  * @param <T>
  *            the type presented by the renderer
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -42,7 +42,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
     /**
      * An interface for listening to {@link RendererClickEvent renderer click
      * events}.
-     * 
+     *
      * @see {@link ButtonRenderer#addClickListener(RendererClickListener)}
      */
     public interface RendererClickListener extends ConnectorEventListener {
@@ -52,7 +52,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
         /**
          * Called when a rendered button is clicked.
-         * 
+         *
          * @param event
          *            the event representing the click
          */
@@ -76,7 +76,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
         /**
          * Returns the item ID of the row where the click event originated.
-         * 
+         *
          * @return the item ID of the clicked row
          */
         public Object getItemId() {
@@ -85,7 +85,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
         /**
          * Returns the {@link Column} where the click event originated.
-         * 
+         *
          * @return the column of the click event
          */
         public Column getColumn() {
@@ -94,7 +94,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
         /**
          * Returns the property ID where the click event originated.
-         * 
+         *
          * @return the property ID of the clicked cell
          */
         public Object getPropertyId() {
@@ -122,7 +122,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
     /**
      * Adds a click listener to this button renderer. The listener is invoked
      * every time one of the buttons rendered by this renderer is clicked.
-     * 
+     *
      * @param listener
      *            the click listener to be added
      */
@@ -133,7 +133,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
 
     /**
      * Removes the given click listener from this renderer.
-     * 
+     *
      * @param listener
      *            the click listener to be removed
      */
diff --git a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
index 9f846c16e4..0c7acb4c17 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.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
@@ -25,7 +25,7 @@ import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting date values.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -49,7 +49,7 @@ public class DateRenderer extends AbstractRenderer<Date> {
      * <p>
      * The renderer is configured to render with the {@link Date#toString()}
      * representation for the given locale.
-     * 
+     *
      * @param locale
      *            the locale in which to present dates
      * @throws IllegalArgumentException
@@ -82,7 +82,7 @@ public class DateRenderer extends AbstractRenderer<Date> {
      * <p>
      * The renderer is configured to render with the given string format, as
      * displayed in the default locale.
-     * 
+     *
      * @param formatString
      *            the format string with which to format the date
      * @throws IllegalArgumentException
@@ -121,7 +121,7 @@ public class DateRenderer extends AbstractRenderer<Date> {
      * <p>
      * The renderer is configured to render with the given string format, as
      * displayed in the given locale.
-     * 
+     *
      * @param formatString
      *            the format string to format the date with
      * @param locale
@@ -176,7 +176,7 @@ public class DateRenderer extends AbstractRenderer<Date> {
      * Creates a new date renderer.
      * <p>
      * The renderer is configured to render with he given date format.
-     * 
+     *
      * @param dateFormat
      *            the date format to use when rendering dates
      * @throws IllegalArgumentException
diff --git a/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
index 2ec43800c0..bbee5865dd 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.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/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
index dbd73b14ed..87e89af8a5 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.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
@@ -29,7 +29,7 @@ import elemental.json.JsonValue;
  * The image for each rendered cell is read from a Resource-typed property in
  * the data source. Only {@link ExternalResource}s and {@link ThemeResource}s
  * are currently supported.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -44,7 +44,7 @@ public class ImageRenderer extends ClickableRenderer<Resource> {
 
     /**
      * Creates a new image renderer and adds the given click listener to it.
-     * 
+     *
      * @param listener
      *            the click listener to register
      */
diff --git a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
index a795bdc8c1..885cb00f24 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.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/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
index 1566c47222..edcc44c719 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.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/server/src/main/java/com/vaadin/ui/renderers/Renderer.java b/server/src/main/java/com/vaadin/ui/renderers/Renderer.java
index ac85174618..2a4d303ca2 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/Renderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/Renderer.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,10 +26,10 @@ import elemental.json.JsonValue;
  * currently extend the Extension interface, but this fact should be regarded as
  * an implementation detail and subject to change in a future major or minor
  * Vaadin revision.
- * 
+ *
  * @param <T>
  *            the type this renderer knows how to present
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -37,14 +37,14 @@ public interface Renderer<T> extends Extension {
 
     /**
      * Returns the class literal corresponding to the presentation type T.
-     * 
+     *
      * @return the class literal of T
      */
     Class<T> getPresentationType();
 
     /**
      * Encodes the given value into a {@link JsonValue}.
-     * 
+     *
      * @param value
      *            the value to encode
      * @return a JSON representation of the given value
diff --git a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
index ce8a73d057..d2d4b38b2d 100644
--- a/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.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
@@ -20,7 +20,7 @@ import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting simple plain-text string values.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -35,7 +35,7 @@ public class TextRenderer extends AbstractRenderer<String> {
 
     /**
      * Creates a new text renderer
-     * 
+     *
      * @param nullRepresentation
      *            the textual representation of {@code null} value
      */
diff --git a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java
index 9421cf2341..5ec3f9dd88 100644
--- a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.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
@@ -30,9 +30,9 @@ package com.vaadin.ui.themes;
  * <p>
  * All theme class files should follow the convention of specifying the theme
  * name as a string constant <code>THEME_NAME</code>.
- * 
+ *
  * @since 6.3.0
- * 
+ *
  */
 public class BaseTheme {
 
diff --git a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java
index 6e230c426e..766a6b5486 100644
--- a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.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
@@ -313,9 +313,9 @@ public class ChameleonTheme extends BaseTheme {
      * segment, and add "<code>first</code>" and "<code>last</code>" style names
      * for the first and last button in the segment. Then use the
      * {@link #BUTTON_DOWN} style to indicate button states.
-     * 
+     *
      * E.g.
-     * 
+     *
      * <pre>
      * HorizontalLayout ("segment")
      *   + Button ("first down")
@@ -324,7 +324,7 @@ public class ChameleonTheme extends BaseTheme {
      *    ...
      *   + Button ("last")
      * </pre>
-     * 
+     *
      * You can also use most of the different button styles for the contained
      * buttons (e.g. {@link #BUTTON_BIG}, {@link #BUTTON_ICON_ONLY} etc.).
      */
@@ -335,9 +335,9 @@ public class ChameleonTheme extends BaseTheme {
      * {@link #COMPOUND_HORIZONTAL_LAYOUT_SEGMENT} style to make buttons with
      * the "down" style use the themes alternate color (e.g. blue instead of
      * gray).
-     * 
+     *
      * E.g.
-     * 
+     *
      * <pre>
      * HorizontalLayout ("segment segment-alternate")
      *   + Button ("first down")
@@ -352,9 +352,9 @@ public class ChameleonTheme extends BaseTheme {
     /**
      * Creates an iTunes-like menu from a CssLayout or a VerticalLayout. Place
      * plain Labels and NativeButtons inside the layout, and you're all set.
-     * 
+     *
      * E.g.
-     * 
+     *
      * <pre>
      * CssLayout ("sidebar-menu")
      *   + Label
diff --git a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
index 1d7b2a10da..264edd49c5 100644
--- a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
+++ b/server/src/main/java/com/vaadin/ui/themes/Reindeer.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
@@ -20,9 +20,9 @@ public class Reindeer extends BaseTheme {
     public static final String THEME_NAME = "reindeer";
 
     /***************************************************************************
-     * 
+     *
      * Label styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -41,9 +41,9 @@ public class Reindeer extends BaseTheme {
     public static final String LABEL_SMALL = "light";
 
     /***************************************************************************
-     * 
+     *
      * Button styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -59,9 +59,9 @@ public class Reindeer extends BaseTheme {
     public static final String BUTTON_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * TextField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -70,9 +70,9 @@ public class Reindeer extends BaseTheme {
     public static final String TEXTFIELD_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * Panel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -81,9 +81,9 @@ public class Reindeer extends BaseTheme {
     public static final String PANEL_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * ProgressBar Styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -93,9 +93,9 @@ public class Reindeer extends BaseTheme {
     public static final String PROGRESSBAR_STATIC = "static";
 
     /***************************************************************************
-     * 
+     *
      * SplitPanel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -104,9 +104,9 @@ public class Reindeer extends BaseTheme {
     public static final String SPLITPANEL_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * TabSheet styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -138,9 +138,9 @@ public class Reindeer extends BaseTheme {
     public static final String TABSHEET_SELECTED_CLOSABLE = "selected-closable";
 
     /***************************************************************************
-     * 
+     *
      * Table styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -154,9 +154,9 @@ public class Reindeer extends BaseTheme {
     public static final String TABLE_STRONG = "strong";
 
     /***************************************************************************
-     * 
+     *
      * Layout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -192,14 +192,14 @@ public class Reindeer extends BaseTheme {
      * Applies to {@link VerticalLayout}, {@link HorizontalLayout},
      * {@link GridLayout}, {@link FormLayout} and {@link CssLayout}.
      * </p>
-     * 
+     *
      */
     public static final String LAYOUT_BLACK = "black";
 
     /***************************************************************************
-     * 
+     *
      * Window styles
-     * 
+     *
      **************************************************************************/
 
     /**
diff --git a/server/src/main/java/com/vaadin/ui/themes/Runo.java b/server/src/main/java/com/vaadin/ui/themes/Runo.java
index 6f8d5f37d9..e36a7c49af 100644
--- a/server/src/main/java/com/vaadin/ui/themes/Runo.java
+++ b/server/src/main/java/com/vaadin/ui/themes/Runo.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,9 +24,9 @@ public class Runo extends BaseTheme {
     }
 
     /***************************************************************************
-     * 
+     *
      * Button styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -47,9 +47,9 @@ public class Runo extends BaseTheme {
     public static final String BUTTON_DEFAULT = "default";
 
     /***************************************************************************
-     * 
+     *
      * Panel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -58,9 +58,9 @@ public class Runo extends BaseTheme {
     public static final String PANEL_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * ProgressBar Styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -70,9 +70,9 @@ public class Runo extends BaseTheme {
     public static final String PROGRESSBAR_STATIC = "static";
 
     /***************************************************************************
-     * 
+     *
      * TabSheet styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -81,9 +81,9 @@ public class Runo extends BaseTheme {
     public static final String TABSHEET_SMALL = "light";
 
     /***************************************************************************
-     * 
+     *
      * SplitPanel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -99,9 +99,9 @@ public class Runo extends BaseTheme {
     public static final String SPLITPANEL_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * Label styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -123,9 +123,9 @@ public class Runo extends BaseTheme {
     public static final String LABEL_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * Layout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -153,9 +153,9 @@ public class Runo extends BaseTheme {
     public static final String CSSLAYOUT_SELECTABLE_SELECTED = "selectable-selected";
 
     /***************************************************************************
-     * 
+     *
      * TextField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -164,9 +164,9 @@ public class Runo extends BaseTheme {
     public static final String TEXTFIELD_SMALL = "small";
 
     /***************************************************************************
-     * 
+     *
      * Table styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -181,9 +181,9 @@ public class Runo extends BaseTheme {
     public static final String TABLE_BORDERLESS = "borderless";
 
     /***************************************************************************
-     * 
+     *
      * Accordion styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -194,9 +194,9 @@ public class Runo extends BaseTheme {
     public static final String ACCORDION_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * Window styles
-     * 
+     *
      **************************************************************************/
 
     /**
diff --git a/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java
index 3a9986c632..335c9daee8 100644
--- a/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.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
@@ -23,23 +23,23 @@ import com.vaadin.ui.Table.ColumnHeaderMode;
  * <p>
  * Additional style names which can be used with the Valo theme.
  * </p>
- * 
+ *
  * <p>
  * These styles are only available if the
  * <code>$v-included-additional-styles</code> Sass list variable contains the
  * name of the component for that additional style name (e.g.
  * <code>button, textfield, table</code>).
  * </p>
- * 
+ *
  * <p>
  * Most of these additional style names can be included individually into your
  * custom theme using the component specific Sass mixins, in which case you can
  * also define the style names yourself. See the Valo theme Sass API
  * documentation for additional information.
  * </p>
- * 
+ *
  * TODO link to Sass API documentation
- * 
+ *
  * @since 7.3
  * @author Vaadin Ltd
  */
@@ -48,9 +48,9 @@ public class ValoTheme {
     public static final String THEME_NAME = "valo";
 
     /***************************************************************************
-     * 
+     *
      * Notification styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -113,9 +113,9 @@ public class ValoTheme {
     public static final String NOTIFICATION_FAILURE = "failure";
 
     /***************************************************************************
-     * 
+     *
      * Label styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -206,9 +206,9 @@ public class ValoTheme {
 
     /**
      * Spinner style. Add this style name to an empty Label to create a spinner.
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * Label spinner = new Label();
      * spinner.addStyleName(ValoTheme.LABEL_SPINNER);
@@ -217,9 +217,9 @@ public class ValoTheme {
     public static final String LABEL_SPINNER = "spinner";
 
     /***************************************************************************
-     * 
+     *
      * Button styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -307,9 +307,9 @@ public class ValoTheme {
     public static final String BUTTON_ICON_ONLY = "icon-only";
 
     /***************************************************************************
-     * 
+     *
      * Link styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -323,9 +323,9 @@ public class ValoTheme {
     public static final String LINK_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * TextField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -373,9 +373,9 @@ public class ValoTheme {
     public static final String TEXTFIELD_INLINE_ICON = "inline-icon";
 
     /***************************************************************************
-     * 
+     *
      * TextArea styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -417,9 +417,9 @@ public class ValoTheme {
     public static final String TEXTAREA_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * DateField styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -461,9 +461,9 @@ public class ValoTheme {
     public static final String DATEFIELD_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * ComboBox styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -505,9 +505,9 @@ public class ValoTheme {
     public static final String COMBOBOX_ALIGN_CENTER = "align-center";
 
     /***************************************************************************
-     * 
+     *
      * CheckBox styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -521,9 +521,9 @@ public class ValoTheme {
     public static final String CHECKBOX_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * OptionGroup styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -545,9 +545,9 @@ public class ValoTheme {
     public static final String OPTIONGROUP_HORIZONTAL = "horizontal";
 
     /***************************************************************************
-     * 
+     *
      * Slider styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -557,9 +557,9 @@ public class ValoTheme {
     public static final String SLIDER_NO_INDICATOR = "no-indicator";
 
     /***************************************************************************
-     * 
+     *
      * ProgressBar styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -569,9 +569,9 @@ public class ValoTheme {
     public static final String PROGRESSBAR_POINT = "point";
 
     /***************************************************************************
-     * 
+     *
      * MenuBar styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -585,9 +585,9 @@ public class ValoTheme {
     public static final String MENUBAR_BORDERLESS = "borderless";
 
     /***************************************************************************
-     * 
+     *
      * Table and TreeTable styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -669,9 +669,9 @@ public class ValoTheme {
     public static final String TREETABLE_SMALL = TABLE_SMALL;
 
     /***************************************************************************
-     * 
+     *
      * DragAndDropWrapper styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -693,9 +693,9 @@ public class ValoTheme {
     public static final String DRAG_AND_DROP_WRAPPER_NO_HORIZONTAL_DRAG_HINTS = "no-horizontal-drag-hints";
 
     /***************************************************************************
-     * 
+     *
      * Panel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -717,9 +717,9 @@ public class ValoTheme {
     public static final String PANEL_WELL = "well";
 
     /***************************************************************************
-     * 
+     *
      * SplitPanel styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -728,9 +728,9 @@ public class ValoTheme {
     public static final String SPLITPANEL_LARGE = "large";
 
     /***************************************************************************
-     * 
+     *
      * TabSheet styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -783,9 +783,9 @@ public class ValoTheme {
     public static final String TABSHEET_ONLY_SELECTED_TAB_IS_CLOSABLE = "only-selected-closable";
 
     /***************************************************************************
-     * 
+     *
      * Accordion styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -795,9 +795,9 @@ public class ValoTheme {
     public static final String ACCORDION_BORDERLESS = "borderless";
 
     /***************************************************************************
-     * 
+     *
      * Window and related styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -817,9 +817,9 @@ public class ValoTheme {
     public static final String WINDOW_BOTTOM_TOOLBAR = "v-window-bottom-toolbar";
 
     /***************************************************************************
-     * 
+     *
      * FormLayout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -830,9 +830,9 @@ public class ValoTheme {
     public static final String FORMLAYOUT_LIGHT = "light";
 
     /***************************************************************************
-     * 
+     *
      * Layout styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -858,16 +858,16 @@ public class ValoTheme {
     /**
      * Add this style name to a CssLayout to create a grouped set of components,
      * i.e. a row of components which are joined seamlessly together.
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * CssLayout group = new CssLayout();
      * group.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
-     * 
+     *
      * TextField field = new TextField();
      * group.addComponent(field);
-     * 
+     *
      * Button button = new Button(&quot;Action&quot;);
      * group.addComponent(button);
      * </pre>
@@ -875,9 +875,9 @@ public class ValoTheme {
     public static final String LAYOUT_COMPONENT_GROUP = "v-component-group";
 
     /***************************************************************************
-     * 
+     *
      * Valo menu styles
-     * 
+     *
      **************************************************************************/
 
     /**
@@ -885,19 +885,19 @@ public class ValoTheme {
      * When you use the Valo menu and wish to enable responsive features of the
      * menu, you need to add this style name to the UI containing the menu.
      * </p>
-     * 
+     *
      * <p>
      * You only need to add this style name to the UI containing a Valo menu, if
      * you're using the Responsive extension with the UI.
      * </p>
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <p>
      * To enable responsivity in the Valo menu, the following example code
      * should be executed in your UI containing the menu.
      * </p>
-     * 
+     *
      * <pre>
      * Responsive.makeResponsive(this);
      * addStyleName(ValoTheme.UI_WITH_MENU);
@@ -910,7 +910,7 @@ public class ValoTheme {
      * Set the <em><b>primary</b></em> style name of a CssLayout to this, and
      * add any number of layouts with the {@link #MENU_PART} style inside it.
      * </p>
-     * 
+     *
      * <p>
      * The menu style is used to create a sidebar navigation menu for the
      * application, usually action as the main navigation for the different
@@ -918,9 +918,9 @@ public class ValoTheme {
      * {@link #MENU_ITEM}s, and possibly some {@link #MENU_SUBTITLE}s and a
      * {@link #MENU_TITLE}.
      * </p>
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * CssLayout menuArea = new CssLayout();
      * menuArea.setPrimaryStyleName(ValoTheme.MENU_ROOT);
@@ -932,9 +932,9 @@ public class ValoTheme {
      * Add this style name to any layout and place it inside a layout with the
      * {@link #MENU_ROOT} style to build a menu component. Use the additional
      * MENU styles for individual components inside the layout.
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * CssLayout menu = new CssLayout();
      * menu.addStyleName(ValoTheme.MENU_PART);
@@ -948,9 +948,9 @@ public class ValoTheme {
      * captions. Useful on narrower viewport widths, since the menu width is
      * decreased quite dramatically, making more space for the content of the
      * application.
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * CssLayout menu = new CssLayout();
      * menu.addStyleName(ValoTheme.MENU_PART);
@@ -965,7 +965,7 @@ public class ValoTheme {
      * (intended to be placed in side a {@link #MENU_PART} layout). You can add
      * any components inside it, but usually you would place a Label inside.
      * </p>
-     * 
+     *
      * <p>
      * Any MenuBar component that you place inside this layout will match the
      * style of the title, allowing an easy way to add a toolbar to the title
@@ -985,15 +985,15 @@ public class ValoTheme {
      * Set the <em><b>primary</b></em> style name of a Button to this style name
      * to create a clickable menu item in the menu.
      * </p>
-     * 
+     *
      * <h4>Selected item</h4>
      * <p>
      * Add an additional style name <b><code>selected</code></b> to it to make
      * it the selected item in the menu.
      * </p>
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * Button item = new Button();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1007,9 +1007,9 @@ public class ValoTheme {
      * or {@link #MENU_ITEM} to add an additional badge indicator to the
      * subtitle/item. The Label/Button needs to allow HTML content in order to
      * use this style name.
-     * 
+     *
      * <h4>Examples</h4>
-     * 
+     *
      * <pre>
      * Button item = new Button();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1017,7 +1017,7 @@ public class ValoTheme {
      * item.setCaption(&quot;Item Caption &lt;span class=\&quot;&quot; + ValoTheme.MENU_BADGE
      *         + &quot;\&quot;&gt;Badge text&lt;/span&gt;&quot;);
      * </pre>
-     * 
+     *
      * <pre>
      * Label item = new Label();
      * item.setPrimaryStyleName(ValoTheme.MENU_ITEM);
@@ -1034,7 +1034,7 @@ public class ValoTheme {
      * style name to create an application logo. The logo is designed to be
      * placed inside a {@link #MENU_PART} layout.
      * </p>
-     * 
+     *
      * <p>
      * The text content of the logo should be very short, since the logo area
      * only shows approximately three letters. Using one of the
@@ -1042,9 +1042,9 @@ public class ValoTheme {
      * application.
      * </p>
      * </p>
-     * 
+     *
      * <h4>Example</h4>
-     * 
+     *
      * <pre>
      * Label logo = new Label(FontAwesome.ROCKET.getHtml(), ContentMode.HTML);
      * logo.setSizeUndefined();
diff --git a/server/src/main/java/com/vaadin/util/ConnectorHelper.java b/server/src/main/java/com/vaadin/util/ConnectorHelper.java
index b3457068c3..c2a5105072 100644
--- a/server/src/main/java/com/vaadin/util/ConnectorHelper.java
+++ b/server/src/main/java/com/vaadin/util/ConnectorHelper.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
 
 /**
  * Provides various helper methods for connectors. Meant for internal use.
- * 
+ *
  * @since 7.1
  * @author Vaadin Ltd
  */
@@ -31,7 +31,7 @@ public class ConnectorHelper {
 
     /**
      * Creates a string containing debug info for the connector
-     * 
+     *
      * @since 7.1
      * @param connector
      *            The connector to print debug info about
@@ -57,7 +57,7 @@ public class ConnectorHelper {
 
     /**
      * Creates a string containing hierarchy information for the connector
-     * 
+     *
      * @since 7.1
      * @param connector
      *            The connector to get hierarchy information for
diff --git a/server/src/main/java/com/vaadin/util/CurrentInstance.java b/server/src/main/java/com/vaadin/util/CurrentInstance.java
index 62fffb91d4..d3e0de104a 100644
--- a/server/src/main/java/com/vaadin/util/CurrentInstance.java
+++ b/server/src/main/java/com/vaadin/util/CurrentInstance.java
@@ -112,7 +112,7 @@ public class CurrentInstance implements Serializable {
                  * ThreadLocal should only outlive the referenced object on
                  * threads that are not doing anything related to Vaadin, which
                  * should thus never invoke CurrentInstance.get().
-                 * 
+                 *
                  * At this point, there might also be other values that have
                  * been collected, so we'll scan the entire map and remove stale
                  * CurrentInstance objects. Using a ReferenceQueue could make
@@ -249,7 +249,7 @@ public class CurrentInstance implements Serializable {
                  * CurrentInstance. Without this a reference to an already
                  * collected instance may be left in the CurrentInstance when it
                  * really should be restored to null.
-                 * 
+                 *
                  * One example case that this fixes:
                  * VaadinService.runPendingAccessTasks() clears all current
                  * instances and then sets everything but the UI. This makes
diff --git a/server/src/main/java/com/vaadin/util/FileTypeResolver.java b/server/src/main/java/com/vaadin/util/FileTypeResolver.java
index a49a0e2d01..56cd186fab 100644
--- a/server/src/main/java/com/vaadin/util/FileTypeResolver.java
+++ b/server/src/main/java/com/vaadin/util/FileTypeResolver.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
@@ -32,7 +32,7 @@ import com.vaadin.server.ThemeResource;
  * Note : The icons are associated purely to mime-types, so a file may not have
  * a custom icon accessible with this class.
  * </p>
- * 
+ *
  * @author Vaadin Ltd.
  * @since 3.0
  */
@@ -241,7 +241,7 @@ public class FileTypeResolver implements Serializable {
     /**
      * Gets the mime-type of a file. Currently the mime-type is resolved based
      * only on the file name extension.
-     * 
+     *
      * @param fileName
      *            the name of the file whose mime-type is requested.
      * @return mime-type <code>String</code> for the given filename
@@ -284,7 +284,7 @@ public class FileTypeResolver implements Serializable {
      * the mime-type for the given filename is resolved, and then the
      * corresponding icon is fetched from the internal icon storage. If it is
      * not found the default icon is returned.
-     * 
+     *
      * @param fileName
      *            the name of the file whose icon is requested.
      * @return the icon corresponding to the given file
@@ -309,7 +309,7 @@ public class FileTypeResolver implements Serializable {
      * the given file name is resolved, and then the corresponding icon is
      * fetched from the internal icon storage. If it is not found the default
      * icon is returned.
-     * 
+     *
      * @param file
      *            the file whose icon is requested.
      * @return the icon corresponding to the given file
@@ -321,7 +321,7 @@ public class FileTypeResolver implements Serializable {
     /**
      * Gets the mime-type for a file. Currently the returned file type is
      * resolved by the filename extension only.
-     * 
+     *
      * @param file
      *            the file whose mime-type is requested.
      * @return the files mime-type <code>String</code>
@@ -350,7 +350,7 @@ public class FileTypeResolver implements Serializable {
     /**
      * Adds a mime-type mapping for the given filename extension. If the
      * extension is already in the internal mapping it is overwritten.
-     * 
+     *
      * @param extension
      *            the filename extension to be associated with
      *            <code>MIMEType</code>.
@@ -364,7 +364,7 @@ public class FileTypeResolver implements Serializable {
     /**
      * Adds a icon for the given mime-type. If the mime-type also has a
      * corresponding icon, it is replaced with the new icon.
-     * 
+     *
      * @param MIMEType
      *            the mime-type whose icon is to be changed.
      * @param icon
@@ -376,7 +376,7 @@ public class FileTypeResolver implements Serializable {
 
     /**
      * Gets the internal file extension to mime-type mapping.
-     * 
+     *
      * @return unmodifiable map containing the current file extension to
      *         mime-type mapping
      */
@@ -386,7 +386,7 @@ public class FileTypeResolver implements Serializable {
 
     /**
      * Gets the internal mime-type to icon mapping.
-     * 
+     *
      * @return unmodifiable map containing the current mime-type to icon mapping
      */
     public static Map<String, Resource> getMIMETypeToIconMapping() {
diff --git a/server/src/main/java/com/vaadin/util/ReflectTools.java b/server/src/main/java/com/vaadin/util/ReflectTools.java
index 2e2d3fe238..ad1aae1a69 100644
--- a/server/src/main/java/com/vaadin/util/ReflectTools.java
+++ b/server/src/main/java/com/vaadin/util/ReflectTools.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
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
  * An util class with helpers for reflection operations. Used internally by
  * Vaadin and should not be used by application developers. Subject to change at
  * any time.
- * 
+ *
  * @since 6.2
  */
 public class ReflectTools implements Serializable {
@@ -33,7 +33,7 @@ public class ReflectTools implements Serializable {
      * Locates the method in the given class. Returns null if the method is not
      * found. Throws an ExceptionInInitializerError if there is a problem
      * locating the method as this is mainly called from static blocks.
-     * 
+     *
      * @param cls
      *            Class that contains the method
      * @param methodName
@@ -59,7 +59,7 @@ public class ReflectTools implements Serializable {
      * <p>
      * Uses getter if present, otherwise tries to access even private fields
      * directly.
-     * 
+     *
      * @param object
      *            The object containing the field
      * @param field
@@ -101,7 +101,7 @@ public class ReflectTools implements Serializable {
      * Uses getter if a getter for the correct return type is present, otherwise
      * tries to access even private fields directly. If the java field is not
      * assignable to the property type throws an IllegalArgumentException.
-     * 
+     *
      * @param object
      *            The object containing the field
      * @param field
@@ -149,7 +149,7 @@ public class ReflectTools implements Serializable {
      * <p>
      * Uses setter if present, otherwise tries to access even private fields
      * directly.
-     * 
+     *
      * @param object
      *            The object containing the field
      * @param field
diff --git a/server/src/main/java/com/vaadin/util/SerializerHelper.java b/server/src/main/java/com/vaadin/util/SerializerHelper.java
index c0f852923f..3470684405 100644
--- a/server/src/main/java/com/vaadin/util/SerializerHelper.java
+++ b/server/src/main/java/com/vaadin/util/SerializerHelper.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
@@ -23,7 +23,7 @@ import java.io.ObjectOutputStream;
  * Helper class for performing serialization. Most of the methods are here are
  * workarounds for problems in Google App Engine. Used internally by Vaadin and
  * should not be used by application developers. Subject to change at any time.
- * 
+ *
  * @since 6.0
  */
 public class SerializerHelper {
@@ -31,7 +31,7 @@ public class SerializerHelper {
     /**
      * Serializes the class reference so {@link #readClass(ObjectInputStream)}
      * can deserialize it. Supports null class references.
-     * 
+     *
      * @param out
      *            The {@link ObjectOutputStream} to serialize to.
      * @param cls
@@ -53,7 +53,7 @@ public class SerializerHelper {
      * Serializes the class references so
      * {@link #readClassArray(ObjectInputStream)} can deserialize it. Supports
      * null class arrays.
-     * 
+     *
      * @param out
      *            The {@link ObjectOutputStream} to serialize to.
      * @param classes
@@ -78,7 +78,7 @@ public class SerializerHelper {
      * Deserializes a class references serialized by
      * {@link #writeClassArray(ObjectOutputStream, Class[])}. Supports null
      * class arrays.
-     * 
+     *
      * @param in
      *            {@link ObjectInputStream} to read from.
      * @return Class array with the class references or null.
@@ -111,7 +111,7 @@ public class SerializerHelper {
 
     /**
      * Resolves the class given by {@code className}.
-     * 
+     *
      * @param className
      *            The fully qualified class name.
      * @return A {@code Class} reference.
@@ -133,7 +133,7 @@ public class SerializerHelper {
      * Deserializes a class reference serialized by
      * {@link #writeClass(ObjectOutputStream, Class)}. Supports null class
      * references.
-     * 
+     *
      * @param in
      *            {@code ObjectInputStream} to read from.
      * @return Class reference to the resolved class
diff --git a/server/src/test/java/ClassInDefaultPackage.java b/server/src/test/java/ClassInDefaultPackage.java
index 52dc87e0e2..4c6a2fe1aa 100644
--- a/server/src/test/java/ClassInDefaultPackage.java
+++ b/server/src/test/java/ClassInDefaultPackage.java
@@ -2,13 +2,13 @@ import org.junit.Ignore;
 
 /*
  * 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
@@ -17,9 +17,9 @@ import org.junit.Ignore;
  */
 
 /**
- * 
+ *
  * This class is test data. Don't delete it.
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.2
  */
diff --git a/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java
index 968edd4b24..af7e613bbf 100644
--- a/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java
+++ b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java
@@ -7,17 +7,17 @@ import com.vaadin.ui.Label;
  * Your results will vary.
  * 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
- * 
+ *
  * My results Win 7 64, i7 2760QM 2.4Ghz, Java 7 21.
- * 
+ *
  * Proposed Patch with StringTokenizer:
  * 13 GC activations, 1.009GB allocated memory over time, total time 948ms
- * 
+ *
  * Current String.split implementation:
  * 31 GC activations, 2.277 GB allocated memory over time, total time 1557ms
- * 
+ *
  */
 public class PerformanceTester8759 {
 
diff --git a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
index 256ddaa9f9..43d783904a 100644
--- a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
+++ b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.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/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
index 1226939e31..cd2172f2eb 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.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/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
index 617301b155..5aa1aba990 100644
--- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.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/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
index 9073168016..4a9e4f9891 100644
--- a/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
@@ -2,7 +2,7 @@ package com.vaadin.data.util;
 
 /**
  * Automated test for {@link AbstractBeanContainer}.
- * 
+ *
  * Only a limited subset of the functionality is tested here, the rest in tests
  * of subclasses including {@link BeanItemContainer} and {@link BeanContainer}.
  */
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
index 1c572e61eb..19b0835fd6 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
@@ -30,7 +30,7 @@ import com.vaadin.data.util.filter.Compare;
 
 /**
  * Test basic functionality of BeanItemContainer.
- * 
+ *
  * Most sorting related tests are in {@link BeanItemContainerSortTest}.
  */
 public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
diff --git a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
index 7681b7566d..1bbe74818c 100644
--- a/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
@@ -16,9 +16,9 @@ import com.vaadin.data.Property;
 
 /**
  * Test BeanItem specific features.
- * 
+ *
  * Only public API is tested, not the methods with package visibility.
- * 
+ *
  * See also {@link PropertySetItemTest}, which tests the base class.
  */
 public class BeanItemTest {
diff --git a/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java b/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
index 04fd8d3cd1..4e97328206 100644
--- a/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.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/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
index d92ee9627b..24091f5d5a 100644
--- a/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.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/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
index d07564efe9..61e939701a 100644
--- a/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
+++ b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.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 org.junit.Test;
 
 /**
  * Test for MethodProperty: don't allocate unnecessary Object arrays.
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
index ee463ceb0c..56b5079a7c 100644
--- a/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.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.legacy.ui.LegacyTextField;
 /**
  * Test verifying that TransactionalPropertyWrapper removes it's listener from
  * wrapped Property
- * 
+ *
  * @since 7.1.15
  * @author Vaadin Ltd
  */
@@ -98,7 +98,7 @@ public class TransactionalPropertyWrapperTest {
 
     /**
      * Check that all listeners have same hasListeners() response
-     * 
+     *
      * @param expected
      *            expected response
      * @return true if all are the same as expected. false if not
diff --git a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
index dc6eef04c2..12faedee06 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.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/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
index 252acd81fc..fcde69655b 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.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/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
index 1c70fe0976..48a2d29639 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.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
@@ -25,7 +25,7 @@ import org.junit.Test;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StatementHelperTest {
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
index d43ad94b90..978f79f8ac 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.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.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
  * Connection pool for testing SQLContainer. Ensures that only reserved
  * connections are released and that all connections are released before the
  * pool is destroyed.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ValidatingSimpleJDBCConnectionPool implements JDBCConnectionPool {
diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java
index bcb0268598..3b06d5e936 100644
--- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.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
@@ -25,7 +25,7 @@ import org.junit.Test;
  * We test that AbstractClientConnector has a suitable isThis method which is
  * needed to correctly perform an equals check between a proxy and it's
  * underlying instance.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbstractClientConnectorProxyHandlingTest {
diff --git a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
index d546ce0f14..a4f3741f29 100644
--- a/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.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,7 +31,7 @@ import com.vaadin.shared.ui.ClickRpc;
  * We test that AbstractClientConnector has a suitable isThis method which is
  * needed to correctly perform an equals check between a proxy and it's
  * underlying instance.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbstractClientConnectorTest {
diff --git a/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java
index e69f53769e..9b7d946521 100644
--- a/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java
+++ b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.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
@@ -25,7 +25,7 @@ import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.BrowserWindowOpenerState;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class BrowserWindowOpenerTest {
diff --git a/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java
index f9b0577683..99667139a5 100644
--- a/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java
+++ b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.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/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java
index cdda588756..dcd70ded9f 100644
--- a/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java
+++ b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.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
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 /**
  * Tests for {@link DefaultDeploymentConfiguration}
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.2
  */
diff --git a/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java
index 7344e1b18b..5d3be5df01 100644
--- a/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java
+++ b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.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
@@ -34,7 +34,7 @@ import com.vaadin.ui.AbstractComponent;
 
 /**
  * Tests for {@link DragAndDropService}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class DragAndDropServiceTest {
diff --git a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
index c1d72e0c03..d53fef31c7 100644
--- a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
+++ b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
@@ -2,13 +2,13 @@ package com.vaadin.server;
 
 /*
  * 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
@@ -35,10 +35,10 @@ import elemental.json.JsonValue;
 
 /**
  * Tests for {@link JsonCodec}
- * 
+ *
  * @author Vaadin Ltd
  * @since 7.0
- * 
+ *
  */
 public class JSONSerializerTest {
     HashMap<String, AbstractSplitPanelState> stringToStateMap;
diff --git a/server/src/test/java/com/vaadin/server/JsonEqualsTest.java b/server/src/test/java/com/vaadin/server/JsonEqualsTest.java
index ca3bfced79..b44e0e94d9 100644
--- a/server/src/test/java/com/vaadin/server/JsonEqualsTest.java
+++ b/server/src/test/java/com/vaadin/server/JsonEqualsTest.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/server/src/test/java/com/vaadin/server/MockVaadinSession.java b/server/src/test/java/com/vaadin/server/MockVaadinSession.java
index e1def5bcee..490463f1fc 100644
--- a/server/src/test/java/com/vaadin/server/MockVaadinSession.java
+++ b/server/src/test/java/com/vaadin/server/MockVaadinSession.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
@@ -19,7 +19,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class MockVaadinSession extends VaadinSession {
diff --git a/server/src/test/java/com/vaadin/server/PageTest.java b/server/src/test/java/com/vaadin/server/PageTest.java
index 6e33c6c6f0..5f04a1c2e3 100644
--- a/server/src/test/java/com/vaadin/server/PageTest.java
+++ b/server/src/test/java/com/vaadin/server/PageTest.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
@@ -25,9 +25,9 @@ import com.vaadin.shared.ui.ui.PageState;
 import com.vaadin.ui.UI;
 
 /**
- * 
+ *
  * Tests for {@link Page}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class PageTest {
diff --git a/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index bea51a57af..274441824b 100644
--- a/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -121,7 +121,7 @@ public class TestAbstractApplicationServletStaticFilesLocation {
 
     /**
      * Creates a HttpServletRequest mock using the supplied parameters.
-     * 
+     *
      * @param base
      *            The base url, e.g. http://localhost:8080
      * @param contextPath
diff --git a/server/src/test/java/com/vaadin/server/UIProviderTest.java b/server/src/test/java/com/vaadin/server/UIProviderTest.java
index 1b7bdd02e7..c6c387d97f 100644
--- a/server/src/test/java/com/vaadin/server/UIProviderTest.java
+++ b/server/src/test/java/com/vaadin/server/UIProviderTest.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.annotations.Widgetset;
 
 /**
  * Tests for {@link UIProvider} class.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UIProviderTest {
diff --git a/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java
index ec72ce7a71..f4f0a1c87a 100644
--- a/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.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/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
index 0f7cce5f75..fce9c048f2 100644
--- a/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
+++ b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.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/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java
index d7f601be92..67305403c0 100644
--- a/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.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/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java
index 5ecd5f44d9..ca874da821 100644
--- a/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.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/server/src/test/java/com/vaadin/server/VaadinPortletTest.java b/server/src/test/java/com/vaadin/server/VaadinPortletTest.java
index 4e74f91708..39e3187f93 100644
--- a/server/src/test/java/com/vaadin/server/VaadinPortletTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletTest.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/server/src/test/java/com/vaadin/server/VaadinServiceTest.java b/server/src/test/java/com/vaadin/server/VaadinServiceTest.java
index c25453617c..bec51df485 100644
--- a/server/src/test/java/com/vaadin/server/VaadinServiceTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinServiceTest.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
@@ -27,7 +27,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class VaadinServiceTest {
diff --git a/server/src/test/java/com/vaadin/server/VaadinServletTest.java b/server/src/test/java/com/vaadin/server/VaadinServletTest.java
index 566c4ce70a..a582561fc5 100644
--- a/server/src/test/java/com/vaadin/server/VaadinServletTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinServletTest.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/server/src/test/java/com/vaadin/server/VaadinSessionTest.java b/server/src/test/java/com/vaadin/server/VaadinSessionTest.java
index 385e9b3747..d612ffbaba 100644
--- a/server/src/test/java/com/vaadin/server/VaadinSessionTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinSessionTest.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/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
index 3a4c5c69be..a708f107f1 100644
--- a/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.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/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java b/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java
index a1a833e8af..d3362dc727 100644
--- a/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.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/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java
index f821839877..5991d3e7ad 100644
--- a/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.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/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java
index 078682fd24..f4ca05b6d5 100644
--- a/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.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/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java
index f835ea488d..417793e784 100644
--- a/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java
+++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.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/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java
index 1e59d2c3f6..b4840a9ebe 100644
--- a/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.java
+++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/Person.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/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java
index a4a93a9600..324ce919d9 100644
--- a/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.java
+++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/PersonService.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/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java b/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java
index 337ce19a06..4ae545f60e 100644
--- a/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java
+++ b/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.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/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java
index 7e0140d588..bd0eebd97e 100644
--- a/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.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/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java
index 5d946c5a86..79ce622816 100644
--- a/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.MenuBar.MenuItem;
 
 /**
  * Tests declarative support for menu bars.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
index 704c556323..1bcc57f606 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.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/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java
index b3ceb4dd8b..b4f7c284e2 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.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/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
index 0243b8cb2c..9533f97f2c 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.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/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
index 716b821800..264216eb90 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.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/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
index 24e861e93d..4419e66d81 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.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/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
index f1471602fe..efcd0d2ca7 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.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/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
index 18d77e2e8c..6f27fa859d 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.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
@@ -36,7 +36,7 @@ import com.vaadin.legacy.data.util.converter.LegacyStringToCollectionConverter.C
 
 /**
  * Tests for {@link LegacyStringToCollectionConverter}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StringToCollectionConverterTest {
diff --git a/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
index 6eb0c74c4b..7e076e7b04 100644
--- a/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.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/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java
index f679e2802d..f8963a22ce 100644
--- a/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.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/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java
index fb7c278fb2..fb8e134e60 100644
--- a/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.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/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java
index a67845e9e0..308202fcb6 100644
--- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.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/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
index 1c4817281f..d9394540b3 100644
--- a/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
+++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.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/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java b/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java
index d488b9fc08..c96f3edb64 100644
--- a/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.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
@@ -44,7 +44,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Tests that setting local id via DesignContext works as intended.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
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 8b72382c0d..73c7811b75 100644
--- a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.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
@@ -46,7 +46,7 @@ import com.vaadin.ui.declarative.DesignFormatter;
 
 /**
  * Various tests related to formatter.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -348,7 +348,7 @@ public class DesignFormatterTest {
 
     /**
      * A static method to allow comparison two different actions.
-     * 
+     *
      * @param act
      *            One action to compare.
      * @param other
diff --git a/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.java b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.java
index 6eccaf6a2c..3dd93a8b0a 100644
--- a/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.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/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java
index e1615ab694..d514fdefb0 100644
--- a/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.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/server/src/test/java/com/vaadin/tests/design/DesignTest.java b/server/src/test/java/com/vaadin/tests/design/DesignTest.java
index cf19aecb87..5d47341b68 100644
--- a/server/src/test/java/com/vaadin/tests/design/DesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignTest.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/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java
index 17b6861d0a..7730040963 100644
--- a/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.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
@@ -35,7 +35,7 @@ import com.vaadin.ui.declarative.Design;
 /**
  * Tests declarative support for implementations of {@link AbstractEmbedded} and
  * {@link Embedded}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java b/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java
index 8c8d7b78b1..b2aa689c6e 100644
--- a/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.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/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java
index c7dac6b39c..ec1d02a86d 100644
--- a/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java
+++ b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.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
@@ -21,7 +21,7 @@ import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.VerticalLayout;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java
index d216c892c9..20e5966a68 100644
--- a/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.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/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.java b/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.java
index fdfddf5c08..e356f9cf6a 100644
--- a/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.java
+++ b/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.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
@@ -21,7 +21,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Template to be populated in the tests
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
index fc9ae52559..39a20d4ae6 100644
--- a/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/LocaleTest.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
@@ -38,7 +38,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Tests the handling of the locale property in parsing and html generation.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java b/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
index 54902c29fe..f2d36c4c73 100644
--- a/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * Just top level test case that contains all synchronizable components
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ParseAllSupportedComponentsTest {
diff --git a/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java b/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java
index 784c986e1c..f93accd671 100644
--- a/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.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
@@ -47,7 +47,7 @@ import com.vaadin.ui.declarative.DesignException;
  * A test for checking that parsing a layout preserves the IDs and the mapping
  * from prefixes to package names (for example
  * <meta name=”package-mapping” content=”my:com.addon.mypackage” />)
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java b/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java
index 76e15aae17..d93054b2db 100644
--- a/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.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/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java b/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java
index 2996cb23c1..6fd17bdcc5 100644
--- a/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.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/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java b/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java
index facb5e9862..0844ce9377 100644
--- a/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.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/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.java
index 682da30344..dd8675ada3 100644
--- a/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.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/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
index ef9de9dcb0..bf8d920b5a 100644
--- a/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.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/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
index 55fd571ee2..9c565e06d8 100644
--- a/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.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/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
index c83d243900..834b734257 100644
--- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.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/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
index f277793f17..2faa5d9a9d 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
@@ -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/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
index 1d0e8de4eb..e70cefd6e5 100644
--- a/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.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/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.java b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.java
index 3b0d80c32c..bb95120e09 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.declarative.Design;
 
 /**
  * Child design component
- * 
+ *
  * @author Vaadin Ltd
  */
 @DesignRoot("mychilddesign.html")
diff --git a/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
index 8402224cf9..0fe11040a1 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.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/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.java b/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.java
index abde002ef8..686d5bc6c8 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.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
@@ -21,7 +21,7 @@ import com.vaadin.ui.declarative.Design;
 
 /**
  * Root design component
- * 
+ *
  * @author Vaadin Ltd
  */
 @DesignRoot("mydesignroot.html")
diff --git a/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.java b/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
index 579fdfb869..4642566901 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.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/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
index beaa9519cb..88733b9cbe 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.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
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.greaterThan;
 /**
  * Test case for nested custom layouts. The children of the custom layouts must
  * not be rendered.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NestedCustomLayoutsTest {
diff --git a/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
index dc95306cd3..78cf5e16dd 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.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 static org.junit.Assert.*;
 
 /**
  * Test case for reading nested templates
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
index a50f4880d9..d521fe2d0d 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.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
@@ -30,9 +30,9 @@ import org.junit.Test;
 import com.vaadin.ui.declarative.DesignContext;
 
 /**
- * 
+ *
  * Test case for writing nested templates
- * 
+ *
  * @author Vaadin Ltd
  */
 public class WriteNestedTemplatesTest {
diff --git a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
index 8eef3b07a6..d4322b9efe 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
index 93606f296c..d5be5f6660 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
index b2aaa2c015..88dc8cecc2 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
index 66ac083c0d..50f43f105e 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
index 1059ea0e14..779fb2d308 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
index 482a9feb95..7bbb959151 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
index 21c8745796..b395dec351 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
index 5841fbcfee..2ed014773c 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
index 128de7de1f..59ccf3121e 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
index 3bc8fba7de..2c4a45a188 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.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/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
index 486d71ea75..52159806a2 100644
--- a/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.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/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java
index 4bd80386bf..762c8181e6 100644
--- a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java
+++ b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.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/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java
index 6cd9328efc..5ed2cdd6cc 100644
--- a/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java
+++ b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.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.tests.design.DesignFormatterTest;
 
 /**
  * Tests various things about shortcut actions.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
@@ -82,9 +82,9 @@ public class ShortcutActionTest {
 
     /**
      * A static method to allow comparison two different actions.
-     * 
+     *
      * @see DesignFormatterTest
-     * 
+     *
      * @param act
      *            One action to compare.
      * @param other
diff --git a/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java b/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java
index f09db0ea99..488cc76ba2 100644
--- a/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.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/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
index 753358d3eb..02e2e220a6 100644
--- a/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -86,7 +86,7 @@ public class ClassesSerializableTest {
     /**
      * Tests that all the relevant classes and interfaces under
      * {@link #BASE_PACKAGES} implement Serializable.
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -174,10 +174,10 @@ public class ClassesSerializableTest {
 
     /**
      * Lists all class path entries by splitting the class path string.
-     * 
+     *
      * Adapted from ClassPathExplorer.getRawClasspathEntries(), but without
      * filtering.
-     * 
+     *
      * @return List of class path segment strings
      */
     //
@@ -207,10 +207,10 @@ public class ClassesSerializableTest {
     /**
      * Finds the server side classes/interfaces under a class path entry -
      * either a directory or a JAR that matches {@link #JAR_PATTERN}.
-     * 
+     *
      * Only classes under {@link #BASE_PACKAGES} are considered, and those
      * matching {@link #EXCLUDED_PATTERNS} are filtered out.
-     * 
+     *
      * @param classpathEntry
      * @return
      * @throws IOException
@@ -260,7 +260,7 @@ public class ClassesSerializableTest {
 
     /**
      * Lists class names (based on .class files) in a JAR file.
-     * 
+     *
      * @param file
      *            a valid JAR file
      * @return collection of fully qualified class names in the JAR
@@ -286,7 +286,7 @@ public class ClassesSerializableTest {
     /**
      * Lists class names (based on .class files) in a directory (a package path
      * root).
-     * 
+     *
      * @param parentPackage
      *            parent package name or null at root of hierarchy, used by
      *            recursion
diff --git a/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java
index 43a78ecc29..597f210e09 100644
--- a/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.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/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java b/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
index 58d4d8d831..93fb39e799 100644
--- a/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.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
@@ -30,11 +30,11 @@ import com.vaadin.ui.Table.TableContextClickEvent;
 /**
  * Server-side unit tests to see that context click events are sent to listeners
  * correctly.
- * 
+ *
  * If a listener is listening to a super type of an event, it should get the
  * event. i.e. Listening to ContextClickEvent, it should get the specialized
  * GridContextClickEvent as well.
- * 
+ *
  * If a listener is listening to a sub-type of an event, it should not get the
  * super version. i.e. Listening to GridContextClickEvent, it should not get a
  * plain ContextClickEvent.
diff --git a/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java
index 91ac429a4c..e7e78f119d 100644
--- a/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java
@@ -43,7 +43,7 @@ import elemental.json.JsonException;
 
 /**
  * Test the actual csrf token validation by the server.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
@@ -65,7 +65,7 @@ public class CsrfTokenMissingTest {
 
     /**
      * Initialize the mock servlet and other stuff for our tests.
-     * 
+     *
      */
     @Before
     public void initMockStuff() throws ServiceException, ServletException {
diff --git a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java
index 9c9e63713e..abd3f75a2d 100644
--- a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.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/server/src/test/java/com/vaadin/tests/server/FileResourceTest.java b/server/src/test/java/com/vaadin/tests/server/FileResourceTest.java
index 4798fb9f05..b53fc0eb88 100644
--- a/server/src/test/java/com/vaadin/tests/server/FileResourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/FileResourceTest.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/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
index 0288e99505..cc67c40dbb 100644
--- a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
@@ -38,7 +38,7 @@ public class PropertyFormatterTest {
 
     /**
      * The object passed to format should be same as property's type.
-     * 
+     *
      * @throws IllegalAccessException
      * @throws InstantiationException
      */
diff --git a/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
index 020464ed06..14b839be6a 100644
--- a/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
@@ -13,7 +13,7 @@ public class SimpleMultiPartInputStreamTest {
 
     /**
      * Check that the output for a given stream until boundary is as expected.
-     * 
+     *
      * @param input
      * @param boundary
      * @param expected
@@ -86,7 +86,7 @@ public class SimpleMultiPartInputStreamTest {
     /**
      * Note, the boundary in this test is invalid. Boundary strings don't
      * contain CR/LF.
-     * 
+     *
      */
     // public void testRepeatingNewlineBoundary() throws Exception {
     // checkBoundaryDetection("1234567890" + getFullBoundary("\n\n")
diff --git a/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.java b/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.java
index 4971f556db..9a8b19bf13 100644
--- a/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.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
@@ -23,7 +23,7 @@ import com.vaadin.server.StreamResource;
 import com.vaadin.server.StreamResource.StreamSource;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class StreamResourceTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java b/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java
index 335963ec1b..c9b21aff0e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.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/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java
index 9668212a78..e83fa09e9c 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
index 9699726d5a..646f9ffaaf 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.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/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
index 6a93f0482c..647d22d0d4 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.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/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
index 27b99326e1..544c732788 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.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/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java
index 24f1f94ac6..c3066810c2 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Button;
 
 /**
  * Tests declarative support for implementations of {@link AbsoluteLayout}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
index 96f27851cf..166a456944 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.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.ui.Button;
 
 /**
  * Tests adding of components to {@link AbsoluteLayout}
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
index 176d178112..9471837bd8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.HasComponents;
 /**
  * Tests for avoiding add parent as child for
  * {@link AbstractComponentContainer#addComponent(Component)}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AddParentAsChildTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java
index 39f33db279..c843cf3779 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Tests declarative support for implementations of {@link AbstractField}.
- * 
+ *
  * @since 7.4
  * @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 d60d086bbe..644ee7855f 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
@@ -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
@@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Tests declarative support for AbstractOrderedLayout.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
index 9bb35605ed..3e649de125 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.Alignment;
 /**
  * Tests for abstract layout settings which should be preserved on replace
  * component
- * 
+ *
  * @since 7.2
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
index a69baf83db..1b5b453982 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.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
@@ -36,7 +36,7 @@ import com.vaadin.ui.declarative.DesignException;
 
 /**
  * Test cases for reading the properties of selection components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class AbstractSelectDeclarativeTest
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
index afdcebb5f2..5d27c49a9a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.AbstractSelect;
 
 /**
  * Tests for AbstractSelect state
- * 
+ *
  */
 public class AbstractSelectStateTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
index e4735d3595..b6dc8fa01f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.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/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 3b5869ace3..52b0d81ef1 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
index b84794d58a..0904aba147 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.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
@@ -23,10 +23,10 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.HasComponents;
 
 /**
- * 
+ *
  * Tests for avoiding set parent as child for
  * {@link AbstractSingleComponentContainer#setContent(Component)}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SetParentAsContentTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
index ef99e3f7af..42d4ff9612 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.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.VerticalSplitPanel;
 
 /**
  * Tests declarative support for AbstractSplitPanel.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
index 9b32060f2f..87f38a89fe 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.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.ui.TextField;
 
 /**
  * Tests declarative support for AbstractTextField.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java
index 83848a5197..a84e875e37 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.Audio;
 /**
  * Tests specs of declarative support for abstract media and its
  * implementations.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.java
index d18127791e..660ce6beb3 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Audio;
 
 /**
  * Tests for Audio state.
- * 
+ *
  */
 public class AudioStateTest {
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
index 43fc26d074..4bf68695aa 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java
index 2094167785..1fa5f1d855 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.BrowserFrame;
 
 /**
  * Tests declarative support for implementations of {@link BrowserFrame}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java
index a5827e009a..c2facaf14c 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.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
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignContext;
 /**
  * Tests declarative support for implementations of {@link Button} and
  * {@link NativeButton}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
index dd9dc8f847..53cf04addd 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.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/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
index f8ac24cce6..06b77852e8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
index e4550b317b..1c8f76cc27 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.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/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
index 63749a2fc9..276f0b5acd 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.components.calendar.ContainerEventProvider;
 import com.vaadin.ui.components.calendar.event.CalendarEvent;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ContainerEventProviderTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
index 760d8d2548..7e4c5d488d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.CheckBox;
 
 /**
  * Tests declarative support for implementations of {@link CheckBox}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
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 6582d2ac19..ab4db0dab1 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
index 8c05e58b9c..3d83fdfaa0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.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/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 fcc7eb97a1..fee04d3ba6 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
index 0908a355de..73eae6e316 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.ComboBox;
 
 /**
  * Tests for ComboBox state.
- * 
+ *
  */
 public class ComboBoxStateTest {
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
index 31ee1a05f5..fa350f7683 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.Label;
 
 /**
  * Tests declarative support for CssLayout.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
index 0cee19ee85..9e304b3144 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.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.ui.Label;
 
 /**
  * Tests declarative support for {@link CustomLayout}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java
index 050e2037a2..cb84080f70 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.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
@@ -32,9 +32,9 @@ import org.junit.Test;
 import com.vaadin.ui.CustomLayout;
 
 /**
- * 
+ *
  * Tests for {@link CustomLayout}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class CustomLayoutTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
index eb3da47957..17ee15c8ef 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.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/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
index ca8c4d9849..5db5bf2cd4 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java
index 1ea1dc8f4a..06ed6385f0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.Design;
 
 /**
  * Tests the declarative support for implementations of {@link DateField}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
index c3cc896fd8..404e7810d6 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java
index a4ef67e100..ed1f358e5e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.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.design.DeclarativeTestBase;
 /**
  * Tests the declarative support for implementations of
  * {@link LegacyPopupDateField}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
index c2595eaf98..9be1681f7a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.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.ui.PopupDateField;
 
 /**
  * Tests the declarative support for implementations of {@link DateField}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
index 86ae6589e6..6449f845a5 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.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
@@ -35,9 +35,9 @@ import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.legacy.ui.LegacyTextField;
 
 /**
- * 
+ *
  * Tests for {@link FieldGroup}.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class FieldGroupTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
index 0c2deaaf0a..7aa4b73c31 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.Flash;
 /**
  * Tests declarative support for implementations of {@link AbstractEmbedded} and
  * {@link Embedded}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
index 2206ff6ade..8072c5e934 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
index 431bbd9436..028b13f997 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index 65967651e3..ab3b9f3b23 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
index eebb40cc3a..0b7a0d81fb 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
index cdfd2328dc..ff9a2c1a45 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
index 77694d906a..bdf248814f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
index 352635e0d7..c04655d9d0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
index 5b9a383d2d..f8005a0429 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
index e9a5b1126c..8828d941ee 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
index 567fad52af..d581f5e778 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Grid;
 
 /**
  * Tests for Grid State.
- * 
+ *
  */
 public class GridStateTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
index 01eb682a7c..9a1e26353f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
index 6733c46c1f..d901cfbd5d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
index a546facea4..8b66ab625d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java b/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
index 97fb2d8309..07a3cd02ae 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.UI;
 
 /**
  * A Grid attached to a mock UI with a mock ConnectorTracker.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index 92d95b09f8..0f6e0e05c0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index dd0d0fd705..4a3b56d6bf 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.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.Grid.SingleSelectionModel;
 
 /**
  * Tests declarative support for {@link Grid} properties.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
index aaba54fe84..376671bfab 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.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/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index a0ca16c4f9..3ec3677144 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index 9362cbce95..373767ed20 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
index d60df4c23b..f5a979010d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
index d738793426..bdce7f9016 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.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/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 6f81552a1c..380d39e054 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
index 562c629209..0250efbcf7 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Image;
 
 /**
  * Tests declarative support for implementations of {@link Image}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java
index 26961dc372..d70b52793d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.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/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java
index 7a7f4bd844..6ab8f8bb85 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.DesignFormatter;
 
 /**
  * Tests declarative support for implementations of {@link Label}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java
index da7227224d..612e894c6d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.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.ui.Link;
 
 /**
  * Test cases for reading the properties of selection components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class LinkDeclarativeTest extends DeclarativeTestBase<Link> {
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 4869c377e9..4661f28e61 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
@@ -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/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
index 82882a9e61..8f5da0f83f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.ListSelect;
 
 /**
  * Tests for ListSelect State.
- * 
+ *
  */
 public class ListSelectStateTest {
 
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 5a854d2733..4b0e48ef04 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
@@ -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
@@ -22,7 +22,7 @@ import com.vaadin.ui.NativeSelect;
 
 /**
  * Test cases for reading the properties of selection components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class NativeSelectDeclarativeTest
diff --git a/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
index 59ff432cad..9a6cf145c0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.OptionGroup;
 
 /**
  * Tests for OptionGroup state.
- * 
+ *
  */
 public class OptionGroupStateTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
index 39191f0665..b3b4f10dc2 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.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.ui.declarative.DesignException;
 
 /**
  * Tests declarative support for Panel.
- * 
+ *
  * @since
  * @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 196a6261ac..a57a0cdc1c 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
@@ -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
@@ -21,7 +21,7 @@ import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.ui.PasswordField;
 
 /**
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
index ebb8323699..f78fc0272d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
index b4e9f7a30d..d44f6867f6 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.ProgressBar;
 
 /**
  * Test cases for reading the properties of selection components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class ProgressBarDeclarativeTest
diff --git a/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
index 685618fedc..bbc4cd0492 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.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/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
index d1c0f8fa1e..db533673da 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.RichTextArea;
 
 /**
  * Tests for RichTextArea State.
- * 
+ *
  */
 public class RichTextAreaStateTest {
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
index dcfb415810..3cf0b16114 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Slider;
 
 /**
  * Tests declarative support for implementations of {@link Slider}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
index 40f97d248a..86bb34145f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 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/tests/server/component/table/FooterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
index d13a4a287e..3df2b8fbcb 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Test case for testing the footer API
- * 
+ *
  */
 public class FooterTest {
 
@@ -82,7 +82,7 @@ public class FooterTest {
 
     /**
      * Creates a container with three properties "col1,col2,col3" with 100 items
-     * 
+     *
      * @return Returns the created table
      */
     private static Container createContainer() {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
index 6301f21acf..b29357ea6a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
@@ -51,7 +51,7 @@ public class MultipleSelectionTest {
 
     /**
      * Creates a testing container for the tests
-     * 
+     *
      * @return A new container with test items
      */
     private Container createTestContainer() {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
index d96a5d626a..2f116c5b7c 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.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/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index 05392ec0a0..d1d1c06203 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.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
@@ -29,7 +29,7 @@ import com.vaadin.ui.declarative.Design;
 
 /**
  * Test declarative support for {@link Table}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
index 96e5e32216..7c28f28301 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.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/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
index 91205a4fb8..2b11026360 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.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/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
index 17748a8767..8751221b70 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.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.ui.Table;
 
 /**
  * Tests for 'selectable' property of {@link Table} class.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TableSelectableTest {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
index 7f951e0835..ffc1868903 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.Table;
 
 /**
  * Tests for Table State.
- * 
+ *
  */
 public class TableStateTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
index 38863ea3cb..1b3e471e24 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Tests declarative support for TabSheet.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
index fdf2599370..93382cee1d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.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.declarative.DesignContext;
 
 /**
  * Tests declarative support for implementations of {@link TextArea}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java
index 63ea493344..2dd10d13c0 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.TextField;
 
 /**
  * Tests declarative support for implementations of {@link TextField}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
index 323966392d..ade24a0df6 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
@@ -58,7 +58,7 @@ public class ListenersTest implements ExpandListener, CollapseListener {
     /**
      * Creates a tree with "rootItems" roots, each with "children" children,
      * each with 1 child.
-     * 
+     *
      * @param rootItems
      * @param children
      * @param expand
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
index fdd2dc6931..f79b2f471e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.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.ui.Tree.TreeDragMode;
 
 /**
  * Tests the declarative support for implementations of {@link Tree}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
index 9d614eccc9..801ad1bdaf 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.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
@@ -25,7 +25,7 @@ import com.vaadin.ui.declarative.DesignException;
 
 /**
  * Test declarative support for {@link TreeTable}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
index 99cda2e3a3..37c3e8aebc 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.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.ui.TreeTable;
 
 /**
  * Tests for {@link TreeTable}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TreeTableTest {
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 1306c14e07..671977fe2f 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
@@ -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.ui.TwinColSelect;
 
 /**
  * Test cases for reading the properties of selection components.
- * 
+ *
  * @author Vaadin Ltd
  */
 public class TwinColSelectDeclarativeTest
diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
index 182a1a5f21..559fd3478a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.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
@@ -23,7 +23,7 @@ import com.vaadin.ui.TwinColSelect;
 
 /**
  * Tests for TwinColSelectState.
- * 
+ *
  */
 public class TwinColSelectStateTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
index e31b3ff8f2..a7392be3da 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
@@ -50,7 +50,7 @@ public class CustomUIClassLoaderTest {
     /**
      * Tests that a UI class can be loaded even if no classloader has been
      * provided.
-     * 
+     *
      * @throws Exception
      *             if thrown
      */
@@ -96,7 +96,7 @@ public class CustomUIClassLoaderTest {
     /**
      * Tests that the ClassLoader passed in the ApplicationStartEvent is used to
      * load UI classes.
-     * 
+     *
      * @throws Exception
      *             if thrown
      */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java
index 12f319c6ad..8bb0c9addb 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.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
@@ -22,7 +22,7 @@ import com.vaadin.ui.Upload;
 
 /**
  * Tests the declarative support for implementations of {@link Upload}.
- * 
+ *
  * @since 7.4
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java
index a07377b83f..4feec47477 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.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.shared.ui.upload.UploadState;
 import com.vaadin.ui.Upload;
 
 /**
- * 
+ *
  * @author Vaadin Ltd
  */
 public class UploadTest {
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 b394b97a23..a3ece24c76 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
@@ -301,7 +301,7 @@ public class AttachDetachWindowTest {
     /**
      * Asserts that win and its children are unattached and their detach()
      * methods have been been called.
-     * 
+     *
      * @param win
      */
     private void assertDetached(TestContainer win) {
diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
index a99ae2bb8a..d118dbe7f5 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.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
@@ -30,7 +30,7 @@ import com.vaadin.ui.declarative.DesignException;
 
 /**
  * Tests declarative support for implementations of {@link Window}.
- * 
+ *
  * @since
  * @author Vaadin Ltd
  */
diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.java
index e9e73c1e0f..475271be35 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.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/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
index 8b20055d82..1c7dcdf504 100644
--- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
@@ -12,10 +12,10 @@ import com.vaadin.legacy.ui.LegacyAbstractField;
 /**
  * Base class for tests for checking that value change listeners for fields are
  * not called exactly once when they should be, and not at other times.
- * 
+ *
  * Does not check all cases (e.g. properties that do not implement
  * {@link ValueChangeNotifier}).
- * 
+ *
  * Subclasses should implement {@link #setValue()} and call
  * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should
  * typically override {@link #setValue(LegacyAbstractField)} to set the field
@@ -67,11 +67,11 @@ public abstract class AbstractFieldValueChangeTestBase<T> {
     /**
      * Common unbuffered case: both writeThrough (auto-commit) and readThrough
      * are on. Calling commit() should not cause notifications.
-     * 
+     *
      * Using the readThrough mode allows changes made to the property value to
      * be seen in some cases also when there is no notification of value change
      * from the property.
-     * 
+     *
      * LegacyField value change notifications closely mirror value changes of
      * the data source behind the field.
      */
@@ -86,7 +86,7 @@ public abstract class AbstractFieldValueChangeTestBase<T> {
     /**
      * Fully buffered use where the data source is neither read nor modified
      * during editing, and is updated at commit().
-     * 
+     *
      * LegacyField value change notifications reflect the buffered value in the
      * field, not the original data source value changes.
      */
diff --git a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
index 3a43fc4005..891ddc4561 100644
--- a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.ComboBox;
 /**
  * Check that the value change listener for a combo box is triggered exactly
  * once when setting the value, at the correct time.
- * 
+ *
  * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>.
  */
 public class ComboBoxValueChangeTest
diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
index 66f86a37d0..3ceb60219d 100644
--- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
@@ -16,7 +16,7 @@ import com.vaadin.legacy.ui.LegacyTextField;
 /**
  * Check that the value change listener for a text field is triggered exactly
  * once when setting the value, at the correct time.
- * 
+ *
  * See <a href="http://dev.vaadin.com/ticket/4394">Ticket 4394</a>.
  */
 public class TextFieldValueChangeTest
@@ -48,8 +48,8 @@ public class TextFieldValueChangeTest
     /**
      * Test that field propagates value change events originating from property,
      * but don't fire value change events twice if value has only changed once.
-     * 
-     * 
+     *
+     *
      * TODO make test field type agnostic (eg. combobox)
      */
     @Test
@@ -83,7 +83,7 @@ public class TextFieldValueChangeTest
     /**
      * Value change events from property should not propagate if read through is
      * false. Execpt when the property is being set.
-     * 
+     *
      * TODO make test field type agnostic (eg. combobox)
      */
     @Test
diff --git a/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index f168bfd0d5..194415eb01 100644
--- a/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.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/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
index fcf69496db..016a7fe0bc 100644
--- a/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.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/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 327baae21f..840ba9d8e2 100644
--- a/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.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/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
index 9548d73a27..a3fe556d8b 100644
--- a/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.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/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
index e237faa0c5..f561a861f7 100644
--- a/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.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/server/src/test/java/com/vaadin/tests/util/MockUI.java b/server/src/test/java/com/vaadin/tests/util/MockUI.java
index 17dc24e9e8..8fec5d6530 100644
--- a/server/src/test/java/com/vaadin/tests/util/MockUI.java
+++ b/server/src/test/java/com/vaadin/tests/util/MockUI.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/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java b/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java
index 287ed0338a..6ab2d8835c 100644
--- a/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.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/server/src/test/java/com/vaadin/ui/AbsSelectTest.java b/server/src/test/java/com/vaadin/ui/AbsSelectTest.java
index 8c71a42fc5..251e04e6c4 100644
--- a/server/src/test/java/com/vaadin/ui/AbsSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbsSelectTest.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/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.java b/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.java
index 617c7f54ed..f39d5a8bdc 100644
--- a/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.java
+++ b/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.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/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.java b/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.java
index 9797e48924..3c87cb54ec 100644
--- a/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.java
+++ b/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.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/server/src/test/java/com/vaadin/ui/NativeSelectTest.java b/server/src/test/java/com/vaadin/ui/NativeSelectTest.java
index f9c13b3988..e27d17271a 100644
--- a/server/src/test/java/com/vaadin/ui/NativeSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/NativeSelectTest.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/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java
index 44c6fb00da..88a7067166 100644
--- a/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java
+++ b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.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/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java
index ce0dfdc696..e8669a86d3 100644
--- a/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java
+++ b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.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/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java
index 5b7b277914..069144e7b6 100644
--- a/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java
+++ b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.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
@@ -27,7 +27,7 @@ import com.vaadin.ui.AbstractSplitPanel.SplitPositionChangeListener;
 
 /**
  * Test for {@link SplitPositionChangeListener}
- * 
+ *
  * @author Vaadin Ltd
  */
 public class SplitPositionChangeListenerTest {
diff --git a/server/src/test/java/com/vaadin/ui/TableTest.java b/server/src/test/java/com/vaadin/ui/TableTest.java
index decb03be1a..77f25b7592 100644
--- a/server/src/test/java/com/vaadin/ui/TableTest.java
+++ b/server/src/test/java/com/vaadin/ui/TableTest.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/server/src/test/java/com/vaadin/ui/TextAreaTest.java b/server/src/test/java/com/vaadin/ui/TextAreaTest.java
index e7e99c19e9..40bce92e13 100644
--- a/server/src/test/java/com/vaadin/ui/TextAreaTest.java
+++ b/server/src/test/java/com/vaadin/ui/TextAreaTest.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/server/src/test/java/com/vaadin/ui/TextFieldTest.java b/server/src/test/java/com/vaadin/ui/TextFieldTest.java
index c9259bc770..c7648f7c18 100644
--- a/server/src/test/java/com/vaadin/ui/TextFieldTest.java
+++ b/server/src/test/java/com/vaadin/ui/TextFieldTest.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/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
index d048fb2462..61d6c9d7cc 100644
--- a/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
+++ b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.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/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java
index 7a0a5551e3..a37d3e1636 100644
--- a/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java
+++ b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.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/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.java b/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.java
index c48caf8144..07425e8670 100644
--- a/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.java
+++ b/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.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/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
index 60015c51c0..f9cf2549ea 100644
--- a/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
+++ b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.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