Fix javadoc references (#10067)

And remove unused imports.

12 files changed, 38 insertions, 36 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
index 452f011f0a..154014707a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
@@ -40,7 +40,7 @@ import com.vaadin.v7.ui.Field;
  * FieldGroup provides an easy way of binding fields to data and handling
  * commits of these fields.
  * <p>
- * The functionality of FieldGroup is similar to {@link Form} but
+ * The functionality of FieldGroup is similar to {@link com.vaadin.v7.ui.Form Form} but
  * {@link FieldGroup} does not handle layouts in any way. The typical use case
  * is to create a layout outside the FieldGroup and then use FieldGroup to bind
  * the fields to a data source.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
index 346088d3ac..23cc54f096 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.v7.data.util;
 
-import com.vaadin.data.provider.DataProvider;
-
 import java.util.Collection;
 
 import com.vaadin.data.provider.ListDataProvider;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
index eee7f8a321..5a3a0cd3b5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.v7.data.util;
 
-import com.vaadin.data.provider.ListDataProvider;
-
 import java.util.Collection;
 
+import com.vaadin.data.provider.ListDataProvider;
+
 /**
  * An in-memory container for JavaBeans.
  *
@@ -190,7 +190,8 @@ public class BeanItemContainer<BEANTYPE>
      * @param newItemId
      *            the bean (of type BT) to add (not null)
      *
-     * @see Container.Ordered#addItemAfter(Object, Object)
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
+     *            Ordered#addItemAfter(Object, Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -223,7 +224,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see Container#addItem(Object)
+     * @see com.vaadin.v7.data.Container#addItem(Object) Container#addItem(Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -236,7 +237,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see Container#addItem(Object)
+     * @see com.vaadin.v7.data.Container#addItem(Object) Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addBean(BEANTYPE bean) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
index 880350a3b2..e373020bd8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java
@@ -17,13 +17,12 @@ package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
-import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Hierarchical;
 
 /**
  * A wrapper class for adding external ordering to containers not implementing
- * the {@link Container.Ordered} interface while retaining {@link Hierarchical}
- * features.
+ * the {@link com.vaadin.v7.data.Container.Ordered Container.Ordered}
+ * interface while retaining {@link Hierarchical} features.
  *
  * @see ContainerOrderedWrapper
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
index 70572c8e65..d1e45c0d1b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
@@ -16,7 +16,6 @@
 package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
-import java.util.Map;
 
 import com.vaadin.data.Binder;
 import com.vaadin.data.provider.DataProvider;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
index 16ff8052cf..bbe51c09a0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
@@ -16,7 +16,6 @@
 package com.vaadin.v7.data.util;
 
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeNotifier;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
index 044b42b10f..8a1e2a129e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/event/SortEvent.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.v7.data.sort.SortOrder;
 
 /**
- * Event describing a change in sorting of a {@link Container}. Fired by
- * {@link SortNotifier SortNotifiers}.
+ * Event describing a change in sorting of a {@link com.vaadin.v7.data.Container Container}.
+ * Fired by {@link SortNotifier SortNotifiers}.
  *
  * @see SortListener
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
index 5d1b8ffee3..e2d7a81104 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
@@ -32,7 +32,6 @@ import com.vaadin.server.KeyMapper;
 import com.vaadin.shared.Range;
 import com.vaadin.shared.data.DataProviderRpc;
 import com.vaadin.shared.data.DataRequestRpc;
-import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Indexed;
 import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
 import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
@@ -54,7 +53,7 @@ import elemental.json.JsonObject;
 
 /**
  * Provides Vaadin server-side container data source to a
- * {@link com.vaadin.v7.client.connectors.GridConnector}. This is currently
+ * {@link com.vaadin.v7.client.connectors.GridConnector GridConnector}. This is currently
  * 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.
@@ -154,9 +153,10 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * A class to listen to changes in property values in the Container added
-     * with {@link Grid#setContainerDatasource(Container.Indexed)}, and notifies
-     * the data source to update the client-side representation of the modified
-     * item.
+     * with {@link Grid#setContainerDatasource(com.vaadin.v7.data.Container.Indexed)
+     * Grid#setContainerDatasource(Container.Indexed)},
+     * and notifies the data source to update the client-side representation
+     * of the modified item.
      * <p>
      * One instance of this class can (and should) be reused for all the
      * properties in an item, since this class will inform that the entire row
@@ -167,7 +167,8 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * 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#addValueChangeListener(com.vaadin.v7.data.Container, Object, Object)
+     *      Grid#addValueChangeListener(Container, Object, Object)
      * @see Grid#valueChangeListeners
      */
     private class GridValueChangeListener implements ValueChangeListener {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index caef040d25..9b64d1e6f8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -1520,7 +1520,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation of a {@link SelectionModel.Single}
+     * A default implementation of a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}.
      */
     @Deprecated
     public static class SingleSelectionModel extends AbstractSelectionModel
@@ -1646,7 +1647,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation for a {@link SelectionModel.None}
+     * A default implementation for a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.None SelectionModel.None}.
      */
     @Deprecated
     public static class NoSelectionModel extends AbstractSelectionModel
