Move Item to compatibility package

Change-Id: I51ad45a18d2dcfbd582c7e4bdcca99300d20cee0

diff --git a/compatibility-server/src/main/java/com/vaadin/event/DataBoundTransferable.java b/compatibility-server/src/main/java/com/vaadin/event/DataBoundTransferable.java
deleted file mode 100644 (file)
index d4b4a5b..0000000
--- a/compatibility-server/src/main/java/com/vaadin/event/DataBoundTransferable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.event;
-
-import java.util.Map;
-
-import com.vaadin.ui.Component;
-import com.vaadin.v7.data.Container;
-
-/**
- * Parent class for {@link Transferable} implementations that have a Vaadin
- * 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.v7.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 {
-
-    public DataBoundTransferable(Component sourceComponent,
-            Map<String, Object> rawVariables) {
-        super(sourceComponent, rawVariables);
-    }
-
-    /**
-     * 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.v7.data.Container.Viewer#getContainerDataSource()} is used
-     * to obtain the underlying container of the source component.
-     *
-     * @return Container
-     */
-    public Container getSourceContainer() {
-        Component sourceComponent = getSourceComponent();
-        if (sourceComponent instanceof Container.Viewer) {
-            return ((Container.Viewer) sourceComponent)
-                    .getContainerDataSource();
-        } else {
-            // this should not happen
-            return null;
-        }
-    }
-}

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java
new file mode 100644 (file)
index 0000000..d90cdca
--- /dev/null
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.v7.data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * <p>
+ * Provides a mechanism for handling a set of Properties, each associated to a
+ * 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
+ */
+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>
+     */
+    public Property getItemProperty(Object id);
+
+    /**
+     * Gets the collection of IDs of all Properties stored in the Item.
+     *
+     * @return unmodifiable collection containing IDs of the Properties stored
+     *         the Item
+     */
+    public Collection<?> getItemPropertyIds();
+
+    /**
+     * Tries to add a new Property into the Item.
+     *
+     * <p>
+     * This functionality is optional.
+     * </p>
+     *
+     * @param id
+     *            ID of the new Property
+     * @param property
+     *            the Property to be added and associated with the id
+     * @return <code>true</code> if the operation succeeded, <code>false</code>
+     *         if not
+     * @throws UnsupportedOperationException
+     *             if the operation is not supported.
+     */
+    public boolean addItemProperty(Object id, Property property)
+            throws UnsupportedOperationException;
+
+    /**
+     * 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
+     * @throws UnsupportedOperationException
+     *             if the operation is not supported. <code>false</code> if not
+     */
+    public boolean removeItemProperty(Object id)
+            throws UnsupportedOperationException;
+
+    /**
+     * Interface implemented by viewer classes capable of using an Item as a
+     * data source.
+     */
+    public interface Viewer extends Serializable {
+
+        /**
+         * Sets the Item that serves as the data source of the viewer.
+         *
+         * @param newDataSource
+         *            The new data source Item
+         */
+        public void setItemDataSource(Item newDataSource);
+
+        /**
+         * Gets the Item serving as the data source of the viewer.
+         *
+         * @return data source Item
+         */
+        public Item getItemDataSource();
+    }
+
+    /**
+     * Interface implemented by the <code>Editor</code> classes capable of
+     * editing the Item. Implementing this interface means that the Item serving
+     * as the data source of the editor can be modified through it.
+     * <p>
+     * Note : Not implementing the <code>Item.Editor</code> interface does not
+     * restrict the class from editing the contents of an internally.
+     * </p>
+     */
+    public interface Editor extends Item.Viewer, Serializable {
+
+    }
+
+    /* Property set change event */
+
+    /**
+     * An <code>Event</code> object specifying the Item whose contents has been
+     * changed through the <code>Property</code> interface.
+     * <p>
+     * Note: The values stored in the Properties may change without triggering
+     * this event.
+     * </p>
+     */
+    public interface PropertySetChangeEvent extends Serializable {
+
+        /**
+         * Retrieves the Item whose contents has been modified.
+         *
+         * @return source Item of the event
+         */
+        public Item getItem();
+    }
+
+    /**
+     * The listener interface for receiving <code>PropertySetChangeEvent</code>
+     * objects.
+     */
+    public interface PropertySetChangeListener extends Serializable {
+
+        /**
+         * Notifies this listener that the Item's property set has changed.
+         *
+         * @param event
+         *            Property set change event object
+         */
+        public void itemPropertySetChange(Item.PropertySetChangeEvent event);
+    }
+
+    /**
+     * The interface for adding and removing <code>PropertySetChangeEvent</code>
+     * listeners. By implementing this interface a class explicitly announces
+     * that it will generate a <code>PropertySetChangeEvent</code> when its
+     * Property set is modified.
+     * <p>
+     * Note : The general Java convention is not to explicitly declare that a
+     * class generates events, but to directly define the
+     * <code>addListener</code> and <code>removeListener</code> methods. That
+     * way the caller of these methods has no real way of finding out if the
+     * class really will send the events, or if it just defines the methods to
+     * be able to implement an interface.
+     * </p>
+     */
+    public interface PropertySetChangeNotifier extends Serializable {
+
+        /**
+         * Registers a new property set change listener for this Item.
+         *
+         * @param listener
+         *            The new Listener to be registered.
+         */
+        public void addPropertySetChangeListener(
+                Item.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated As of 7.0, replaced by
+         *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
+        public void addListener(Item.PropertySetChangeListener listener);
+
+        /**
+         * Removes a previously registered property set change listener.
+         *
+         * @param listener
+         *            Listener to be removed.
+         */
+        public void removePropertySetChangeListener(
+                Item.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated As of 7.0, replaced by
+         *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
+        public void removeListener(Item.PropertySetChangeListener listener);
+    }
+}

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java
new file mode 100644 (file)
index 0000000..092cf3f
--- /dev/null
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.v7.data.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+
+/**
+ * Class for handling a set of identified Properties. The elements contained in
+ * 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
+ */
+@SuppressWarnings("serial")
+public class PropertysetItem
+        implements Item, Item.PropertySetChangeNotifier, Cloneable {
+
+    /* Private representation of the item */
+
+    /**
+     * Mapping from property id to property.
+     */
+    private HashMap<Object, Property<?>> map = new HashMap<Object, Property<?>>();
+
+    /**
+     * List of all property ids to maintain the order.
+     */
+    private LinkedList<Object> list = new LinkedList<Object>();
+
+    /**
+     * List of property set modification listeners.
+     */
+    private LinkedList<Item.PropertySetChangeListener> propertySetChangeListeners = null;
+
+    /* Item methods */
+
+    /**
+     * 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>
+     */
+    @Override
+    public Property getItemProperty(Object id) {
+        return map.get(id);
+    }
+
+    /**
+     * Gets the collection of IDs of all Properties stored in the Item.
+     *
+     * @return unmodifiable collection containing IDs of the Properties stored
+     *         the Item
+     */
+    @Override
+    public Collection<?> getItemPropertyIds() {
+        return Collections.unmodifiableCollection(list);
+    }
+
+    /* Item.Managed methods */
+
+    /**
+     * 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>
+     *         if not
+     */
+    @Override
+    public boolean removeItemProperty(Object id) {
+
+        // Cant remove missing properties
+        if (map.remove(id) == null) {
+            return false;
+        }
+        list.remove(id);
+
+        // Send change events
+        fireItemPropertySetChange();
+
+        return true;
+    }
+
+    /**
+     * Tries to add a new Property into the Item.
+     *
+     * @param id
+     *            the ID of the new Property.
+     * @param property
+     *            the Property to be added and associated with the id.
+     * @return <code>true</code> if the operation succeeded, <code>false</code>
+     *         if not
+     */
+    @Override
+    public boolean addItemProperty(Object id, Property property) {
+
+        // Null ids are not accepted
+        if (id == null) {
+            throw new NullPointerException("Item property id can not be null");
+        }
+
+        // Cant add a property twice
+        if (map.containsKey(id)) {
+            return false;
+        }
+
+        // Put the property to map
+        map.put(id, property);
+        list.add(id);
+
+        // Send event
+        fireItemPropertySetChange();
+
+        return true;
+    }
+
+    /**
+     * Gets the <code>String</code> representation of the contents of the Item.
+     * 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
+    public String toString() {
+        String retValue = "";
+
+        for (final Iterator<?> i = getItemPropertyIds().iterator(); i
+                .hasNext();) {
+            final Object propertyId = i.next();
+            retValue += getItemProperty(propertyId).getValue();
+            if (i.hasNext()) {
+                retValue += " ";
+            }
+        }
+
+        return retValue;
+    }
+
+    /* Notifiers */
+
+    /**
+     * An <code>event</code> object specifying an Item whose Property set has
+     * changed.
+     *
+     * @author Vaadin Ltd.
+     * @since 3.0
+     */
+    private static class PropertySetChangeEvent extends EventObject
+            implements Item.PropertySetChangeEvent {
+
+        private PropertySetChangeEvent(Item source) {
+            super(source);
+        }
+
+        /**
+         * Gets the Item whose Property set has changed.
+         *
+         * @return source object of the event as an <code>Item</code>
+         */
+        @Override
+        public Item getItem() {
+            return (Item) getSource();
+        }
+    }
+
+    /**
+     * Registers a new property set change listener for this Item.
+     *
+     * @param listener
+     *            the new Listener to be registered.
+     */
+    @Override
+    public void addPropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
+        if (propertySetChangeListeners == null) {
+            propertySetChangeListeners = new LinkedList<PropertySetChangeListener>();
+        }
+        propertySetChangeListeners.add(listener);
+    }
+
+    /**
+     * @deprecated As of 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)}
+     **/
+    @Override
+    @Deprecated
+    public void addListener(Item.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
+     * Removes a previously registered property set change listener.
+     *
+     * @param listener
+     *            the Listener to be removed.
+     */
+    @Override
+    public void removePropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
+        if (propertySetChangeListeners != null) {
+            propertySetChangeListeners.remove(listener);
+        }
+    }
+
+    /**
+     * @deprecated As of 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)}
+     **/
+    @Override
+    @Deprecated
+    public void removeListener(Item.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
+     * Sends a Property set change event to all interested listeners.
+     */
+    private void fireItemPropertySetChange() {
+        if (propertySetChangeListeners != null) {
+            final Object[] l = propertySetChangeListeners.toArray();
+            final Item.PropertySetChangeEvent event = new PropertysetItem.PropertySetChangeEvent(
+                    this);
+            for (int i = 0; i < l.length; i++) {
+                ((Item.PropertySetChangeListener) l[i])
+                        .itemPropertySetChange(event);
+            }
+        }
+    }
+
+    public Collection<?> getListeners(Class<?> eventType) {
+        if (Item.PropertySetChangeEvent.class.isAssignableFrom(eventType)) {
+            if (propertySetChangeListeners == null) {
+                return Collections.EMPTY_LIST;
+            } else {
+                return Collections
+                        .unmodifiableCollection(propertySetChangeListeners);
+            }
+        }
+
+        return Collections.EMPTY_LIST;
+    }
+
+    /**
+     * Creates and returns a copy of this object.
+     * <p>
+     * The method <code>clone</code> performs a shallow copy of the
+     * <code>PropertysetItem</code>.
+     * </p>
+     * <p>
+     * Note : All arrays are considered to implement the interface Cloneable.
+     * Otherwise, this method creates a new instance of the class of this object
+     * and initializes all its fields with exactly the contents of the
+     * corresponding fields of this object, as if by assignment, the contents of
+     * 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
+    public Object clone() throws CloneNotSupportedException {
+
+        final PropertysetItem npsi = new PropertysetItem();
+
+        npsi.list = list != null ? (LinkedList<Object>) list.clone() : null;
+        npsi.propertySetChangeListeners = propertySetChangeListeners != null
+                ? (LinkedList<PropertySetChangeListener>) propertySetChangeListeners
+                        .clone()
+                : null;
+        npsi.map = (HashMap<Object, Property<?>>) map.clone();
+
+        return npsi;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj == null || !(obj instanceof PropertysetItem)) {
+            return false;
+        }
+
+        final PropertysetItem other = (PropertysetItem) obj;
+
+        if (other.list != list) {
+            if (other.list == null) {
+                return false;
+            }
+            if (!other.list.equals(list)) {
+                return false;
+            }
+        }
+        if (other.map != map) {
+            if (other.map == null) {
+                return false;
+            }
+            if (!other.map.equals(map)) {
+                return false;
+            }
+        }
+        if (other.propertySetChangeListeners != propertySetChangeListeners) {
+            boolean thisEmpty = (propertySetChangeListeners == null
+                    || propertySetChangeListeners.isEmpty());
+            boolean otherEmpty = (other.propertySetChangeListeners == null
+                    || other.propertySetChangeListeners.isEmpty());
+            if (thisEmpty && otherEmpty) {
+                return true;
+            }
+            if (otherEmpty) {
+                return false;
+            }
+            if (!other.propertySetChangeListeners
+                    .equals(propertySetChangeListeners)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+
+        return (list == null ? 0 : list.hashCode())
+                ^ (map == null ? 0 : map.hashCode())
+                ^ ((propertySetChangeListeners == null
+                        || propertySetChangeListeners.isEmpty()) ? 0
+                                : propertySetChangeListeners.hashCode());
+    }
+}

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java
new file mode 100644 (file)
index 0000000..1285fdc
--- /dev/null
+++ b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.v7.event;
+
+import java.util.Map;
+
+import com.vaadin.event.Transferable;
+import com.vaadin.event.TransferableImpl;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
+
+/**
+ * Parent class for {@link Transferable} implementations that have a Vaadin
+ * 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.v7.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 {
+
+    public DataBoundTransferable(Component sourceComponent,
+            Map<String, Object> rawVariables) {
+        super(sourceComponent, rawVariables);
+    }
+
+    /**
+     * 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.v7.data.Container.Viewer#getContainerDataSource()} is used
+     * to obtain the underlying container of the source component.
+     *
+     * @return Container
+     */
+    public Container getSourceContainer() {
+        Component sourceComponent = getSourceComponent();
+        if (sourceComponent instanceof Container.Viewer) {
+            return ((Container.Viewer) sourceComponent)
+                    .getContainerDataSource();
+        } else {
+            // this should not happen
+            return null;
+        }
+    }
+}

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java
new file mode 100644 (file)
index 0000000..e5f4572
--- /dev/null
+++ b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.v7.event;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import com.vaadin.event.MouseEvents.ClickEvent;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+
+/**
+ *
+ * Click event fired by a {@link Component} implementing
+ * {@link com.vaadin.v7.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 {
+    private Item item;
+    private Object itemId;
+    private Object propertyId;
+
+    public ItemClickEvent(Component source, Item item, Object itemId,
+            Object propertyId, MouseEventDetails details) {
+        super(source, details);
+        this.item = item;
+        this.itemId = itemId;
+        this.propertyId = propertyId;
+    }
+
+    /**
+     * Gets the item on which the click event occurred.
+     *
+     * @return item which was clicked
+     */
+    public Item getItem() {
+        return item;
+    }
+
+    /**
+     * Gets a possible identifier in source for clicked Item
+     *
+     * @return
+     */
+    public Object getItemId() {
+        return itemId;
+    }
+
+    /**
+     * 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.
+     */
+    public Object getPropertyId() {
+        return propertyId;
+    }
+
+    public static final Method ITEM_CLICK_METHOD;
+
+    static {
+        try {
+            ITEM_CLICK_METHOD = ItemClickListener.class.getDeclaredMethod(
+                    "itemClick", new Class[] { ItemClickEvent.class });
+        } catch (final java.lang.NoSuchMethodException e) {
+            // This should never happen
+            throw new java.lang.RuntimeException();
+        }
+    }
+
+    public interface ItemClickListener extends Serializable {
+        public void itemClick(ItemClickEvent event);
+    }
+
+    /**
+     * The interface for adding and removing <code>ItemClickEvent</code>
+     * listeners. By implementing this interface a class explicitly announces
+     * that it will generate an <code>ItemClickEvent</code> when one of its
+     * items is clicked.
+     * <p>
+     * Note: The general Java convention is not to explicitly declare that a
+     * class generates events, but to directly define the
+     * <code>addListener</code> and <code>removeListener</code> methods. That
+     * way the caller of these methods has no real way of finding out if the
+     * 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
+     */
+    public interface ItemClickNotifier extends Serializable {
+        /**
+         * Register a listener to handle {@link ItemClickEvent}s.
+         *
+         * @param listener
+         *            ItemClickListener to be registered
+         */
+        public void addItemClickListener(ItemClickListener listener);
+
+        /**
+         * @deprecated As of 7.0, replaced by
+         *             {@link #addItemClickListener(ItemClickListener)}
+         **/
+        @Deprecated
+        public void addListener(ItemClickListener listener);
+
+        /**
+         * Removes an ItemClickListener.
+         *
+         * @param listener
+         *            ItemClickListener to be removed
+         */
+        public void removeItemClickListener(ItemClickListener listener);
+
+        /**
+         * @deprecated As of 7.0, replaced by
+         *             {@link #removeItemClickListener(ItemClickListener)}
+         **/
+        @Deprecated
+        public void removeListener(ItemClickListener listener);
+    }
+
+}

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index b7b241598b4e54a530117053af756f5317209427..e184cd099849d7af6bc2a6ba1a2abdcc0937e37a 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -31,7 +31,6 @@ import java.util.Set;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropTarget;
@@ -60,6 +59,7 @@ import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**

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 0a5e5b40a41f50c96afcff360cdd44ae0b9175df..371520d5d5698fc6bb1eda6a9de6df30086a9f63 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -45,9 +45,6 @@ import org.jsoup.select.Elements;
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
 import com.vaadin.event.ContextClickEvent;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
 import com.vaadin.event.SelectionEvent.SelectionNotifier;
