Remove unnecessary full classnames and parenthesis from code (#8681)

This change aims to reduce the number of false positives when comparing Vaadin 7 compatibility package in Vaadin 8 and actual Vaadin 7.7 branch. Conflicting parts are moved to imports as much as possible. Files have been formatted with same Eclipse version.

20 files changed, 68 insertions, 111 deletions

diff --git a/client/src/main/java/com/vaadin/client/ComponentConnector.java b/client/src/main/java/com/vaadin/client/ComponentConnector.java
index f70f3cfc62..2f63eebc62 100644
--- a/client/src/main/java/com/vaadin/client/ComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ComponentConnector.java
@@ -30,11 +30,6 @@ import com.vaadin.shared.AbstractComponentState;
  */
 public interface ComponentConnector extends ServerConnector {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.client.VPaintable#getState()
-     */
     @Override
     public AbstractComponentState getState();
 
diff --git a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
index 6d522ace5b..be768369ed 100644
--- a/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
@@ -24,18 +24,18 @@ import com.vaadin.client.metadata.TypeData;
 import com.vaadin.client.metadata.TypeDataStore;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.widgets.Grid.Column;
+import com.vaadin.shared.communication.SharedState;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
 
 /**
  * An abstract base class for renderer connectors. A renderer connector is used
- * to link a client-side {@link Renderer} to a server-side
- * {@link com.vaadin.ui.components.grid.Renderer Renderer}. As a connector, it
- * can use the regular Vaadin RPC and shared state mechanism to pass additional
- * state and information between the client and the server. This base class
- * itself only uses the basic {@link com.vaadin.shared.communication.SharedState
- * SharedState} and no RPC interfaces.
+ * to link a client-side {@link Renderer} to a server-side <code>Renderer</code>
+ * . As a connector, it can use the regular Vaadin RPC and shared state
+ * mechanism to pass additional state and information between the client and the
+ * server. This base class itself only uses the basic {@link SharedState} and no
+ * RPC interfaces.
  *
  * @param <T>
  *            the presentation type of the renderer
diff --git a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
index c1af71580e..05f488a027 100644
--- a/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
@@ -101,7 +101,7 @@ import elemental.json.JsonValue;
 
 /**
  * Connects the client side {@link Grid} widget with the server side
- * {@link com.vaadin.ui.components.grid.Grid} component.
+ * <code>Grid</code> component.
  * <p>
  * The Grid is typed to JSONObject. The structure of the JSONObject is described
  * at {@link com.vaadin.shared.data.DataProviderRpc#setRowData(int, List)
@@ -389,7 +389,7 @@ public class GridConnector extends AbstractHasComponentsConnector
             } else {
                 Collection<Column<?, JsonObject>> errorColumns;
                 if (errorColumnsIds != null) {
-                    errorColumns = new ArrayList<Grid.Column<?, JsonObject>>();
+                    errorColumns = new ArrayList<Column<?, JsonObject>>();
                     for (String colId : errorColumnsIds) {
                         errorColumns.add(columnIdToColumn.get(colId));
                     }
diff --git a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
index 5c0a84bd5f..fcc264a264 100644
--- a/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
@@ -418,7 +418,7 @@ public class MultiSelectionModelConnector extends
         @Override
         public void setUserSelectionAllowed(boolean userSelectionAllowed) {
             this.userSelectionAllowed = userSelectionAllowed;
-            for (Column<?, ?> c : getGrid().getColumns()) {
+            for (Column<?, JsonObject> c : getGrid().getColumns()) {
                 if (c instanceof SelectionColumn) {
                     ((SelectionColumn) c)
                             .setUserSelectionAllowed(userSelectionAllowed);
diff --git a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
index 7cd30e40ef..f8421f7dfb 100644
--- a/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
@@ -215,6 +215,5 @@ public class SingleSelectionModelConnector extends
         public void setUserSelectionAllowed(boolean userSelectionAllowed) {
             this.userSelectionAllowed = userSelectionAllowed;
         }
-
     }
-}
\ No newline at end of file
+}
diff --git a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
index 59caf4f150..a79e541a93 100644
--- a/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
@@ -58,7 +58,7 @@ public abstract class ClickableRenderer<T, W extends Widget>
      * @param <R>
      *            the row type of the containing Grid
      *
-     * @see {@link ButtonRenderer#addClickHandler(RendererClickHandler)}
+     * @see ButtonRenderer#addClickHandler(RendererClickHandler)
      */
     public interface RendererClickHandler<R> extends EventHandler {
 
diff --git a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java
index 34f1b4f38f..a1cc5c7f2b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VCheckBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java
@@ -54,8 +54,7 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox
 
         Element el = DOM.getFirstChild(getElement());
         while (el != null) {
-            DOM.sinkEvents(el,
-                    (DOM.getEventsSunk(el) | VTooltip.TOOLTIP_EVENTS));
+            DOM.sinkEvents(el, DOM.getEventsSunk(el) | VTooltip.TOOLTIP_EVENTS);
             el = DOM.getNextSibling(el);
         }
 
@@ -73,8 +72,8 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox
 
     @Override
     public void onBrowserEvent(Event event) {
-        if (icon != null && (event.getTypeInt() == Event.ONCLICK)
-                && (DOM.eventGetTarget(event) == icon.getElement())) {
+        if (icon != null && event.getTypeInt() == Event.ONCLICK
+                && DOM.eventGetTarget(event) == icon.getElement()) {
             // Click on icon should do nothing if widget is disabled
             if (isEnabled()) {
                 setValue(!getValue());
diff --git a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java
index c3e369f39c..74f0fabaf5 100644
--- a/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java
@@ -59,9 +59,8 @@ import com.vaadin.shared.ui.datefield.Resolution;
  * selector.
  *
  * <b>Note:</b> To change the keyboard assignments used in the popup dialog you
- * should extend <code>com.vaadin.client.ui.VCalendarPanel</code> and then pass
- * set it by calling the <code>setCalendarPanel(VCalendarPanel panel)</code>
- * method.
+ * should extend <code>VCalendarPanel</code> and then pass set it by calling the
+ * <code>setCalendarPanel(VCalendarPanel panel)</code> method.
  *
  */
 public class VPopupCalendar extends VTextualDate
@@ -363,12 +362,6 @@ public class VPopupCalendar extends VTextualDate
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.google.gwt.user.client.ui.UIObject#setStyleName(java.lang.String)
-     */
     @Override
     public void setStyleName(String style) {
         super.setStyleName(style);
@@ -416,13 +409,6 @@ public class VPopupCalendar extends VTextualDate
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event
-     * .dom.client.ClickEvent)
-     */
     @Override
     public void onClick(ClickEvent event) {
         if (event.getSource() == calendarToggle && isEnabled()) {
@@ -435,13 +421,6 @@ public class VPopupCalendar extends VTextualDate
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.google.gwt.event.logical.shared.CloseHandler#onClose(com.google.gwt
-     * .event.logical.shared.CloseEvent)
-     */
     @Override
     public void onClose(CloseEvent<PopupPanel> event) {
         if (event.getSource() == popup) {
@@ -499,7 +478,7 @@ public class VPopupCalendar extends VTextualDate
     /**
      * For internal use only. May be removed or replaced in the future.
      *
-     * @see com.vaadin.client.ui.VTextualDate#buildDate()
+     * @see VTextualDate#buildDate()
      */
     @Override
     public void buildDate() {
@@ -528,12 +507,6 @@ public class VPopupCalendar extends VTextualDate
         buildDate();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.client.ui.VDateField#onBrowserEvent(com.google
-     * .gwt.user.client.Event)
-     */
     @Override
     public void onBrowserEvent(com.google.gwt.user.client.Event event) {
         super.onBrowserEvent(event);
diff --git a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
index b4eb18a01d..cd84e83ebe 100644
--- a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
@@ -5373,7 +5373,7 @@ public class VScrollTable extends FlowPanel
          * </br>
          * Returns the maximum indent of the hierarcyColumn, if applicable.
          *
-         * @see {@link VScrollTable#getHierarchyColumnIndex()}
+         * @see VScrollTable#getHierarchyColumnIndex()
          *
          * @return maximum indent in pixels
          */
diff --git a/client/src/main/java/com/vaadin/client/ui/VSlider.java b/client/src/main/java/com/vaadin/client/ui/VSlider.java
index cc36d8b8d9..b2653fcf42 100644
--- a/client/src/main/java/com/vaadin/client/ui/VSlider.java
+++ b/client/src/main/java/com/vaadin/client/ui/VSlider.java
@@ -214,7 +214,7 @@ public class VSlider extends SimpleFocusablePanel
                     @Override
                     public void execute() {
                         final Element p = getElement();
-                        if (p.getPropertyInt(domProperty) > (MIN_SIZE + 5)
+                        if (p.getPropertyInt(domProperty) > MIN_SIZE + 5
                                 || propertyNotNullOrEmpty(styleAttribute, p)) {
                             if (isVertical()) {
                                 setHeight();
@@ -283,10 +283,10 @@ public class VSlider extends SimpleFocusablePanel
             increaseValue(true);
         } else if (DOM.eventGetType(event) == Event.MOUSEEVENTS) {
             processBaseEvent(event);
-        } else if ((BrowserInfo.get().isGecko()
-                && DOM.eventGetType(event) == Event.ONKEYPRESS)
-                || (!BrowserInfo.get().isGecko()
-                        && DOM.eventGetType(event) == Event.ONKEYDOWN)) {
+        } else if (BrowserInfo.get().isGecko()
+                && DOM.eventGetType(event) == Event.ONKEYPRESS
+                || !BrowserInfo.get().isGecko()
+                        && DOM.eventGetType(event) == Event.ONKEYDOWN) {
 
             if (handleNavigation(event.getKeyCode(), event.getCtrlKey(),
                     event.getShiftKey())) {
@@ -406,10 +406,10 @@ public class VSlider extends SimpleFocusablePanel
         }
 
         if (isVertical()) {
-            v = ((baseSize - (coord - baseOffset))
-                    / (double) (baseSize - handleSize)) * (max - min) + min;
+            v = (baseSize - (coord - baseOffset))
+                    / (double) (baseSize - handleSize) * (max - min) + min;
         } else {
-            v = ((coord - baseOffset) / (double) (baseSize - handleSize))
+            v = (coord - baseOffset) / (double) (baseSize - handleSize)
                     * (max - min) + min;
         }
 
@@ -475,8 +475,8 @@ public class VSlider extends SimpleFocusablePanel
             return false;
         }
 
-        if ((keycode == getNavigationUpKey() && isVertical())
-                || (keycode == getNavigationRightKey() && !isVertical())) {
+        if (keycode == getNavigationUpKey() && isVertical()
+                || keycode == getNavigationRightKey() && !isVertical()) {
             if (shift) {
                 for (int a = 0; a < acceleration; a++) {
                     increaseValue(false);
@@ -487,7 +487,7 @@ public class VSlider extends SimpleFocusablePanel
             }
             return true;
         } else if (keycode == getNavigationDownKey() && isVertical()
-                || (keycode == getNavigationLeftKey() && !isVertical())) {
+                || keycode == getNavigationLeftKey() && !isVertical()) {
             if (shift) {
                 for (int a = 0; a < acceleration; a++) {
                     decreaseValue(false);
@@ -614,7 +614,7 @@ public class VSlider extends SimpleFocusablePanel
                 : "offsetWidth";
         final int handleSize = handle.getPropertyInt(domProperty);
         final int baseSize = base.getPropertyInt(domProperty)
-                - (2 * BASE_BORDER_WIDTH);
+                - 2 * BASE_BORDER_WIDTH;
 
         final int range = baseSize - handleSize;
         double v = value.doubleValue();
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
index 83017713d9..d064aed056 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
@@ -56,7 +56,7 @@ public class DateCell extends FocusableComplexPanel implements MouseDownHandler,
     private boolean disabled = false;
     private int height;
     private final Element[] slotElements;
-    private final List<DateCellSlot> slots = new ArrayList<DateCell.DateCellSlot>();
+    private final List<DateCellSlot> slots = new ArrayList<DateCellSlot>();
     private int[] slotElementHeights;
     private int startingSlotHeight;
     private Date today;
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
index 98b6c666ad..10fe400611 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
@@ -28,8 +28,8 @@ import com.vaadin.ui.ColorPickerArea;
 
 /**
  * A class that defines an implementation for a color picker connector. Connects
- * the server side {@link com.vaadin.ui.ColorPickerArea} with the client side
- * counterpart {@link VColorPickerArea}
+ * the server side {@link ColorPickerArea} with the client side counterpart
+ * {@link VColorPickerArea}
  *
  * @since 7.0.0
  */
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
index 9fc25a9e19..476c20dcff 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
@@ -27,8 +27,8 @@ import com.vaadin.ui.ColorPicker;
 
 /**
  * A class that defines default implementation for a color picker connector.
- * Connects the server side {@link com.vaadin.ui.ColorPicker} with the client
- * side counterpart {@link VColorPicker}
+ * Connects the server side {@link ColorPicker} with the client side counterpart
+ * {@link VColorPicker}
  *
  * @since 7.0.0
  */
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
index 3cff8a4d0d..5d2ac508cb 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
@@ -30,8 +30,7 @@ import com.vaadin.ui.components.colorpicker.ColorPickerGradient;
 
 /**
  * A class that defines the default implementation for a color picker gradient
- * connector. Connects the server side
- * {@link com.vaadin.ui.components.colorpicker.ColorPickerGradient} with the
+ * connector. Connects the server side {@link ColorPickerGradient} with the
  * client side counterpart {@link VColorPickerGradient}
  *
  * @since 7.0.0
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
index b13fe8fa0e..1635edcafd 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
@@ -30,8 +30,7 @@ import com.vaadin.ui.components.colorpicker.ColorPickerGrid;
 
 /**
  * A class that defines the default implementation for a color picker grid
- * connector. Connects the server side
- * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the client
+ * connector. Connects the server side {@link ColorPickerGrid} with the client
  * side counterpart {@link VColorPickerGrid}
  *
  * @since 7.0.0
diff --git a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
index 04868c04b9..83bffd773b 100644
--- a/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
@@ -36,11 +36,6 @@ import com.vaadin.ui.DateField;
 @Connect(DateField.class)
 public class DateFieldConnector extends TextualDateConnector {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.client.ui.AbstractConnector#init()
-     */
     @Override
     protected void init() {
         getWidget().popup.addCloseHandler(new CloseHandler<PopupPanel>() {
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java
index 89da37897c..3e8c822b18 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java
@@ -19,29 +19,29 @@ package com.vaadin.client.widget.escalator;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.TableRowElement;
 import com.google.gwt.dom.client.TableSectionElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * A representation of the rows in each of the sections (header, body and
- * footer) in an {@link com.vaadin.client.widgets.Escalator}.
+ * footer) in an {@link Escalator}.
  *
  * @since 7.4
  * @author Vaadin Ltd
- * @see com.vaadin.client.widgets.Escalator#getHeader()
- * @see com.vaadin.client.widgets.Escalator#getBody()
- * @see com.vaadin.client.widgets.Escalator#getFooter()
+ * @see Escalator#getHeader()
+ * @see Escalator#getBody()
+ * @see Escalator#getFooter()
  * @see SpacerContainer
  */
 public interface RowContainer {
 
     /**
-     * The row container for the body section in an
-     * {@link com.vaadin.client.widgets.Escalator}.
+     * The row container for the body section in an {@link Escalator}.
      * <p>
      * The body section can contain both rows and spacers.
      *
      * @since 7.5.0
      * @author Vaadin Ltd
-     * @see com.vaadin.client.widgets.Escalator#getBody()
+     * @see Escalator#getBody()
      */
     public interface BodyRowContainer extends RowContainer {
 
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java b/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java
index 000cd14f6c..abf9451aac 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java
@@ -19,7 +19,7 @@ import com.google.gwt.dom.client.Element;
 
 /**
  * A representation of a spacer element in a
- * {@link com.vaadin.client.widget.escalator.RowContainer.BodyRowContainer}.
+ * {@link RowContainer.BodyRowContainer}.
  *
  * @since 7.5.0
  * @author Vaadin Ltd
diff --git a/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java
index 181c8e78da..00ab6e8253 100644
--- a/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/GridEventHandler.java
@@ -31,4 +31,4 @@ public interface GridEventHandler<T> {
      *            the event that occurred
      */
     public void onEvent(GridEvent<T> event);
-}
\ No newline at end of file
+}
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 44c627776d..f9cf19e48e 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -81,11 +81,14 @@ import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.DeferredWorker;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.WidgetUtil;
+import com.vaadin.client.data.AbstractRemoteDataSource;
 import com.vaadin.client.data.DataChangeHandler;
 import com.vaadin.client.data.DataSource;
 import com.vaadin.client.data.DataSource.RowHandle;
 import com.vaadin.client.renderers.ComplexRenderer;
+import com.vaadin.client.renderers.ProgressBarRenderer;
 import com.vaadin.client.renderers.Renderer;
+import com.vaadin.client.renderers.TextRenderer;
 import com.vaadin.client.renderers.WidgetRenderer;
 import com.vaadin.client.ui.FocusUtil;
 import com.vaadin.client.ui.SubPartAware;
@@ -123,6 +126,7 @@ import com.vaadin.client.widget.grid.HeightAwareDetailsGenerator;
 import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.client.widget.grid.RowReference;
 import com.vaadin.client.widget.grid.RowStyleGenerator;
+import com.vaadin.client.widget.grid.datasources.ListDataSource;
 import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler;
 import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler;
 import com.vaadin.client.widget.grid.events.BodyClickHandler;
@@ -200,12 +204,10 @@ import com.vaadin.shared.util.SharedUtil;
  * <p>
  * Each column also has a Renderer. Its function is to take the value that is
  * given by the {@code GridColumn} and display it to the user. A simple column
- * might have a {@link com.vaadin.client.renderers.TextRenderer TextRenderer}
- * that simply takes in a {@code String} and displays it as the cell's content.
- * A more complex renderer might be
- * {@link com.vaadin.client.renderers.ProgressBarRenderer ProgressBarRenderer}
- * that takes in a floating point number, and displays a progress bar instead,
- * based on the given number.
+ * might have a {@link TextRenderer} that simply takes in a {@code String} and
+ * displays it as the cell's content. A more complex renderer might be
+ * {@link ProgressBarRenderer} that takes in a floating point number, and
+ * displays a progress bar instead, based on the given number.
  * <p>
  * <em>See:</em> {@link #addColumn(Column)}, {@link #addColumn(Column, int)} and
  * {@link #addColumns(Column...)}. <em>Also</em>
@@ -215,10 +217,8 @@ import com.vaadin.shared.util.SharedUtil;
  * <p>
  * Grid gets its data from a {@link DataSource}, providing row objects to Grid
  * from a user-defined endpoint. It can be either a local in-memory data source
- * (e.g. {@link com.vaadin.client.widget.grid.datasources.ListDataSource
- * ListDataSource}) or even a remote one, retrieving data from e.g. a REST API
- * (see {@link com.vaadin.client.data.AbstractRemoteDataSource
- * AbstractRemoteDataSource}).
+ * (e.g. {@link ListDataSource}) or even a remote one, retrieving data from e.g.
+ * a REST API (see {@link AbstractRemoteDataSource}).
  *
  *
  * @param <T>
@@ -2883,6 +2883,15 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         }
     }
 
+    private final List<GridEventHandler<T>> browserEventHandlers = new ArrayList<GridEventHandler<T>>();
+
+    private CellStyleGenerator<T> cellStyleGenerator;
+    private RowStyleGenerator<T> rowStyleGenerator;
+    private RowReference<T> rowReference = new RowReference<T>(this);
+    private CellReference<T> cellReference = new CellReference<T>(rowReference);
+    private RendererCellReference rendererCellReference = new RendererCellReference(
+            (RowReference<Object>) rowReference);
+
     public final class SelectionColumn extends Column<Boolean, T>
             implements GridEnabledHandler {
 
@@ -4189,6 +4198,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
     private AutoScroller autoScroller = new AutoScroller(this);
 
+    private ColumnResizeMode columnResizeMode = ColumnResizeMode.ANIMATED;
+
     private DragAndDropHandler.DragAndDropCallback headerCellDndCallback = new DragAndDropCallback() {
 
         private final AutoScrollerCallback autoScrollerCallback = new AutoScrollerCallback() {
@@ -4643,15 +4654,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
     };
 
-    private final List<GridEventHandler<T>> browserEventHandlers = new ArrayList<GridEventHandler<T>>();
-
-    private CellStyleGenerator<T> cellStyleGenerator;
-    private RowStyleGenerator<T> rowStyleGenerator;
-    private RowReference<T> rowReference = new RowReference<T>(this);
-    private CellReference<T> cellReference = new CellReference<T>(rowReference);
-    private RendererCellReference rendererCellReference = new RendererCellReference(
-            (RowReference<Object>) rowReference);
-
     /**
      * Enumeration for easy setting of selection mode.
      */
@@ -6209,8 +6211,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         fireEvent(new GridEnabledEvent(enabled));
     }
 
-    private ColumnResizeMode columnResizeMode = ColumnResizeMode.ANIMATED;
-
     /**
      * Sets the column resize mode to use. The default mode is
      * {@link ColumnResizeMode.ANIMATED}.
@@ -7910,7 +7910,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
      *
      * @param mode
      *            a selection mode value
-     * @see {@link SelectionMode}.
+     * @see SelectionMode
      */
     public void setSelectionMode(SelectionMode mode) {
         SelectionModel<T> model = mode.createModel();
@@ -7982,8 +7982,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
     /**
      * Deselect all rows using the current selection model.
      *
-     * @param row
-     *            a row object
      * @return <code>true</code> iff the current selection changed
      * @throws IllegalStateException
      *             if the current selection model is not an instance of