Eliminate more full classnames

4 files changed, 29 insertions, 35 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
index 86197c5279..809fbda644 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
@@ -527,7 +527,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * added at the very end of the unfiltered container and not after the last
      * visible item if filtering is used.
      *
-     * @see com.com.vaadin.v7.data.Container#addItem(Object)
+     * @see Container#addItem(Object)
      */
     protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
         if (!validateBean(bean)) {
@@ -539,8 +539,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean after the given bean.
      *
-     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object,
-     *      Object)
+     * @see Container.Ordered#addItemAfter(Object, Object)
      */
     protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
             IDTYPE newItemId, BEANTYPE bean) {
@@ -799,7 +798,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
index 8bfd536a8d..dbb27a22ed 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
@@ -101,7 +101,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
+     * @see PropertySetChangeNotifier#addListener(Container.PropertySetChangeListener)
      */
     protected void addPropertySetChangeListener(
             Container.PropertySetChangeListener listener) {
@@ -114,7 +114,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.PropertySetChangeListener listener) {
@@ -126,7 +126,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.
+     * @see PropertySetChangeNotifier#removeListener(Container.
      *      PropertySetChangeListener)
      */
     protected void removePropertySetChangeListener(
@@ -138,7 +138,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(
@@ -153,7 +153,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#addListener(Container.ItemSetChangeListener)
      */
     protected void addItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -166,7 +166,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.ItemSetChangeListener listener) {
@@ -178,7 +178,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#removeListener(Container.ItemSetChangeListener)
      */
     protected void removeItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -189,7 +189,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(Container.ItemSetChangeListener listener) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
index 2adb3c9617..be33a0db21 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
@@ -67,19 +67,18 @@ import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
  * <code>sort(Object[], boolean[])</code>.
  *
  * To implement {@link Filterable}, subclasses need to implement the methods
- * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
- * (calling {@link #addFilter(Filter)}),
- * {@link Filterable#removeAllContainerFilters()} (calling
- * {@link #removeAllFilters()}) and
- * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
- * (calling {@link #removeFilter(com.com.vaadin.v7.data.Container.Filter)}).
+ * {@link Filterable#addContainerFilter(Container.Filter)} (calling
+ * {@link #addFilter(Filter)}), {@link Filterable#removeAllContainerFilters()}
+ * (calling {@link #removeAllFilters()}) and
+ * {@link Filterable#removeContainerFilter(Container.Filter)} (calling
+ * {@link #removeFilter(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.com.vaadin.v7.data.Container.Filter)} and
- * {@link #removeFilters(Object)} respectively.
+ * {@link #addFilter(Container.Filter)} and {@link #removeFilters(Object)}
+ * respectively.
  *
  * @param <ITEMIDTYPE>
  *            the class of item identifiers in the container, use Object if can
@@ -447,7 +446,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     // ItemSetChangeNotifier
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -469,7 +468,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -569,8 +568,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * be in-memory filterable.
      *
      * This can be used to implement
-     * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
-     * and optionally also
+     * {@link Filterable#addContainerFilter(Container.Filter)} and optionally
+     * also
      * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
      * (with {@link SimpleStringFilter}).
      *
@@ -609,8 +608,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.com.vaadin.v7.data.Container.Filter)}
-     * .
+     * {@link Filterable#removeContainerFilter(Container.Filter)} .
      */
     protected void removeFilter(Filter filter) {
         for (Iterator<Filter> iterator = getFilters().iterator(); iterator
@@ -721,8 +719,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Subclasses should call this from a public
      * {@link #sort(Object[], boolean[])} method when implementing Sortable.
      *
-     * @see com.com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[],
-     *      boolean[])
+     * @see Container.Sortable#sort(java.lang.Object[], boolean[])
      */
     protected void sortContainer(Object[] propertyId, boolean[] ascending) {
         if (!(this instanceof Sortable)) {
@@ -1145,9 +1142,8 @@ 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.com.vaadin.v7.data.Container.Filter)} and
-     * <code>remove*Filter*</code> (which also re-filter the container) instead
-     * when possible.
+     * {@link #addFilter(Container.Filter)} and <code>remove*Filter*</code>
+     * (which also re-filter the container) instead when possible.
      *
      * @param filters
      */
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 b5e2f6edda..375cfa0595 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
@@ -187,8 +187,7 @@ public class BeanItemContainer<BEANTYPE>
      * @param newItemId
      *            the bean (of type BT) to add (not null)
      *
-     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object,
-     *      Object)
+     * @see Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -221,7 +220,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.com.vaadin.v7.data.Container#addItem(Object)
+     * @see Container#addItem(Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -234,7 +233,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.com.vaadin.v7.data.Container#addItem(Object)
+     * @see Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addBean(BEANTYPE bean) {