@@ -112,6 +109,9 @@ import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.v7.server.communication.data.DataGenerator;
 import com.vaadin.v7.server.communication.data.RpcDataProviderExtension;
 import com.vaadin.v7.ui.renderers.HtmlRenderer;

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 760940a482925f32111dfe0741153b62328aee69..d47f5479f438b412fee06d485eb909af229fc563 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -40,10 +40,6 @@ import org.jsoup.select.Elements;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
-import com.vaadin.event.DataBoundTransferable;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DragSource;
@@ -80,6 +76,10 @@ import com.vaadin.v7.data.util.ContainerOrderedWrapper;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.event.DataBoundTransferable;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 
 /**
  * <p>

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index 83f805ffb4996b6cf9385be3ebb6542700c04ba4..5744879ea6d32892a1a77184aa40858cfac70076 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -35,10 +35,6 @@ import org.jsoup.nodes.Element;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
-import com.vaadin.event.DataBoundTransferable;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DragSource;
@@ -67,6 +63,10 @@ import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from

diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
new file mode 100644 (file)
index 0000000..883130d
--- /dev/null
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
@@ -0,0 +1,14 @@
+package com.vaadin.tests.server;
+
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.data.Item.PropertySetChangeEvent;
+import com.vaadin.v7.data.Item.PropertySetChangeListener;
+import com.vaadin.v7.data.util.PropertysetItem;
+
+public class PropertysetItemListenersTest
+        extends AbstractListenerMethodsTestBase {
+    public void testPropertySetChangeListenerAddGetRemove() throws Exception {
+        testListenerAddGetRemove(PropertysetItem.class,
+                PropertySetChangeEvent.class, PropertySetChangeListener.class);
+    }
+}

diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java
index 7f76b1c11268429b01aaf3b5df55bb79d2a0fabd..155f60f7eedaad966466e5ccb081a3d902bea3c7 100644 (file)
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java
@@ -2,9 +2,9 @@ package com.vaadin.v7.tests.server.component.table;
 
 import org.junit.Test;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.ColumnReorderEvent;
 import com.vaadin.v7.ui.Table.ColumnReorderListener;

diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java
index a7831dc62828eb0ac985329f8890beaf6f1438ba..b4b357ff7e68dd2827ab1cdb0036a4fcd1059de5 100644 (file)
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java
@@ -2,9 +2,9 @@ package com.vaadin.v7.tests.server.component.tree;
 
 import org.junit.Test;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.CollapseEvent;
 import com.vaadin.v7.ui.Tree.CollapseListener;

diff --git a/server/src/main/java/com/vaadin/event/ItemClickEvent.java b/server/src/main/java/com/vaadin/event/ItemClickEvent.java
deleted file mode 100644 (file)
index 3680b77..0000000
--- a/server/src/main/java/com/vaadin/event/ItemClickEvent.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.event;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-
-import com.vaadin.event.MouseEvents.ClickEvent;
-import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.ui.Component;
-import com.vaadin.v7.data.Item;
-import com.vaadin.v7.data.Property;
-
-/**
- *
- * Click event fired by a {@link Component} implementing
- * {@link com.vaadin.v7.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 {
-    private Item item;
-    private Object itemId;
-    private Object propertyId;
-
-    public ItemClickEvent(Component source, Item item, Object itemId,
-            Object propertyId, MouseEventDetails details) {
-        super(source, details);
-        this.item = item;
-        this.itemId = itemId;
-        this.propertyId = propertyId;
-    }
-
-    /**
-     * Gets the item on which the click event occurred.
-     *
-     * @return item which was clicked
-     */
-    public Item getItem() {
-        return item;
-    }
-
-    /**
-     * Gets a possible identifier in source for clicked Item
-     *
-     * @return
-     */
-    public Object getItemId() {
-        return itemId;
-    }
-
-    /**
-     * 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.
-     */
-    public Object getPropertyId() {
-        return propertyId;
-    }
-
-    public static final Method ITEM_CLICK_METHOD;
-
-    static {
-        try {
-            ITEM_CLICK_METHOD = ItemClickListener.class.getDeclaredMethod(
-                    "itemClick", new Class[] { ItemClickEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
-            // This should never happen
-            throw new java.lang.RuntimeException();
-        }
-    }
-
-    public interface ItemClickListener extends Serializable {
-        public void itemClick(ItemClickEvent event);
-    }
-
-    /**
-     * The interface for adding and removing <code>ItemClickEvent</code>
-     * listeners. By implementing this interface a class explicitly announces
-     * that it will generate an <code>ItemClickEvent</code> when one of its
-     * items is clicked.
-     * <p>
-     * Note: The general Java convention is not to explicitly declare that a
-     * class generates events, but to directly define the
-     * <code>addListener</code> and <code>removeListener</code> methods. That
-     * way the caller of these methods has no real way of finding out if the
-     * 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
-     */
-    public interface ItemClickNotifier extends Serializable {
-        /**
-         * Register a listener to handle {@link ItemClickEvent}s.
-         *
-         * @param listener
-         *            ItemClickListener to be registered
-         */
-        public void addItemClickListener(ItemClickListener listener);
-
-        /**
-         * @deprecated As of 7.0, replaced by
-         *             {@link #addItemClickListener(ItemClickListener)}
-         **/
-        @Deprecated
-        public void addListener(ItemClickListener listener);
-
-        /**
-         * Removes an ItemClickListener.
-         *
-         * @param listener
-         *            ItemClickListener to be removed
-         */
-        public void removeItemClickListener(ItemClickListener listener);
-
-        /**
-         * @deprecated As of 7.0, replaced by
-         *             {@link #removeItemClickListener(ItemClickListener)}
-         **/
-        @Deprecated
-        public void removeListener(ItemClickListener listener);
-    }
-
-}

diff --git a/server/src/main/java/com/vaadin/v7/data/Item.java b/server/src/main/java/com/vaadin/v7/data/Item.java
deleted file mode 100644 (file)
index d90cdca..0000000
--- a/server/src/main/java/com/vaadin/v7/data/Item.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.v7.data;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * <p>
- * Provides a mechanism for handling a set of Properties, each associated to a
- * 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
- */
-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>
-     */
-    public Property getItemProperty(Object id);
-
-    /**
-     * Gets the collection of IDs of all Properties stored in the Item.
-     *
-     * @return unmodifiable collection containing IDs of the Properties stored
-     *         the Item
-     */
-    public Collection<?> getItemPropertyIds();
-
-    /**
-     * Tries to add a new Property into the Item.
-     *
-     * <p>
-     * This functionality is optional.
-     * </p>
-     *
-     * @param id
-     *            ID of the new Property
-     * @param property
-     *            the Property to be added and associated with the id
-     * @return <code>true</code> if the operation succeeded, <code>false</code>
-     *         if not
-     * @throws UnsupportedOperationException
-     *             if the operation is not supported.
-     */
-    public boolean addItemProperty(Object id, Property property)
-            throws UnsupportedOperationException;
-
-    /**
-     * 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
-     * @throws UnsupportedOperationException
-     *             if the operation is not supported. <code>false</code> if not
-     */
-    public boolean removeItemProperty(Object id)
-            throws UnsupportedOperationException;
-
-    /**
-     * Interface implemented by viewer classes capable of using an Item as a
-     * data source.
-     */
-    public interface Viewer extends Serializable {
-
-        /**
-         * Sets the Item that serves as the data source of the viewer.
-         *
-         * @param newDataSource
-         *            The new data source Item
-         */
-        public void setItemDataSource(Item newDataSource);
-
-        /**
-         * Gets the Item serving as the data source of the viewer.
-         *
-         * @return data source Item
-         */
-        public Item getItemDataSource();
-    }
-
-    /**
-     * Interface implemented by the <code>Editor</code> classes capable of
-     * editing the Item. Implementing this interface means that the Item serving
-     * as the data source of the editor can be modified through it.
-     * <p>
-     * Note : Not implementing the <code>Item.Editor</code> interface does not
-     * restrict the class from editing the contents of an internally.
-     * </p>
-     */
-    public interface Editor extends Item.Viewer, Serializable {
-
-    }
-
-    /* Property set change event */
-
-    /**
-     * An <code>Event</code> object specifying the Item whose contents has been
-     * changed through the <code>Property</code> interface.
-     * <p>
-     * Note: The values stored in the Properties may change without triggering
-     * this event.
-     * </p>
-     */
-    public interface PropertySetChangeEvent extends Serializable {
-
-        /**
-         * Retrieves the Item whose contents has been modified.
-         *
-         * @return source Item of the event
-         */
-        public Item getItem();
-    }
-
-    /**
-     * The listener interface for receiving <code>PropertySetChangeEvent</code>
-     * objects.
-     */
-    public interface PropertySetChangeListener extends Serializable {
-
-        /**
-         * Notifies this listener that the Item's property set has changed.
-         *
-         * @param event
-         *            Property set change event object
-         */
-        public void itemPropertySetChange(Item.PropertySetChangeEvent event);
-    }
-
-    /**
-     * The interface for adding and removing <code>PropertySetChangeEvent</code>
-     * listeners. By implementing this interface a class explicitly announces
-     * that it will generate a <code>PropertySetChangeEvent</code> when its
-     * Property set is modified.
-     * <p>
-     * Note : The general Java convention is not to explicitly declare that a
-     * class generates events, but to directly define the
-     * <code>addListener</code> and <code>removeListener</code> methods. That
-     * way the caller of these methods has no real way of finding out if the
-     * class really will send the events, or if it just defines the methods to
-     * be able to implement an interface.
-     * </p>
-     */
-    public interface PropertySetChangeNotifier extends Serializable {
-
-        /**
-         * Registers a new property set change listener for this Item.
-         *
-         * @param listener
-         *            The new Listener to be registered.
-         */
-        public void addPropertySetChangeListener(
-                Item.PropertySetChangeListener listener);
-
-        /**
-         * @deprecated As of 7.0, replaced by
-         *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
-         **/
-        @Deprecated
-        public void addListener(Item.PropertySetChangeListener listener);
-
-        /**
-         * Removes a previously registered property set change listener.
-         *
-         * @param listener
-         *            Listener to be removed.
-         */
-        public void removePropertySetChangeListener(
-                Item.PropertySetChangeListener listener);
-
-        /**
-         * @deprecated As of 7.0, replaced by
-         *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
-         **/
-        @Deprecated
-        public void removeListener(Item.PropertySetChangeListener listener);
-    }
-}