@@ -1674,7 +1676,8 @@ public class Grid extends AbstractComponent
     }
 
     /**
-     * A default implementation of a {@link SelectionModel.Multi}
+     * A default implementation of a
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}.
      */
     @Deprecated
     public static class MultiSelectionModel extends AbstractSelectionModel
@@ -5883,7 +5886,7 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} is supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single} is supported.
      *
      * @return the item id of the currently selected item, or <code>null</code>
      *         if nothing is selected
@@ -5920,8 +5923,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @param itemId
      *            the itemId to mark as selected
@@ -5966,8 +5970,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @param itemId
      *            the itemId to remove from being selected
@@ -6013,8 +6018,9 @@ public class Grid extends AbstractComponent
      * <p>
      * This method is a shorthand that delegates to the
      * {@link #getSelectionModel() selection model}. Only
-     * {@link SelectionModel.Single} and {@link SelectionModel.Multi} are
-     * supported.
+     * {@link com.vaadin.v7.ui.Grid.SelectionModel.Single SelectionModel.Single}
+     * and {@link com.vaadin.v7.ui.Grid.SelectionModel.Multi SelectionModel.Multi}
+     * are supported.
      *
      * @return <code>true</code> if the selection state changed,
      *         <code>false</code> if the itemId was already selected
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
index 3c608efc70..4ea45422d3 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
@@ -39,7 +39,6 @@ import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.v7.data.Collapsible;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Hierarchical;
-import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
index 3b4a0bb27a..2d288a66d9 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
@@ -173,7 +173,7 @@ public class Reindeer extends BaseTheme {
 
     /**
      * Changes the background of a layout to white. Applies to
-     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout},
+     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link com.vaadin.ui.GridLayout GridLayout},
      * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and
      * {@link HorizontalSplitPanel}.
      * <p>
@@ -184,7 +184,7 @@ public class Reindeer extends BaseTheme {
 
     /**
      * Changes the background of a layout to a shade of blue. Applies to
-     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link GridLayout},
+     * {@link VerticalLayout}, {@link HorizontalLayout}, {@link com.vaadin.ui.GridLayout GridLayout},
      * {@link FormLayout}, {@link CssLayout}, {@link VerticalSplitPanel} and
      * {@link HorizontalSplitPanel}.
      * <p>
@@ -202,7 +202,7 @@ public class Reindeer extends BaseTheme {
      * </p>
      * <p>
      * Applies to {@link VerticalLayout}, {@link HorizontalLayout},
-     * {@link GridLayout}, {@link FormLayout} and {@link CssLayout}.
+     * {@link com.vaadin.ui.GridLayout GridLayout}, {@link FormLayout} and {@link CssLayout}.
      * </p>
      *
      */
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
index ef4aac49f5..74133fa0b6 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java
@@ -29,8 +29,8 @@ import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.Container.ItemSetChangeListener;
 import com.vaadin.v7.data.Container.PropertySetChangeEvent;
 import com.vaadin.v7.data.Container.PropertySetChangeListener;
-import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.sort.SortOrder;
 import com.vaadin.v7.data.util.GeneratedPropertyContainer.GeneratedPropertyItem;
 import com.vaadin.v7.data.util.filter.Compare;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;