diff --git a/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java
deleted file mode 100644 (file)
index 092cf3f..0000000
--- a/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.v7.data.util;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import com.vaadin.v7.data.Item;
-import com.vaadin.v7.data.Property;
-
-/**
- * Class for handling a set of identified Properties. The elements contained in
- * 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
- */
-@SuppressWarnings("serial")
-public class PropertysetItem
-        implements Item, Item.PropertySetChangeNotifier, Cloneable {
-
-    /* Private representation of the item */
-
-    /**
-     * Mapping from property id to property.
-     */
-    private HashMap<Object, Property<?>> map = new HashMap<Object, Property<?>>();
-
-    /**
-     * List of all property ids to maintain the order.
-     */
-    private LinkedList<Object> list = new LinkedList<Object>();
-
-    /**
-     * List of property set modification listeners.
-     */
-    private LinkedList<Item.PropertySetChangeListener> propertySetChangeListeners = null;
-
-    /* Item methods */
-
-    /**
-     * 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>
-     */
-    @Override
-    public Property getItemProperty(Object id) {
-        return map.get(id);
-    }
-
-    /**
-     * Gets the collection of IDs of all Properties stored in the Item.
-     *
-     * @return unmodifiable collection containing IDs of the Properties stored
-     *         the Item
-     */
-    @Override
-    public Collection<?> getItemPropertyIds() {
-        return Collections.unmodifiableCollection(list);
-    }
-
-    /* Item.Managed methods */
-
-    /**
-     * 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>
-     *         if not
-     */
-    @Override
-    public boolean removeItemProperty(Object id) {
-
-        // Cant remove missing properties
-        if (map.remove(id) == null) {
-            return false;
-        }
-        list.remove(id);
-
-        // Send change events
-        fireItemPropertySetChange();
-
-        return true;
-    }
-
-    /**
-     * Tries to add a new Property into the Item.
-     *
-     * @param id
-     *            the ID of the new Property.
-     * @param property
-     *            the Property to be added and associated with the id.
-     * @return <code>true</code> if the operation succeeded, <code>false</code>
-     *         if not
-     */
-    @Override
-    public boolean addItemProperty(Object id, Property property) {
-
-        // Null ids are not accepted
-        if (id == null) {
-            throw new NullPointerException("Item property id can not be null");
-        }
-
-        // Cant add a property twice
-        if (map.containsKey(id)) {
-            return false;
-        }
-
-        // Put the property to map
-        map.put(id, property);
-        list.add(id);
-
-        // Send event
-        fireItemPropertySetChange();
-
-        return true;
-    }
-
-    /**
-     * Gets the <code>String</code> representation of the contents of the Item.
-     * 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
-    public String toString() {
-        String retValue = "";
-
-        for (final Iterator<?> i = getItemPropertyIds().iterator(); i
-                .hasNext();) {
-            final Object propertyId = i.next();
-            retValue += getItemProperty(propertyId).getValue();
-            if (i.hasNext()) {
-                retValue += " ";
-            }
-        }
-
-        return retValue;
-    }
-
-    /* Notifiers */
-
-    /**
-     * An <code>event</code> object specifying an Item whose Property set has
-     * changed.
-     *
-     * @author Vaadin Ltd.
-     * @since 3.0
-     */
-    private static class PropertySetChangeEvent extends EventObject
-            implements Item.PropertySetChangeEvent {
-
-        private PropertySetChangeEvent(Item source) {
-            super(source);
-        }
-
-        /**
-         * Gets the Item whose Property set has changed.
-         *
-         * @return source object of the event as an <code>Item</code>
-         */
-        @Override
-        public Item getItem() {
-            return (Item) getSource();
-        }
-    }
-
-    /**
-     * Registers a new property set change listener for this Item.
-     *
-     * @param listener
-     *            the new Listener to be registered.
-     */
-    @Override
-    public void addPropertySetChangeListener(
-            Item.PropertySetChangeListener listener) {
-        if (propertySetChangeListeners == null) {
-            propertySetChangeListeners = new LinkedList<PropertySetChangeListener>();
-        }
-        propertySetChangeListeners.add(listener);
-    }
-
-    /**
-     * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)}
-     **/
-    @Override
-    @Deprecated
-    public void addListener(Item.PropertySetChangeListener listener) {
-        addPropertySetChangeListener(listener);
-    }
-
-    /**
-     * Removes a previously registered property set change listener.
-     *
-     * @param listener
-     *            the Listener to be removed.
-     */
-    @Override
-    public void removePropertySetChangeListener(
-            Item.PropertySetChangeListener listener) {
-        if (propertySetChangeListeners != null) {
-            propertySetChangeListeners.remove(listener);
-        }
-    }
-
-    /**
-     * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)}
-     **/
-    @Override
-    @Deprecated
-    public void removeListener(Item.PropertySetChangeListener listener) {
-        removePropertySetChangeListener(listener);
-    }
-
-    /**
-     * Sends a Property set change event to all interested listeners.
-     */
-    private void fireItemPropertySetChange() {
-        if (propertySetChangeListeners != null) {
-            final Object[] l = propertySetChangeListeners.toArray();
-            final Item.PropertySetChangeEvent event = new PropertysetItem.PropertySetChangeEvent(
-                    this);
-            for (int i = 0; i < l.length; i++) {
-                ((Item.PropertySetChangeListener) l[i])
-                        .itemPropertySetChange(event);
-            }
-        }
-    }
-
-    public Collection<?> getListeners(Class<?> eventType) {
-        if (Item.PropertySetChangeEvent.class.isAssignableFrom(eventType)) {
-            if (propertySetChangeListeners == null) {
-                return Collections.EMPTY_LIST;
-            } else {
-                return Collections
-                        .unmodifiableCollection(propertySetChangeListeners);
-            }
-        }
-
-        return Collections.EMPTY_LIST;
-    }
-
-    /**
-     * Creates and returns a copy of this object.
-     * <p>
-     * The method <code>clone</code> performs a shallow copy of the
-     * <code>PropertysetItem</code>.
-     * </p>
-     * <p>
-     * Note : All arrays are considered to implement the interface Cloneable.
-     * Otherwise, this method creates a new instance of the class of this object
-     * and initializes all its fields with exactly the contents of the
-     * corresponding fields of this object, as if by assignment, the contents of
-     * 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
-    public Object clone() throws CloneNotSupportedException {
-
-        final PropertysetItem npsi = new PropertysetItem();
-
-        npsi.list = list != null ? (LinkedList<Object>) list.clone() : null;
-        npsi.propertySetChangeListeners = propertySetChangeListeners != null
-                ? (LinkedList<PropertySetChangeListener>) propertySetChangeListeners
-                        .clone()
-                : null;
-        npsi.map = (HashMap<Object, Property<?>>) map.clone();
-
-        return npsi;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-
-        if (obj == null || !(obj instanceof PropertysetItem)) {
-            return false;
-        }
-
-        final PropertysetItem other = (PropertysetItem) obj;
-
-        if (other.list != list) {
-            if (other.list == null) {
-                return false;
-            }
-            if (!other.list.equals(list)) {
-                return false;
-            }
-        }
-        if (other.map != map) {
-            if (other.map == null) {
-                return false;
-            }
-            if (!other.map.equals(map)) {
-                return false;
-            }
-        }
-        if (other.propertySetChangeListeners != propertySetChangeListeners) {
-            boolean thisEmpty = (propertySetChangeListeners == null
-                    || propertySetChangeListeners.isEmpty());
-            boolean otherEmpty = (other.propertySetChangeListeners == null
-                    || other.propertySetChangeListeners.isEmpty());
-            if (thisEmpty && otherEmpty) {
-                return true;
-            }
-            if (otherEmpty) {
-                return false;
-            }
-            if (!other.propertySetChangeListeners
-                    .equals(propertySetChangeListeners)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-
-        return (list == null ? 0 : list.hashCode())
-                ^ (map == null ? 0 : map.hashCode())
-                ^ ((propertySetChangeListeners == null
-                        || propertySetChangeListeners.isEmpty()) ? 0
-                                : propertySetChangeListeners.hashCode());
-    }
-}

diff --git a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
deleted file mode 100644 (file)
index 883130d..0000000
--- a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.vaadin.tests.server;
-
-import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
-import com.vaadin.v7.data.Item.PropertySetChangeEvent;
-import com.vaadin.v7.data.Item.PropertySetChangeListener;
-import com.vaadin.v7.data.util.PropertysetItem;
-
-public class PropertysetItemListenersTest
-        extends AbstractListenerMethodsTestBase {
-    public void testPropertySetChangeListenerAddGetRemove() throws Exception {
-        testListenerAddGetRemove(PropertysetItem.class,
-                PropertySetChangeEvent.class, PropertySetChangeListener.class);
-    }
-}

diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 0a9256364de913e8a6f8374ed7df5a965eb2c1cc..3b038672abdaf5adb8a3762bcc5b0f36bc8761a2 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
@@ -9,8 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
@@ -26,6 +24,8 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.DefaultItemSorter;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ItemStyleGenerator;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
index cb26a48486defe68fa144227475705d6c8a8a570..4e002e0a97eec4410341c5aae1edd1f86ec9340c 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
@@ -1,7 +1,5 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
@@ -9,6 +7,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.RowHeaderMode;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
index 876c25dd69df01a03a7ae6a6d89d7cee0b4e8cbd..8f6f98fd898ffc5d491d9d53ef2fc1e8ad78a285 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
@@ -4,7 +4,6 @@ import java.util.Collection;
 
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -28,6 +27,7 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.Table;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
index 12dc93a1dd093ac8f80aac3643e5d58c7765740d..de66680d75e2632945e6dd1a7efdae89073d300c 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.components.grid;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
@@ -25,6 +23,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;
 import com.vaadin.v7.ui.Grid.RowReference;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
index fadbf05e89cf68eac1d1f15d30b854d5bdeb19c9..3f5a5ae46d25edab70da0fd8e95f76838300727e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.components.grid;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;
 import com.vaadin.v7.ui.Grid.RowReference;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
index 5fde4a2226c8075dc86299d9f96d5d71a7593643..50d5bc54193b1d18beec19184428501fa134d778 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.components.grid;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.Column;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
index b4452a6f98ad801cd4714ca41ff3c3c08ded2c84..14d179017fbebc8611cbde81f6ca83ee2de7ca10 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
@@ -19,8 +19,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -31,6 +29,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;
 import com.vaadin.v7.ui.Grid.RowReference;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
index 4b9c30c09e7c2aeab1fd888a4dc2fe02be9550b9..cb3242d0e0696e31a049730a00586180e42bcabf 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.components.grid;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;
 import com.vaadin.v7.ui.Grid.RowReference;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 844ce73a33b6ee77dc493b3ee60c451a3814df79..b04f6a5a9c36a92e0cd9c60525a2077442325240 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -30,8 +30,6 @@ import java.util.Random;
 
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
 import com.vaadin.event.SortEvent;
@@ -55,6 +53,8 @@ import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.CellDescriptionGenerator;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index 3862542a19d27fbfa23760dd524387defc029c88..f1ef5d5bcbc3f34c91956b4a12b2691d79191cac 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
@@ -5,14 +5,14 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 import com.vaadin.event.Action;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.server.Resource;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.v7.ui.AbstractSelect;
 
 public abstract class AbstractSelectTestCase<T extends AbstractSelect>

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
index 44299df643f6333f6b2023ef8fe23af3d3115029..c2b8c1f9d90236fca8e6f172b09e92013564eae0 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
@@ -5,11 +5,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.DefaultFieldFactory;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Table;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
index 49ce5e20bb2d283054156047b3a70e6f41fef85d..6faa259d5a3be5c564c0775f00bb3a987ccbbedd 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
@@ -1,8 +1,6 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.event.Action;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -11,6 +9,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class HeaderPositionWhenSorting extends AbstractTestUI

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
index 17096bf917127f8b1b6c52f3283b82dbb14b123e..221919f9d44c4acf85bf8085696b625a1ab3b788 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -1,7 +1,5 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -11,6 +9,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Tree;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index af985598c74b86642a51ec5744d9b77c9f2eda36..d398c0c32559579dd631e95054676f4d19357224 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -1,7 +1,5 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
@@ -10,6 +8,8 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class LabelEmbeddedClickThroughForTable extends AbstractTestUI {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
index 90d55da8d05877c6fd6019492f94444393bff822..9c6293bc2dcf8d8204225a8bfc59154a2feb345a 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 @SuppressWarnings("serial")

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index 5578b8932710c654bd80299483cfe80aaf0fd02f..eedb4140703e67b910c1c85761bffded86eca411 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
@@ -1,14 +1,14 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.event.Action;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Link;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class TableAndBrowserContextMenu extends TestBase

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index d57d8d0c3a75c67b39d516c86c60fbd59ba77622..717d1a1548f6e7e88572ba20c04126f0298bf22d 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
@@ -14,6 +13,7 @@ import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.ColumnGenerator;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index 422dcdded79cc18a9d14aa16a2867222be76bc0a..b986a7d6f661495f774361f3ef5b4204da0cd4ae 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
@@ -1,7 +1,5 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
@@ -10,6 +8,8 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class TableClickValueChangeInteraction extends TestBase {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
index ba05c6e03688093dc57a2021c5446f851d330fc4..3b5395a796697d5c7787819cd8acedc62b8d8e7d 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class TableFocusOnRefreshRowCache extends TestBase {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 6be49f5ac87dac2113cd054823979a9fc097ae38..8c28b8f7891d887ce3c165f653645727269bab1f 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Notification;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.TableDragMode;
 import com.vaadin.v7.ui.TextField;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
index 56543d5c53ab7415f1413f15991683dfbf3600a2..898733129a3a3334840f635e26bb4515c4f4ea56 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
@@ -7,7 +7,6 @@ import java.util.List;
 
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.shared.ui.label.ContentMode;
@@ -16,6 +15,7 @@ import com.vaadin.shared.ui.table.TableConstants;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
 import com.vaadin.v7.ui.Table.CellStyleGenerator;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
index 6802248ef6d516cc78093952b8641e87e980be8c..76ec5e44374e654bf1c7f1f8e830bd51f526d469 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.v7.data.Item;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.CellStyleGenerator;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
index 7a8eabe2a5382d08b3d0d9718dbd4669793aec84..28094f0b89daa4a47d869aea3906af161263faa1 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.Tree;
 
 public class SelectItemAfterRemove extends AbstractTestUI {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
index d0f0a7a189fa57e23ea9828bc7d9a1dee107a167..d83f044de34f83b268fa4941cf88db2ee7c60088 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.TableDragMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
index a7d81d758ecc5c7acd7a1106a1a6ea8a02c46a2c..e3bb8d16e9a096a20694db39f20e6a498657359e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.TextField;
 import com.vaadin.v7.ui.Tree;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
index 453abc8a5bcfa1be869c788d01e37d66e380e7bf..ffb3f5bebfe6c1739633bd06cef6b9a79230e2a9 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeItemClickListening extends AbstractTestUIWithLog {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
index 3002e71b3f9e5593f1cffd77faee343078006c99..cb235791df19fc93efc7a5e0b63f9b99cacba443 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeItemDoubleClick extends AbstractTestUIWithLog {

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
index 780f694504519af8a9144a21c6b74aca59c9595f..1db1b97f16eeaa0be70d11cf1329db7961a5561e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.Tree;
 
 @SuppressWarnings("serial")

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
index caf69e5b298585fa9e459593ee24135004388de6..2c563d3a70e2c40e0a456e27c7110445abbb9673 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.MouseEvents;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.ui.Tree;
 
 /**

diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index 95ed21f17a843e8fbef4d734b5c13e3fd2318fbd..ebb6c8a700b6bd6d9a516118198854506d0d1d22 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeScrollingOnSelection extends TestBase {

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
index c978455cd7bb095ae75b80b43f6fa1112f403d66..da05406ca454d9f3f0b5e6a8502ca709eb23850e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.dd;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.TransferableImpl;
 import com.vaadin.event.dd.DragAndDropEvent;
@@ -15,6 +14,7 @@ import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
index 723cdea1f46e517db8b0497ee32a81f655b55f0c..52ad62a33cd8850da67208b81d6ca66db1bb175d 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.dd;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.TransferableImpl;
 import com.vaadin.event.dd.DragAndDropEvent;
@@ -16,6 +15,7 @@ import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.Tree;
 
 public class AcceptFromComponent extends Window {

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
index e406314c9d9068a086a783b93ef27efa61893ebe..d5295d4cde3ed91366a0b01a9d381f1c620dfe08 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.dd;
 
 import java.util.Collection;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -18,6 +17,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AcceptItem;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.TableDragMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
index 4d5b7b7506e40ac77443b1b79d4a563f7be2bf44..ea688c7380ca8603b99f539ff87d22ee3c77f273 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
@@ -4,7 +4,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -23,6 +22,7 @@ import com.vaadin.ui.Window;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.AbstractSelect.AcceptItem;

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
index b815cf0603bbdfdc4ff88f8cd682a337fceb0dc7..0ead6fb1bbfc5c68d2834ebdaa8b9a10280b1747 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.dd;
 
 import java.util.Collection;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -16,6 +15,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.UI;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.Table;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
index f4357a49a1148d8c5a89467f7d3d06eb676233c8..69c9e3cfe98d2401e73b7be5b216cb741b78a89e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
@@ -12,7 +12,6 @@ import java.util.Set;
 
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.dd.DragAndDropEvent;
@@ -44,6 +43,7 @@ import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.util.BeanItemContainer;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.TreeDragMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
index 4c7a732974930ca2ef39eb61e3839e3df341487b..0c0a631c46d5ca8b1e0144bd72bced9304c43c0a 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
@@ -4,7 +4,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -16,6 +15,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.UI;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.Table;
 

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
index 0a4a8dbe81f4a552e6ca60509c6f72a492641467..c0ed19d2d9d704e3b3aacb4239251b813d7726f7 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.dd;
 
 import java.util.Collection;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -13,6 +12,7 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.TreeDragMode;

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
index 79b21fffbcc350d12ee19eaad50b82a4457ebc2e..020a8190a9d33c1e42cd5c0e52a5d9881ce5900f 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.dd;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -13,6 +12,7 @@ import com.vaadin.server.StreamVariable;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.AbsoluteLayout.ComponentPosition;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.Html5File;

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index 3616ea823334bbd526b4f52b02ffdca4c2c9e638..1d885418415d8be9918781b4279783ce437a8adc 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -18,6 +17,7 @@ import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.data.util.BeanItemContainer;
 import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.v7.ui.AbstractSelect.VerticalLocationIs;
 import com.vaadin.v7.ui.Table;

diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
index 094e887426c8d0f77331e098c310e6fc3e7afad1..723fd9673f062772a5665808792a5873a75ea649 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.minitutorials.v7_5;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.minitutorials.v7_4.GridExampleBean;
@@ -29,6 +27,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.DetailsGenerator;
 import com.vaadin.v7.ui.Grid.RowReference;

diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
index 533e69b28b5b74c5e31b56f5573ea169015a5075..5abeedcea6b338df74f68d7d1f9b32ef87e01fcc 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ErrorHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
@@ -16,6 +14,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.util.AbstractInMemoryContainer;
 import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.event.ItemClickEvent;
+import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.ui.Table;
 
 public class PushErrorHandling extends AbstractTestUI {