diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-07-23 15:23:43 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-07-23 15:23:43 +0300 |
| commit | 3604bf01ded16d21041cbb655632429e00c94639 (patch) | |
| tree | 9bf7ae9d3a33e6b672c164e696a24aef08ebc13e | |
| parent | b7982bac6d8bca02fc76c9974ffd1c24d9a06f04 (diff) | |
| download | vaadin-framework-3604bf01ded16d21041cbb655632429e00c94639.tar.gz vaadin-framework-3604bf01ded16d21041cbb655632429e00c94639.zip | |
Add Java 6 @Override annotations to all methods from interfaces
867 files changed, 3243 insertions, 0 deletions
diff --git a/src/com/vaadin/data/Container.java b/src/com/vaadin/data/Container.java index f722e07741..f4c0ed9794 100644 --- a/src/com/vaadin/data/Container.java +++ b/src/com/vaadin/data/Container.java @@ -697,6 +697,7 @@ public interface Container extends Serializable { * @return <code>true</code> if the operation succeeded, * <code>false</code> if not */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException; } diff --git a/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java index 569f643998..be0db328f2 100644 --- a/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java +++ b/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java @@ -23,6 +23,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { public static final Object CAPTION_PROPERTY_ID = "Caption"; + @Override public <T extends Field> T createField(Class<?> type, Class<T> fieldType) { if (Enum.class.isAssignableFrom(type)) { return createEnumField(type, fieldType); diff --git a/src/com/vaadin/data/util/AbstractBeanContainer.java b/src/com/vaadin/data/util/AbstractBeanContainer.java index 300f92ea3a..2f428d2cb6 100644 --- a/src/com/vaadin/data/util/AbstractBeanContainer.java +++ b/src/com/vaadin/data/util/AbstractBeanContainer.java @@ -96,6 +96,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends this.propertyId = propertyId; } + @Override @SuppressWarnings("unchecked") public IDTYPE getIdForBean(BEANTYPE bean) throws IllegalArgumentException { @@ -163,6 +164,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * * @see com.vaadin.data.Container#getType(java.lang.Object) */ + @Override public Class<?> getType(Object propertyId) { return model.get(propertyId).getPropertyType(); } @@ -195,6 +197,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * * @see com.vaadin.data.Container#getContainerPropertyIds() */ + @Override public Collection<String> getContainerPropertyIds() { return model.keySet(); } @@ -258,6 +261,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object, * java.lang.Object) */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { Item item = getItem(itemId); if (item == null) { @@ -300,6 +304,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends /** * Re-filter the container when one of the monitored properties changes. */ + @Override public void valueChange(ValueChangeEvent event) { // if a property that is used in a filter is changed, refresh filtering filterAll(); @@ -312,6 +317,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * com.vaadin.data.Container.Filterable#addContainerFilter(java.lang.Object, * java.lang.String, boolean, boolean) */ + @Override public void addContainerFilter(Object propertyId, String filterString, boolean ignoreCase, boolean onlyMatchPrefix) { try { @@ -328,6 +334,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * * @see com.vaadin.data.Container.Filterable#removeAllContainerFilters() */ + @Override public void removeAllContainerFilters() { if (!getFilters().isEmpty()) { for (Item item : itemIdToItem.values()) { @@ -344,6 +351,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * com.vaadin.data.Container.Filterable#removeContainerFilters(java.lang * .Object) */ + @Override public void removeContainerFilters(Object propertyId) { Collection<Filter> removedFilters = super.removeFilters(propertyId); if (!removedFilters.isEmpty()) { @@ -354,11 +362,13 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends } } + @Override public void addContainerFilter(Filter filter) throws UnsupportedFilterException { addFilter(filter); } + @Override public void removeContainerFilter(Filter filter) { removeFilter(filter); } @@ -416,6 +426,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() */ + @Override public Collection<?> getSortableContainerPropertyIds() { return getSortablePropertyIds(); } @@ -426,6 +437,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], * boolean[]) */ + @Override public void sort(Object[] propertyId, boolean[] ascending) { sortContainer(propertyId, ascending); } diff --git a/src/com/vaadin/data/util/AbstractContainer.java b/src/com/vaadin/data/util/AbstractContainer.java index 58a3a8687a..7d96c2d757 100644 --- a/src/com/vaadin/data/util/AbstractContainer.java +++ b/src/com/vaadin/data/util/AbstractContainer.java @@ -52,6 +52,7 @@ public abstract class AbstractContainer implements Container { super(source); } + @Override public Container getContainer() { return (Container) getSource(); } @@ -72,6 +73,7 @@ public abstract class AbstractContainer implements Container { super(source); } + @Override public Container getContainer() { return (Container) getSource(); } diff --git a/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/src/com/vaadin/data/util/AbstractInMemoryContainer.java index 795aabb419..b7832756f2 100644 --- a/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -125,6 +125,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE // Container interface methods with more specific return class // default implementation, can be overridden + @Override public ITEMCLASS getItem(Object itemId) { if (containsId(itemId)) { return getUnfilteredItem(itemId); @@ -152,10 +153,12 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE // Container interface method implementations + @Override public int size() { return getVisibleItemIds().size(); } + @Override public boolean containsId(Object itemId) { // only look at visible items after filtering if (itemId == null) { @@ -165,12 +168,14 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } + @Override public List<?> getItemIds() { return Collections.unmodifiableList(getVisibleItemIds()); } // Container.Ordered + @Override public ITEMIDTYPE nextItemId(Object itemId) { int index = indexOfId(itemId); if (index >= 0 && index < size() - 1) { @@ -181,6 +186,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } + @Override public ITEMIDTYPE prevItemId(Object itemId) { int index = indexOfId(itemId); if (index > 0) { @@ -191,6 +197,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } + @Override public ITEMIDTYPE firstItemId() { if (size() > 0) { return getIdByIndex(0); @@ -199,6 +206,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } + @Override public ITEMIDTYPE lastItemId() { if (size() > 0) { return getIdByIndex(size() - 1); @@ -207,6 +215,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } + @Override public boolean isFirstId(Object itemId) { if (itemId == null) { return false; @@ -214,6 +223,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE return itemId.equals(firstItemId()); } + @Override public boolean isLastId(Object itemId) { if (itemId == null) { return false; @@ -223,66 +233,78 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE // Container.Indexed + @Override public ITEMIDTYPE getIdByIndex(int index) { return getVisibleItemIds().get(index); } + @Override public int indexOfId(Object itemId) { return getVisibleItemIds().indexOf(itemId); } // methods that are unsupported by default, override to support + @Override public Object addItemAt(int index) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public Item addItemAt(int index, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding items not supported. Override the relevant addItem*() methods if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Removing items not supported. Override the removeItem() method if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException( "Removing items not supported. Override the removeAllItems() method if required as specified in AbstractInMemoryContainer javadoc."); } + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Adding container properties not supported. Override the addContainerProperty() method if required."); } + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException( diff --git a/src/com/vaadin/data/util/AbstractProperty.java b/src/com/vaadin/data/util/AbstractProperty.java index 3b6db3807e..373a8dfd58 100644 --- a/src/com/vaadin/data/util/AbstractProperty.java +++ b/src/com/vaadin/data/util/AbstractProperty.java @@ -42,10 +42,12 @@ public abstract class AbstractProperty<T> implements Property<T>, * Override for additional restrictions on what is considered a read-only * property. */ + @Override public boolean isReadOnly() { return readOnly; } + @Override public void setReadOnly(boolean newStatus) { boolean oldStatus = isReadOnly(); readOnly = newStatus; @@ -93,6 +95,7 @@ public abstract class AbstractProperty<T> implements Property<T>, * * @return source Property of the event. */ + @Override public Property getProperty() { return (Property) getSource(); } @@ -105,6 +108,7 @@ public abstract class AbstractProperty<T> implements Property<T>, * @param listener * the new Listener to be registered. */ + @Override public void addListener(Property.ReadOnlyStatusChangeListener listener) { if (readOnlyStatusChangeListeners == null) { readOnlyStatusChangeListeners = new LinkedList<ReadOnlyStatusChangeListener>(); @@ -118,6 +122,7 @@ public abstract class AbstractProperty<T> implements Property<T>, * @param listener * the listener to be removed. */ + @Override public void removeListener(Property.ReadOnlyStatusChangeListener listener) { if (readOnlyStatusChangeListeners != null) { readOnlyStatusChangeListeners.remove(listener); @@ -161,12 +166,14 @@ public abstract class AbstractProperty<T> implements Property<T>, * * @return source Property of the event. */ + @Override public Property getProperty() { return (Property) getSource(); } } + @Override public void addListener(ValueChangeListener listener) { if (valueChangeListeners == null) { valueChangeListeners = new LinkedList<ValueChangeListener>(); @@ -175,6 +182,7 @@ public abstract class AbstractProperty<T> implements Property<T>, } + @Override public void removeListener(ValueChangeListener listener) { if (valueChangeListeners != null) { valueChangeListeners.remove(listener); diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java index 245a623d5d..dc4deaebdc 100644 --- a/src/com/vaadin/data/util/BeanItemContainer.java +++ b/src/com/vaadin/data/util/BeanItemContainer.java @@ -59,6 +59,7 @@ public class BeanItemContainer<BEANTYPE> extends private static class IdentityBeanIdResolver<BT> implements BeanIdResolver<BT, BT> { + @Override public BT getIdForBean(BT bean) { return bean; } diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java index 9159fa358b..717ce834cf 100644 --- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -71,6 +71,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, this.itemIds = itemIds; } + @Override public int compare(Object o1, Object o2) { if (o1.equals(o2)) { return 0; @@ -233,6 +234,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * Can the specified Item have any children? Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public boolean areChildrenAllowed(Object itemId) { // If the wrapped container implements the method directly, use it @@ -253,6 +255,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getChildren(Object itemId) { // If the wrapped container implements the method directly, use it @@ -272,6 +275,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public Object getParent(Object itemId) { // If the wrapped container implements the method directly, use it @@ -287,6 +291,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean hasChildren(Object itemId) { // If the wrapped container implements the method directly, use it @@ -303,6 +308,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean isRoot(Object itemId) { // If the wrapped container implements the method directly, use it @@ -322,6 +328,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> rootItemIds() { // If the wrapped container implements the method directly, use it @@ -351,6 +358,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @return <code>true</code> if the operation succeeded, <code>false</code> * if not */ + @Override public boolean setChildrenAllowed(Object itemId, boolean childrenAllowed) { // If the wrapped container implements the method directly, use it @@ -391,6 +399,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @return <code>true</code> if the operation succeeded, <code>false</code> * if not */ + @Override public boolean setParent(Object itemId, Object newParentId) { // If the wrapped container implements the method directly, use it @@ -483,6 +492,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the addItem is not supported. */ + @Override public Object addItem() throws UnsupportedOperationException { final Object id = container.addItem(); @@ -502,6 +512,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the addItem is not supported. */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { // Null ids are not accepted @@ -524,6 +535,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the removeAllItems is not supported. */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { final boolean success = container.removeAllItems(); @@ -548,6 +560,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the removeItem is not supported. */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -586,6 +599,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the addContainerProperty is not supported. */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { @@ -606,6 +620,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * @throws UnsupportedOperationException * if the removeContainerProperty is not supported. */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { return container.removeContainerProperty(propertyId); @@ -616,6 +631,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public boolean containsId(Object itemId) { return container.containsId(itemId); } @@ -624,6 +640,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * Gets the specified Item from the container. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Item getItem(Object itemId) { return container.getItem(itemId); } @@ -633,6 +650,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getItemIds() { return container.getItemIds(); } @@ -642,6 +660,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * Container Don't add a JavaDoc comment here, we use the default * documentation from implemented interface. */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { return container.getContainerProperty(itemId, propertyId); } @@ -651,6 +670,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getContainerPropertyIds() { return container.getContainerPropertyIds(); } @@ -660,6 +680,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public Class<?> getType(Object propertyId) { return container.getType(propertyId); } @@ -668,6 +689,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * Gets the number of Items in the Container. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public int size() { return container.size(); } @@ -677,6 +699,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void addListener(Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) @@ -689,6 +712,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) @@ -701,6 +725,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void addListener(Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) @@ -713,6 +738,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) @@ -736,6 +762,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, listener = realListener; } + @Override public void containerItemSetChange(ItemSetChangeEvent event) { updateHierarchicalWrapper(); ((Container.ItemSetChangeListener) listener) @@ -743,6 +770,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, } + @Override public void containerPropertySetChange(PropertySetChangeEvent event) { updateHierarchicalWrapper(); ((Container.PropertySetChangeListener) listener) diff --git a/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/src/com/vaadin/data/util/ContainerOrderedWrapper.java index f333edecf4..d3d6f88d3e 100644 --- a/src/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/src/com/vaadin/data/util/ContainerOrderedWrapper.java @@ -221,6 +221,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public Object firstItemId() { if (ordered) { return ((Container.Ordered) container).firstItemId(); @@ -233,6 +234,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean isFirstId(Object itemId) { if (ordered) { return ((Container.Ordered) container).isFirstId(itemId); @@ -245,6 +247,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean isLastId(Object itemId) { if (ordered) { return ((Container.Ordered) container).isLastId(itemId); @@ -257,6 +260,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public Object lastItemId() { if (ordered) { return ((Container.Ordered) container).lastItemId(); @@ -269,6 +273,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public Object nextItemId(Object itemId) { if (ordered) { return ((Container.Ordered) container).nextItemId(itemId); @@ -284,6 +289,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public Object prevItemId(Object itemId) { if (ordered) { return ((Container.Ordered) container).prevItemId(itemId); @@ -306,6 +312,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @return <code>true</code> if the operation succeeded, <code>false</code> * if not */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { @@ -321,6 +328,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @throws UnsupportedOperationException * if the addItem is not supported. */ + @Override public Object addItem() throws UnsupportedOperationException { final Object id = container.addItem(); @@ -340,6 +348,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @throws UnsupportedOperationException * if the addItem is not supported. */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { final Item item = container.addItem(itemId); if (!ordered && item != null) { @@ -356,6 +365,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @throws UnsupportedOperationException * if the removeAllItems is not supported. */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { final boolean success = container.removeAllItems(); if (!ordered && success) { @@ -377,6 +387,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @throws UnsupportedOperationException * if the removeItem is not supported. */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -401,6 +412,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @throws UnsupportedOperationException * if the removeContainerProperty is not supported. */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { return container.removeContainerProperty(propertyId); @@ -411,6 +423,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public boolean containsId(Object itemId) { return container.containsId(itemId); } @@ -419,6 +432,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * Gets the specified Item from the container. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Item getItem(Object itemId) { return container.getItem(itemId); } @@ -428,6 +442,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getItemIds() { return container.getItemIds(); } @@ -437,6 +452,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * Container Don't add a JavaDoc comment here, we use the default * documentation from implemented interface. */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { return container.getContainerProperty(itemId, propertyId); } @@ -446,6 +462,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getContainerPropertyIds() { return container.getContainerPropertyIds(); } @@ -455,6 +472,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public Class<?> getType(Object propertyId) { return container.getType(propertyId); } @@ -463,6 +481,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * Gets the number of Items in the Container. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public int size() { int newSize = container.size(); if (lastKnownSize != -1 && newSize != lastKnownSize @@ -480,6 +499,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void addListener(Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) @@ -492,6 +512,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Container.ItemSetChangeListener listener) { if (container instanceof Container.ItemSetChangeNotifier) { ((Container.ItemSetChangeNotifier) container) @@ -504,6 +525,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void addListener(Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) @@ -516,6 +538,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Container.PropertySetChangeListener listener) { if (container instanceof Container.PropertySetChangeNotifier) { ((Container.PropertySetChangeNotifier) container) @@ -529,6 +552,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, * java.lang.Object) */ + @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { @@ -553,6 +577,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, * * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) */ + @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { @@ -588,6 +613,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, listener = realListener; } + @Override public void containerItemSetChange(ItemSetChangeEvent event) { updateOrderWrapper(); ((Container.ItemSetChangeListener) listener) @@ -595,6 +621,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, } + @Override public void containerPropertySetChange(PropertySetChangeEvent event) { updateOrderWrapper(); ((Container.PropertySetChangeListener) listener) diff --git a/src/com/vaadin/data/util/DefaultItemSorter.java b/src/com/vaadin/data/util/DefaultItemSorter.java index 47db5d7507..81b15ebd4f 100644 --- a/src/com/vaadin/data/util/DefaultItemSorter.java +++ b/src/com/vaadin/data/util/DefaultItemSorter.java @@ -61,6 +61,7 @@ public class DefaultItemSorter implements ItemSorter { * @see com.vaadin.data.util.ItemSorter#compare(java.lang.Object, * java.lang.Object) */ + @Override public int compare(Object o1, Object o2) { Item item1 = container.getItem(o1); Item item2 = container.getItem(o2); @@ -147,6 +148,7 @@ public class DefaultItemSorter implements ItemSorter { * com.vaadin.data.util.ItemSorter#setSortProperties(com.vaadin.data.Container * .Sortable, java.lang.Object[], boolean[]) */ + @Override public void setSortProperties(Container.Sortable container, Object[] propertyId, boolean[] ascending) { this.container = container; @@ -181,6 +183,7 @@ public class DefaultItemSorter implements ItemSorter { public static class DefaultPropertyValueComparator implements Comparator<Object>, Serializable { + @Override @SuppressWarnings("unchecked") public int compare(Object o1, Object o2) { int r = 0; diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java index 7100286712..cdfeb57e14 100644 --- a/src/com/vaadin/data/util/FilesystemContainer.java +++ b/src/com/vaadin/data/util/FilesystemContainer.java @@ -187,6 +187,7 @@ public class FilesystemContainer implements Container.Hierarchical { * @return <code>true</code> if the specified Item is a directory, * <code>false</code> otherwise. */ + @Override public boolean areChildrenAllowed(Object itemId) { return itemId instanceof File && ((File) itemId).canRead() && ((File) itemId).isDirectory(); @@ -197,6 +198,7 @@ public class FilesystemContainer implements Container.Hierarchical { * add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public Collection<File> getChildren(Object itemId) { if (!(itemId instanceof File)) { @@ -223,6 +225,7 @@ public class FilesystemContainer implements Container.Hierarchical { * Gets the parent item of the specified Item. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Object getParent(Object itemId) { if (!(itemId instanceof File)) { @@ -235,6 +238,7 @@ public class FilesystemContainer implements Container.Hierarchical { * Tests if the specified Item has any children. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public boolean hasChildren(Object itemId) { if (!(itemId instanceof File)) { @@ -254,6 +258,7 @@ public class FilesystemContainer implements Container.Hierarchical { * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean isRoot(Object itemId) { if (!(itemId instanceof File)) { @@ -272,6 +277,7 @@ public class FilesystemContainer implements Container.Hierarchical { * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<File> rootItemIds() { File[] f; @@ -311,6 +317,7 @@ public class FilesystemContainer implements Container.Hierarchical { * @throws UnsupportedOperationException * if the setChildrenAllowed is not supported. */ + @Override public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) throws UnsupportedOperationException { @@ -332,6 +339,7 @@ public class FilesystemContainer implements Container.Hierarchical { * @throws UnsupportedOperationException * if the setParent is not supported. */ + @Override public boolean setParent(Object itemId, Object newParentId) throws UnsupportedOperationException { @@ -343,6 +351,7 @@ public class FilesystemContainer implements Container.Hierarchical { * comment here, we use the default documentation from implemented * interface. */ + @Override public boolean containsId(Object itemId) { if (!(itemId instanceof File)) { @@ -371,6 +380,7 @@ public class FilesystemContainer implements Container.Hierarchical { * Gets the specified Item from the filesystem. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Item getItem(Object itemId) { if (!(itemId instanceof File)) { @@ -416,6 +426,7 @@ public class FilesystemContainer implements Container.Hierarchical { * Gets the IDs of Items in the filesystem. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Collection<File> getItemIds() { if (recursive) { @@ -459,6 +470,7 @@ public class FilesystemContainer implements Container.Hierarchical { * the property's ID. * @return the requested property's value, or <code>null</code> */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (!(itemId instanceof File)) { @@ -493,6 +505,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @return Unmodifiable collection containing all available file properties. */ + @Override public Collection<String> getContainerPropertyIds() { return FILE_PROPERTIES; } @@ -506,6 +519,7 @@ public class FilesystemContainer implements Container.Hierarchical { * the ID of the property whose type is requested. * @return data type of the requested property, or <code>null</code> */ + @Override public Class<?> getType(Object propertyId) { if (propertyId.equals(PROPERTY_NAME)) { @@ -556,6 +570,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @return Number of Items in the container. */ + @Override public int size() { if (recursive) { @@ -609,6 +624,7 @@ public class FilesystemContainer implements Container.Hierarchical { * Gets the specified property of this file. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public Property<?> getItemProperty(Object id) { return getContainerProperty(file, id); } @@ -618,6 +634,7 @@ public class FilesystemContainer implements Container.Hierarchical { * JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public Collection<String> getItemPropertyIds() { return getContainerPropertyIds(); } @@ -716,6 +733,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Item#addItemProperty(Object, Property) */ + @Override public boolean addItemProperty(Object id, Property property) throws UnsupportedOperationException { throw new UnsupportedOperationException("Filesystem container " @@ -727,6 +745,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Item#removeItemProperty(Object) */ + @Override public boolean removeItemProperty(Object id) throws UnsupportedOperationException { throw new UnsupportedOperationException( @@ -763,6 +782,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see java.io.FilenameFilter#accept(File, String) */ + @Override public boolean accept(File dir, String name) { if (name.endsWith(filter)) { return true; @@ -832,6 +852,7 @@ public class FilesystemContainer implements Container.Hierarchical { * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object, * java.lang.Class, java.lang.Object) */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException( @@ -843,6 +864,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Container#addItem() */ + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); @@ -853,6 +875,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Container#addItem(java.lang.Object) */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); @@ -863,6 +886,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Container#removeAllItems() */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException( "File system container does not support this operation"); @@ -873,6 +897,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Container#removeItem(java.lang.Object) */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException( @@ -884,6 +909,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object ) */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException( diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java index 1291c8fcc4..06ab77c0e7 100644 --- a/src/com/vaadin/data/util/HierarchicalContainer.java +++ b/src/com/vaadin/data/util/HierarchicalContainer.java @@ -77,6 +77,7 @@ public class HierarchicalContainer extends IndexedContainer implements * Can the specified Item have any children? Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public boolean areChildrenAllowed(Object itemId) { if (noChildrenAllowed.contains(itemId)) { return false; @@ -89,6 +90,7 @@ public class HierarchicalContainer extends IndexedContainer implements * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> getChildren(Object itemId) { LinkedList<Object> c; @@ -109,6 +111,7 @@ public class HierarchicalContainer extends IndexedContainer implements * comment here, we use the default documentation from implemented * interface. */ + @Override public Object getParent(Object itemId) { if (filteredParent != null) { return filteredParent.get(itemId); @@ -121,6 +124,7 @@ public class HierarchicalContainer extends IndexedContainer implements * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean hasChildren(Object itemId) { if (filteredChildren != null) { return filteredChildren.containsKey(itemId); @@ -134,6 +138,7 @@ public class HierarchicalContainer extends IndexedContainer implements * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public boolean isRoot(Object itemId) { // If the container is filtered the itemId must be among filteredRoots // to be a root. @@ -156,6 +161,7 @@ public class HierarchicalContainer extends IndexedContainer implements * comment here, we use the default documentation from implemented * interface. */ + @Override public Collection<?> rootItemIds() { if (filteredRoots != null) { return Collections.unmodifiableCollection(filteredRoots); @@ -183,6 +189,7 @@ public class HierarchicalContainer extends IndexedContainer implements * @return <code>true</code> if the operation succeeded, <code>false</code> * if not */ + @Override public boolean setChildrenAllowed(Object itemId, boolean childrenAllowed) { // Checks that the item is in the container @@ -217,6 +224,7 @@ public class HierarchicalContainer extends IndexedContainer implements * @return <code>true</code> if the operation succeeded, <code>false</code> * if not */ + @Override public boolean setParent(Object itemId, Object newParentId) { // Checks that the item is in the container diff --git a/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java index b7eac3e378..172dc0dd4f 100644 --- a/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java +++ b/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java @@ -25,35 +25,43 @@ public class HierarchicalContainerOrderedWrapper extends hierarchical = toBeWrapped; } + @Override public boolean areChildrenAllowed(Object itemId) { return hierarchical.areChildrenAllowed(itemId); } + @Override public Collection<?> getChildren(Object itemId) { return hierarchical.getChildren(itemId); } + @Override public Object getParent(Object itemId) { return hierarchical.getParent(itemId); } + @Override public boolean hasChildren(Object itemId) { return hierarchical.hasChildren(itemId); } + @Override public boolean isRoot(Object itemId) { return hierarchical.isRoot(itemId); } + @Override public Collection<?> rootItemIds() { return hierarchical.rootItemIds(); } + @Override public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) throws UnsupportedOperationException { return hierarchical.setChildrenAllowed(itemId, areChildrenAllowed); } + @Override public boolean setParent(Object itemId, Object newParentId) throws UnsupportedOperationException { return hierarchical.setParent(itemId, newParentId); diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java index bcaa5eda42..b95b2c4de8 100644 --- a/src/com/vaadin/data/util/IndexedContainer.java +++ b/src/com/vaadin/data/util/IndexedContainer.java @@ -128,6 +128,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Container#getContainerPropertyIds() */ + @Override public Collection<?> getContainerPropertyIds() { return Collections.unmodifiableCollection(propertyIds); } @@ -139,6 +140,7 @@ public class IndexedContainer extends * the ID of the Property. * @return Type of the requested Property */ + @Override public Class<?> getType(Object propertyId) { return types.get(propertyId); } @@ -149,6 +151,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Container#getContainerProperty(java.lang.Object, * java.lang.Object) */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (!containsId(itemId)) { return null; @@ -466,6 +469,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() */ + @Override public Property getProperty() { return (Property) getSource(); } @@ -488,6 +492,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com. * vaadin.data.Property.ValueChangeListener) */ + @Override public void addListener(Property.ValueChangeListener listener) { if (propertyValueChangeListeners == null) { propertyValueChangeListeners = new LinkedList<Property.ValueChangeListener>(); @@ -501,6 +506,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com * .vaadin.data.Property.ValueChangeListener) */ + @Override public void removeListener(Property.ValueChangeListener listener) { if (propertyValueChangeListeners != null) { propertyValueChangeListeners.remove(listener); @@ -679,10 +685,12 @@ public class IndexedContainer extends * * @see com.vaadin.data.Item#getItemProperty(java.lang.Object) */ + @Override public Property<?> getItemProperty(Object id) { return new IndexedContainerProperty(itemId, id); } + @Override public Collection<?> getItemPropertyIds() { return Collections.unmodifiableCollection(propertyIds); } @@ -753,6 +761,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Item#addProperty(Object, Property) */ + @Override public boolean addItemProperty(Object id, Property property) throws UnsupportedOperationException { throw new UnsupportedOperationException("Indexed container item " @@ -766,6 +775,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Item#removeProperty(Object) */ + @Override public boolean removeItemProperty(Object id) throws UnsupportedOperationException { throw new UnsupportedOperationException( @@ -824,6 +834,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property#getType() */ + @Override public Class<?> getType() { return types.get(propertyId); } @@ -833,6 +844,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property#getValue() */ + @Override public Object getValue() { return items.get(itemId).get(propertyId); } @@ -842,6 +854,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property#isReadOnly() */ + @Override public boolean isReadOnly() { return readOnlyProperties.contains(this); } @@ -851,6 +864,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property#setReadOnly(boolean) */ + @Override public void setReadOnly(boolean newStatus) { if (newStatus) { readOnlyProperties.add(this); @@ -864,6 +878,7 @@ public class IndexedContainer extends * * @see com.vaadin.data.Property#setValue(java.lang.Object) */ + @Override public void setValue(Object newValue) throws Property.ReadOnlyException { // Gets the Property set final Map<Object, Object> propertySet = items.get(itemId); @@ -946,6 +961,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Property.ValueChangeNotifier#addListener( * com.vaadin.data.Property.ValueChangeListener) */ + @Override public void addListener(Property.ValueChangeListener listener) { addSinglePropertyChangeListener(propertyId, itemId, listener); } @@ -956,6 +972,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener * (com.vaadin.data.Property.ValueChangeListener) */ + @Override public void removeListener(Property.ValueChangeListener listener) { removeSinglePropertyChangeListener(propertyId, itemId, listener); } @@ -972,6 +989,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], * boolean[]) */ + @Override public void sort(Object[] propertyId, boolean[] ascending) { sortContainer(propertyId, ascending); } @@ -982,6 +1000,7 @@ public class IndexedContainer extends * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds * () */ + @Override public Collection<?> getSortableContainerPropertyIds() { return getSortablePropertyIds(); } @@ -1054,6 +1073,7 @@ public class IndexedContainer extends return nc; } + @Override public void addContainerFilter(Object propertyId, String filterString, boolean ignoreCase, boolean onlyMatchPrefix) { try { @@ -1065,19 +1085,23 @@ public class IndexedContainer extends } } + @Override public void removeAllContainerFilters() { removeAllFilters(); } + @Override public void removeContainerFilters(Object propertyId) { removeFilters(propertyId); } + @Override public void addContainerFilter(Filter filter) throws UnsupportedFilterException { addFilter(filter); } + @Override public void removeContainerFilter(Filter filter) { removeFilter(filter); } diff --git a/src/com/vaadin/data/util/ItemSorter.java b/src/com/vaadin/data/util/ItemSorter.java index 7f9e3a3f13..4399dbe292 100644 --- a/src/com/vaadin/data/util/ItemSorter.java +++ b/src/com/vaadin/data/util/ItemSorter.java @@ -51,6 +51,7 @@ public interface ItemSorter extends Comparator<Object>, Cloneable, Serializable * * @see Comparator#compare(Object, Object) */ + @Override int compare(Object itemId1, Object itemId2); } diff --git a/src/com/vaadin/data/util/MethodProperty.java b/src/com/vaadin/data/util/MethodProperty.java index 7df45e04ab..0c64d90481 100644 --- a/src/com/vaadin/data/util/MethodProperty.java +++ b/src/com/vaadin/data/util/MethodProperty.java @@ -568,6 +568,7 @@ public class MethodProperty<T> extends AbstractProperty<T> { * * @return type of the Property */ + @Override public final Class<? extends T> getType() { return type; } @@ -591,6 +592,7 @@ public class MethodProperty<T> extends AbstractProperty<T> { * * @return the value of the Property */ + @Override public T getValue() { try { return (T) getMethod.invoke(instance, getArgs); @@ -638,6 +640,7 @@ public class MethodProperty<T> extends AbstractProperty<T> { * read-only mode. * @see #invokeSetMethod(Object) */ + @Override @SuppressWarnings("unchecked") public void setValue(Object newValue) throws Property.ReadOnlyException { diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/src/com/vaadin/data/util/MethodPropertyDescriptor.java index 5fdb982b9e..a2a76ec6cf 100644 --- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/src/com/vaadin/data/util/MethodPropertyDescriptor.java @@ -112,14 +112,17 @@ public class MethodPropertyDescriptor<BT> implements } }; + @Override public String getName() { return name; } + @Override public Class<?> getPropertyType() { return propertyType; } + @Override public Property<?> createProperty(Object bean) { return new MethodProperty<Object>(propertyType, bean, readMethod, writeMethod); diff --git a/src/com/vaadin/data/util/NestedMethodProperty.java b/src/com/vaadin/data/util/NestedMethodProperty.java index d7b0f44912..9bff38456d 100644 --- a/src/com/vaadin/data/util/NestedMethodProperty.java +++ b/src/com/vaadin/data/util/NestedMethodProperty.java @@ -165,6 +165,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { this.setMethod = setMethod; } + @Override public Class<? extends T> getType() { return type; } @@ -180,6 +181,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { * * @return the value of the Property */ + @Override public T getValue() { try { Object object = instance; @@ -202,6 +204,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> { * read-only mode. * @see #invokeSetMethod(Object) */ + @Override public void setValue(Object newValue) throws ReadOnlyException { // Checks the mode if (isReadOnly()) { diff --git a/src/com/vaadin/data/util/NestedPropertyDescriptor.java b/src/com/vaadin/data/util/NestedPropertyDescriptor.java index 6404f6361d..b67b425d1d 100644 --- a/src/com/vaadin/data/util/NestedPropertyDescriptor.java +++ b/src/com/vaadin/data/util/NestedPropertyDescriptor.java @@ -42,14 +42,17 @@ public class NestedPropertyDescriptor<BT> implements this.propertyType = property.getType(); } + @Override public String getName() { return name; } + @Override public Class<?> getPropertyType() { return propertyType; } + @Override public Property<?> createProperty(BT bean) { return new NestedMethodProperty<Object>(bean, name); } diff --git a/src/com/vaadin/data/util/ObjectProperty.java b/src/com/vaadin/data/util/ObjectProperty.java index 9c60b9146e..cb85b44c2a 100644 --- a/src/com/vaadin/data/util/ObjectProperty.java +++ b/src/com/vaadin/data/util/ObjectProperty.java @@ -91,6 +91,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> { * * @return type of the Property */ + @Override public final Class<T> getType() { return type; } @@ -100,6 +101,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> { * * @return the value stored in the Property */ + @Override public T getValue() { return value; } @@ -115,6 +117,7 @@ public class ObjectProperty<T> extends AbstractProperty<T> { * @throws <code>Property.ReadOnlyException</code> if the object is in * read-only mode */ + @Override @SuppressWarnings("unchecked") public void setValue(Object newValue) throws Property.ReadOnlyException { diff --git a/src/com/vaadin/data/util/PropertyFormatter.java b/src/com/vaadin/data/util/PropertyFormatter.java index a63973535b..3d65726309 100644 --- a/src/com/vaadin/data/util/PropertyFormatter.java +++ b/src/com/vaadin/data/util/PropertyFormatter.java @@ -75,6 +75,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * @return the current data source as a Property, or <code>null</code> if * none defined. */ + @Override public Property<T> getPropertyDataSource() { return dataSource; } @@ -91,6 +92,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * @param newDataSource * the new data source Property. */ + @Override public void setPropertyDataSource(Property newDataSource) { boolean readOnly = false; @@ -132,6 +134,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> } /* Documented in the interface */ + @Override public Class<String> getType() { return String.class; } @@ -142,6 +145,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * @return If the datasource returns null, this is null. Otherwise this is * String given by format(). */ + @Override public String getValue() { T value = dataSource == null ? null : dataSource.getValue(); if (value == null) { @@ -195,6 +199,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> } } + @Override public void setValue(Object newValue) throws ReadOnlyException { if (dataSource == null) { return; @@ -221,6 +226,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * * This should not be called directly. */ + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { fireValueChange(); } @@ -230,6 +236,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * * This should not be called directly. */ + @Override public void readOnlyStatusChange( com.vaadin.data.Property.ReadOnlyStatusChangeEvent event) { fireReadOnlyStatusChange(); diff --git a/src/com/vaadin/data/util/PropertysetItem.java b/src/com/vaadin/data/util/PropertysetItem.java index 3270fa31f9..22f2da75b2 100644 --- a/src/com/vaadin/data/util/PropertysetItem.java +++ b/src/com/vaadin/data/util/PropertysetItem.java @@ -57,6 +57,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * 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); } @@ -67,6 +68,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @return unmodifiable collection containing IDs of the Properties stored * the Item */ + @Override public Collection<?> getItemPropertyIds() { return Collections.unmodifiableCollection(list); } @@ -83,6 +85,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @return <code>true</code> if the operation succeeded <code>false</code> * if not */ + @Override public boolean removeItemProperty(Object id) { // Cant remove missing properties @@ -107,6 +110,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @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 @@ -175,6 +179,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * * @return source object of the event as an <code>Item</code> */ + @Override public Item getItem() { return (Item) getSource(); } @@ -186,6 +191,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @param listener * the new Listener to be registered. */ + @Override public void addListener(Item.PropertySetChangeListener listener) { if (propertySetChangeListeners == null) { propertySetChangeListeners = new LinkedList<PropertySetChangeListener>(); @@ -199,6 +205,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @param listener * the Listener to be removed. */ + @Override public void removeListener(Item.PropertySetChangeListener listener) { if (propertySetChangeListeners != null) { propertySetChangeListeners.remove(listener); diff --git a/src/com/vaadin/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java index 7fef63e7f1..dc7c883a7e 100644 --- a/src/com/vaadin/data/util/QueryContainer.java +++ b/src/com/vaadin/data/util/QueryContainer.java @@ -188,6 +188,7 @@ public class QueryContainer implements Container, Container.Ordered, * @return Item Id. */ + @Override public Item getItem(Object id) { return new Row(id); } @@ -198,6 +199,7 @@ public class QueryContainer implements Container, Container.Ordered, * @return Collection of Property ID. */ + @Override public Collection<String> getContainerPropertyIds() { return propertyIds; } @@ -207,6 +209,7 @@ public class QueryContainer implements Container, Container.Ordered, * * @return collection of Item IDs */ + @Override public Collection<?> getItemIds() { final Collection<Integer> c = new ArrayList<Integer>(size); for (int i = 1; i <= size; i++) { @@ -229,6 +232,7 @@ public class QueryContainer implements Container, Container.Ordered, * otherwise. */ + @Override public synchronized Property<?> getContainerProperty(Object itemId, Object propertyId) { if (!(itemId instanceof Integer && propertyId instanceof String)) { @@ -256,6 +260,7 @@ public class QueryContainer implements Container, Container.Ordered, * @return data type of the Properties */ + @Override public Class<?> getType(Object id) { return propertyTypes.get(id); } @@ -265,6 +270,7 @@ public class QueryContainer implements Container, Container.Ordered, * * @return the number of items in the container. */ + @Override public int size() { return size; } @@ -277,6 +283,7 @@ public class QueryContainer implements Container, Container.Ordered, * @return <code>true</code> if given id is in the container; * <code>false</code> otherwise. */ + @Override public boolean containsId(Object id) { if (!(id instanceof Integer)) { return false; @@ -302,6 +309,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItem method is not supported. */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -313,6 +321,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItem method is not supported. */ + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -327,6 +336,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the removeItem method is not supported. */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -346,6 +356,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addContainerProperty method is not supported. */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -361,6 +372,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the removeContainerProperty method is not supported. */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -374,6 +386,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the removeAllItems method is not supported. */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -389,6 +402,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItemAfter method is not supported. */ + @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -404,6 +418,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItemAfter method is not supported. */ + @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -414,6 +429,7 @@ public class QueryContainer implements Container, Container.Ordered, * * @return ID of the first Item in the list. */ + @Override public Object firstItemId() { if (size < 1) { return null; @@ -427,6 +443,7 @@ public class QueryContainer implements Container, Container.Ordered, * @param id * ID of an Item in the Container. */ + @Override public boolean isFirstId(Object id) { return size > 0 && (id instanceof Integer) && ((Integer) id).intValue() == 1; @@ -439,6 +456,7 @@ public class QueryContainer implements Container, Container.Ordered, * ID of an Item in the Container * */ + @Override public boolean isLastId(Object id) { return size > 0 && (id instanceof Integer) && ((Integer) id).intValue() == size; @@ -449,6 +467,7 @@ public class QueryContainer implements Container, Container.Ordered, * * @return ID of the last Item. */ + @Override public Object lastItemId() { if (size < 1) { return null; @@ -463,6 +482,7 @@ public class QueryContainer implements Container, Container.Ordered, * ID of an Item in the Container. * @return ID of the next Item or null. */ + @Override public Object nextItemId(Object id) { if (size < 1 || !(id instanceof Integer)) { return null; @@ -481,6 +501,7 @@ public class QueryContainer implements Container, Container.Ordered, * ID of an Item in the Container. * @return ID of the previous Item or null. */ + @Override public Object prevItemId(Object id) { if (size < 1 || !(id instanceof Integer)) { return null; @@ -519,6 +540,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItemProperty method is not supported. */ + @Override public boolean addItemProperty(Object id, Property property) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -532,6 +554,7 @@ public class QueryContainer implements Container, Container.Ordered, * identifier of the Property to get * @return the Property with the given ID or <code>null</code> */ + @Override public Property<?> getItemProperty(Object propertyId) { return getContainerProperty(id, propertyId); } @@ -542,6 +565,7 @@ public class QueryContainer implements Container, Container.Ordered, * @return unmodifiable collection containing IDs of the Properties * stored the Item. */ + @Override public Collection<String> getItemPropertyIds() { return propertyIds; } @@ -556,6 +580,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the removeItemProperty is not supported. */ + @Override public boolean removeItemProperty(Object id) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -588,6 +613,7 @@ public class QueryContainer implements Container, Container.Ordered, * @throws UnsupportedOperationException * if the addItemAt is not supported. */ + @Override public Item addItemAt(int index, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -605,6 +631,7 @@ public class QueryContainer implements Container, Container.Ordered, * if the addItemAt is not supported. */ + @Override public Object addItemAt(int index) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -616,6 +643,7 @@ public class QueryContainer implements Container, Container.Ordered, * Index Id. * @return ID in the given index. */ + @Override public Object getIdByIndex(int index) { if (size < 1 || index < 0 || index >= size) { return null; @@ -632,6 +660,7 @@ public class QueryContainer implements Container, Container.Ordered, * Item */ + @Override public int indexOfId(Object id) { if (size < 1 || !(id instanceof Integer)) { return -1; diff --git a/src/com/vaadin/data/util/TextFileProperty.java b/src/com/vaadin/data/util/TextFileProperty.java index 5ebba98062..598b721a9c 100644 --- a/src/com/vaadin/data/util/TextFileProperty.java +++ b/src/com/vaadin/data/util/TextFileProperty.java @@ -64,6 +64,7 @@ public class TextFileProperty extends AbstractProperty<String> { * * @see com.vaadin.data.Property#getType() */ + @Override public Class<String> getType() { return String.class; } @@ -73,6 +74,7 @@ public class TextFileProperty extends AbstractProperty<String> { * * @see com.vaadin.data.Property#getValue() */ + @Override public String getValue() { if (file == null) { return null; @@ -114,6 +116,7 @@ public class TextFileProperty extends AbstractProperty<String> { * * @see com.vaadin.data.Property#setValue(java.lang.Object) */ + @Override public void setValue(Object newValue) throws ReadOnlyException { if (isReadOnly()) { throw new ReadOnlyException(); diff --git a/src/com/vaadin/data/util/TransactionalPropertyWrapper.java b/src/com/vaadin/data/util/TransactionalPropertyWrapper.java index 06ec0935c3..d042bfaac2 100644 --- a/src/com/vaadin/data/util/TransactionalPropertyWrapper.java +++ b/src/com/vaadin/data/util/TransactionalPropertyWrapper.java @@ -44,6 +44,7 @@ public class TransactionalPropertyWrapper<T> extends AbstractProperty<T> ((ValueChangeNotifier) wrappedProperty) .addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { fireValueChange(); } @@ -51,29 +52,35 @@ public class TransactionalPropertyWrapper<T> extends AbstractProperty<T> } } + @Override public Class getType() { return wrappedProperty.getType(); } + @Override public T getValue() { return wrappedProperty.getValue(); } + @Override public void setValue(Object newValue) throws ReadOnlyException { // Causes a value change to be sent to this listener which in turn fires // a new value change event for this property wrappedProperty.setValue(newValue); } + @Override public void startTransaction() { inTransaction = true; valueBeforeTransaction = getValue(); } + @Override public void commit() { endTransaction(); } + @Override public void rollback() { try { wrappedProperty.setValue(valueBeforeTransaction); diff --git a/src/com/vaadin/data/util/converter/DateToLongConverter.java b/src/com/vaadin/data/util/converter/DateToLongConverter.java index 537800f617..aeba38aa1f 100644 --- a/src/com/vaadin/data/util/converter/DateToLongConverter.java +++ b/src/com/vaadin/data/util/converter/DateToLongConverter.java @@ -24,6 +24,7 @@ public class DateToLongConverter implements Converter<Date, Long> { * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, * java.util.Locale) */ + @Override public Long convertToModel(Date value, Locale locale) { if (value == null) { return null; @@ -39,6 +40,7 @@ public class DateToLongConverter implements Converter<Date, Long> { * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public Date convertToPresentation(Long value, Locale locale) { if (value == null) { return null; @@ -52,6 +54,7 @@ public class DateToLongConverter implements Converter<Date, Long> { * * @see com.vaadin.data.util.converter.Converter#getModelType() */ + @Override public Class<Long> getModelType() { return Long.class; } @@ -61,6 +64,7 @@ public class DateToLongConverter implements Converter<Date, Long> { * * @see com.vaadin.data.util.converter.Converter#getPresentationType() */ + @Override public Class<Date> getPresentationType() { return Date.class; } diff --git a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/src/com/vaadin/data/util/converter/DefaultConverterFactory.java index 3ad7b6a85b..afb95d81ed 100644 --- a/src/com/vaadin/data/util/converter/DefaultConverterFactory.java +++ b/src/com/vaadin/data/util/converter/DefaultConverterFactory.java @@ -27,6 +27,7 @@ public class DefaultConverterFactory implements ConverterFactory { private final static Logger log = Logger .getLogger(DefaultConverterFactory.class.getName()); + @Override public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( Class<PRESENTATION> presentationType, Class<MODEL> modelType) { Converter<PRESENTATION, MODEL> converter = findConverter( diff --git a/src/com/vaadin/data/util/converter/ReverseConverter.java b/src/com/vaadin/data/util/converter/ReverseConverter.java index 1c561f29e8..fa1bb5daf1 100644 --- a/src/com/vaadin/data/util/converter/ReverseConverter.java +++ b/src/com/vaadin/data/util/converter/ReverseConverter.java @@ -42,6 +42,7 @@ public class ReverseConverter<PRESENTATION, MODEL> implements * @see com.vaadin.data.util.converter.Converter#convertToModel(java * .lang.Object, java.util.Locale) */ + @Override public MODEL convertToModel(PRESENTATION value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { return realConverter.convertToPresentation(value, locale); @@ -54,6 +55,7 @@ public class ReverseConverter<PRESENTATION, MODEL> implements * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public PRESENTATION convertToPresentation(MODEL value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { return realConverter.convertToModel(value, locale); @@ -64,6 +66,7 @@ public class ReverseConverter<PRESENTATION, MODEL> implements * * @see com.vaadin.data.util.converter.Converter#getSourceType() */ + @Override public Class<MODEL> getModelType() { return realConverter.getPresentationType(); } @@ -73,6 +76,7 @@ public class ReverseConverter<PRESENTATION, MODEL> implements * * @see com.vaadin.data.util.converter.Converter#getTargetType() */ + @Override public Class<PRESENTATION> getPresentationType() { return realConverter.getModelType(); } diff --git a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java index 96a3a3d071..999f575dc4 100644 --- a/src/com/vaadin/data/util/converter/StringToBooleanConverter.java +++ b/src/com/vaadin/data/util/converter/StringToBooleanConverter.java @@ -27,6 +27,7 @@ public class StringToBooleanConverter implements Converter<String, Boolean> { * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, * java.util.Locale) */ + @Override public Boolean convertToModel(String value, Locale locale) throws ConversionException { if (value == null) { @@ -71,6 +72,7 @@ public class StringToBooleanConverter implements Converter<String, Boolean> { * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public String convertToPresentation(Boolean value, Locale locale) throws ConversionException { if (value == null) { @@ -88,6 +90,7 @@ public class StringToBooleanConverter implements Converter<String, Boolean> { * * @see com.vaadin.data.util.converter.Converter#getModelType() */ + @Override public Class<Boolean> getModelType() { return Boolean.class; } @@ -97,6 +100,7 @@ public class StringToBooleanConverter implements Converter<String, Boolean> { * * @see com.vaadin.data.util.converter.Converter#getPresentationType() */ + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/src/com/vaadin/data/util/converter/StringToDateConverter.java b/src/com/vaadin/data/util/converter/StringToDateConverter.java index 6f3c2e47f6..487b02b2aa 100644 --- a/src/com/vaadin/data/util/converter/StringToDateConverter.java +++ b/src/com/vaadin/data/util/converter/StringToDateConverter.java @@ -52,6 +52,7 @@ public class StringToDateConverter implements Converter<String, Date> { * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, * java.util.Locale) */ + @Override public Date convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -78,6 +79,7 @@ public class StringToDateConverter implements Converter<String, Date> { * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public String convertToPresentation(Date value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -92,6 +94,7 @@ public class StringToDateConverter implements Converter<String, Date> { * * @see com.vaadin.data.util.converter.Converter#getModelType() */ + @Override public Class<Date> getModelType() { return Date.class; } @@ -101,6 +104,7 @@ public class StringToDateConverter implements Converter<String, Date> { * * @see com.vaadin.data.util.converter.Converter#getPresentationType() */ + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java index 60a38f4127..251f91855b 100644 --- a/src/com/vaadin/data/util/converter/StringToDoubleConverter.java +++ b/src/com/vaadin/data/util/converter/StringToDoubleConverter.java @@ -49,6 +49,7 @@ public class StringToDoubleConverter implements Converter<String, Double> { * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, * java.util.Locale) */ + @Override public Double convertToModel(String value, Locale locale) throws ConversionException { if (value == null) { @@ -74,6 +75,7 @@ public class StringToDoubleConverter implements Converter<String, Double> { * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public String convertToPresentation(Double value, Locale locale) throws ConversionException { if (value == null) { @@ -88,6 +90,7 @@ public class StringToDoubleConverter implements Converter<String, Double> { * * @see com.vaadin.data.util.converter.Converter#getModelType() */ + @Override public Class<Double> getModelType() { return Double.class; } @@ -97,6 +100,7 @@ public class StringToDoubleConverter implements Converter<String, Double> { * * @see com.vaadin.data.util.converter.Converter#getPresentationType() */ + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/src/com/vaadin/data/util/converter/StringToIntegerConverter.java b/src/com/vaadin/data/util/converter/StringToIntegerConverter.java index e55feec3b6..950f01c6ab 100644 --- a/src/com/vaadin/data/util/converter/StringToIntegerConverter.java +++ b/src/com/vaadin/data/util/converter/StringToIntegerConverter.java @@ -39,6 +39,7 @@ public class StringToIntegerConverter implements Converter<String, Integer> { return NumberFormat.getIntegerInstance(locale); } + @Override public Integer convertToModel(String value, Locale locale) throws ConversionException { if (value == null) { @@ -64,6 +65,7 @@ public class StringToIntegerConverter implements Converter<String, Integer> { return parsedValue.intValue(); } + @Override public String convertToPresentation(Integer value, Locale locale) throws ConversionException { if (value == null) { @@ -73,10 +75,12 @@ public class StringToIntegerConverter implements Converter<String, Integer> { return getFormat(locale).format(value); } + @Override public Class<Integer> getModelType() { return Integer.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/src/com/vaadin/data/util/converter/StringToNumberConverter.java b/src/com/vaadin/data/util/converter/StringToNumberConverter.java index d1816007e7..42699a326a 100644 --- a/src/com/vaadin/data/util/converter/StringToNumberConverter.java +++ b/src/com/vaadin/data/util/converter/StringToNumberConverter.java @@ -45,6 +45,7 @@ public class StringToNumberConverter implements Converter<String, Number> { * com.vaadin.data.util.converter.Converter#convertToModel(java.lang.Object, * java.util.Locale) */ + @Override public Number convertToModel(String value, Locale locale) throws ConversionException { if (value == null) { @@ -77,6 +78,7 @@ public class StringToNumberConverter implements Converter<String, Number> { * com.vaadin.data.util.converter.Converter#convertToPresentation(java.lang * .Object, java.util.Locale) */ + @Override public String convertToPresentation(Number value, Locale locale) throws ConversionException { if (value == null) { @@ -91,6 +93,7 @@ public class StringToNumberConverter implements Converter<String, Number> { * * @see com.vaadin.data.util.converter.Converter#getModelType() */ + @Override public Class<Number> getModelType() { return Number.class; } @@ -100,6 +103,7 @@ public class StringToNumberConverter implements Converter<String, Number> { * * @see com.vaadin.data.util.converter.Converter#getPresentationType() */ + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java index 0f20e28586..482b10120c 100644 --- a/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java +++ b/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java @@ -45,6 +45,7 @@ public abstract class AbstractJunctionFilter implements Filter { * If there are no sub-filters, false is returned - override in subclasses * to change this behavior. */ + @Override public boolean appliesToProperty(Object propertyId) { for (Filter filter : getFilters()) { if (filter.appliesToProperty(propertyId)) { diff --git a/src/com/vaadin/data/util/filter/And.java b/src/com/vaadin/data/util/filter/And.java index 08182794a8..ca6c35aba7 100644 --- a/src/com/vaadin/data/util/filter/And.java +++ b/src/com/vaadin/data/util/filter/And.java @@ -30,6 +30,7 @@ public final class And extends AbstractJunctionFilter { super(filters); } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedFilterException { for (Filter filter : getFilters()) { diff --git a/src/com/vaadin/data/util/filter/Between.java b/src/com/vaadin/data/util/filter/Between.java index dd47d36c7f..b00a74d13d 100644 --- a/src/com/vaadin/data/util/filter/Between.java +++ b/src/com/vaadin/data/util/filter/Between.java @@ -30,6 +30,7 @@ public class Between implements Filter { return endValue; } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { Object value = item.getItemProperty(getPropertyId()).getValue(); @@ -41,6 +42,7 @@ public class Between implements Filter { return false; } + @Override public boolean appliesToProperty(Object propertyId) { return getPropertyId() != null && getPropertyId().equals(propertyId); } diff --git a/src/com/vaadin/data/util/filter/Compare.java b/src/com/vaadin/data/util/filter/Compare.java index 111d95f055..4091f5b922 100644 --- a/src/com/vaadin/data/util/filter/Compare.java +++ b/src/com/vaadin/data/util/filter/Compare.java @@ -227,6 +227,7 @@ public abstract class Compare implements Filter { this.operation = operation; } + @Override public boolean passesFilter(Object itemId, Item item) { final Property<?> p = item.getItemProperty(getPropertyId()); if (null == p) { @@ -264,6 +265,7 @@ public abstract class Compare implements Filter { + value1 + ", " + getValue()); } + @Override public boolean appliesToProperty(Object propertyId) { return getPropertyId().equals(propertyId); } diff --git a/src/com/vaadin/data/util/filter/IsNull.java b/src/com/vaadin/data/util/filter/IsNull.java index aad71a7c80..3faf4153ee 100644 --- a/src/com/vaadin/data/util/filter/IsNull.java +++ b/src/com/vaadin/data/util/filter/IsNull.java @@ -33,6 +33,7 @@ public final class IsNull implements Filter { this.propertyId = propertyId; } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { final Property<?> p = item.getItemProperty(getPropertyId()); @@ -42,6 +43,7 @@ public final class IsNull implements Filter { return null == p.getValue(); } + @Override public boolean appliesToProperty(Object propertyId) { return getPropertyId().equals(propertyId); } diff --git a/src/com/vaadin/data/util/filter/Like.java b/src/com/vaadin/data/util/filter/Like.java index 723623bb69..3dcc48e809 100644 --- a/src/com/vaadin/data/util/filter/Like.java +++ b/src/com/vaadin/data/util/filter/Like.java @@ -37,6 +37,7 @@ public class Like implements Filter { return caseSensitive; } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { if (!item.getItemProperty(getPropertyId()).getType() @@ -54,6 +55,7 @@ public class Like implements Filter { return colValue.toUpperCase().matches(pattern.toUpperCase()); } + @Override public boolean appliesToProperty(Object propertyId) { return getPropertyId() != null && getPropertyId().equals(propertyId); } diff --git a/src/com/vaadin/data/util/filter/Not.java b/src/com/vaadin/data/util/filter/Not.java index 1731dcc2b5..bbfc9ca86a 100644 --- a/src/com/vaadin/data/util/filter/Not.java +++ b/src/com/vaadin/data/util/filter/Not.java @@ -36,6 +36,7 @@ public final class Not implements Filter { return filter; } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { return !filter.passesFilter(itemId, item); @@ -48,6 +49,7 @@ public final class Not implements Filter { * * @return boolean */ + @Override public boolean appliesToProperty(Object propertyId) { return filter.appliesToProperty(propertyId); } diff --git a/src/com/vaadin/data/util/filter/Or.java b/src/com/vaadin/data/util/filter/Or.java index 194afbc7da..b60074f7e3 100644 --- a/src/com/vaadin/data/util/filter/Or.java +++ b/src/com/vaadin/data/util/filter/Or.java @@ -30,6 +30,7 @@ public final class Or extends AbstractJunctionFilter { super(filters); } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedFilterException { for (Filter filter : getFilters()) { diff --git a/src/com/vaadin/data/util/filter/SimpleStringFilter.java b/src/com/vaadin/data/util/filter/SimpleStringFilter.java index 6203251045..f98b2c02b4 100644 --- a/src/com/vaadin/data/util/filter/SimpleStringFilter.java +++ b/src/com/vaadin/data/util/filter/SimpleStringFilter.java @@ -39,6 +39,7 @@ public final class SimpleStringFilter implements Filter { this.onlyMatchPrefix = onlyMatchPrefix; } + @Override public boolean passesFilter(Object itemId, Item item) { final Property<?> p = item.getItemProperty(propertyId); if (p == null) { @@ -62,6 +63,7 @@ public final class SimpleStringFilter implements Filter { return true; } + @Override public boolean appliesToProperty(Object propertyId) { return this.propertyId.equals(propertyId); } diff --git a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java index d84a164bfa..168bce1880 100644 --- a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java +++ b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java @@ -61,6 +61,7 @@ final public class ColumnProperty implements Property { this.readOnly = readOnly; } + @Override public Object getValue() { if (isModified()) { return changedValue; @@ -68,6 +69,7 @@ final public class ColumnProperty implements Property { return value; } + @Override public void setValue(Object newValue) throws ReadOnlyException { if (newValue == null && !nullable) { throw new NotNullableException( @@ -134,10 +136,12 @@ final public class ColumnProperty implements Property { || newValue.equals(referenceValue); } + @Override public Class<?> getType() { return type; } + @Override public boolean isReadOnly() { return readOnly; } @@ -146,6 +150,7 @@ final public class ColumnProperty implements Property { return allowReadOnlyChange; } + @Override public void setReadOnly(boolean newStatus) { if (allowReadOnlyChange) { readOnly = newStatus; diff --git a/src/com/vaadin/data/util/sqlcontainer/RowItem.java b/src/com/vaadin/data/util/sqlcontainer/RowItem.java index adededb65c..d613a06b63 100644 --- a/src/com/vaadin/data/util/sqlcontainer/RowItem.java +++ b/src/com/vaadin/data/util/sqlcontainer/RowItem.java @@ -48,6 +48,7 @@ public final class RowItem implements Item { this.id = id; } + @Override public Property<?> getItemProperty(Object id) { if (id instanceof String && id != null) { for (ColumnProperty cp : properties) { @@ -59,6 +60,7 @@ public final class RowItem implements Item { return null; } + @Override public Collection<?> getItemPropertyIds() { Collection<String> ids = new ArrayList<String>(properties.size()); for (ColumnProperty cp : properties) { @@ -71,6 +73,7 @@ public final class RowItem implements Item { * Adding properties is not supported. Properties are generated by * SQLContainer. */ + @Override public boolean addItemProperty(Object id, Property property) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -80,6 +83,7 @@ public final class RowItem implements Item { * Removing properties is not supported. Properties are generated by * SQLContainer. */ + @Override public boolean removeItemProperty(Object id) throws UnsupportedOperationException { throw new UnsupportedOperationException(); diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java index e9b5b4fea3..250b2eb4c3 100644 --- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -130,6 +130,7 @@ public class SQLContainer implements Container, Container.Filterable, * {@inheritDoc} */ + @Override public Object addItem() throws UnsupportedOperationException { Object emptyKey[] = new Object[delegate.getPrimaryKeyColumns().size()]; RowId itemId = new TemporaryRowId(emptyKey); @@ -186,6 +187,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#containsId(java.lang.Object) */ + @Override public boolean containsId(Object itemId) { if (itemId == null) { return false; @@ -227,6 +229,7 @@ public class SQLContainer implements Container, Container.Filterable, * java.lang.Object) */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { Item item = getItem(itemId); if (item == null) { @@ -241,6 +244,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#getContainerPropertyIds() */ + @Override public Collection<?> getContainerPropertyIds() { return Collections.unmodifiableCollection(propertyIds); } @@ -251,6 +255,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#getItem(java.lang.Object) */ + @Override public Item getItem(Object itemId) { if (!cachedItems.containsKey(itemId)) { int index = indexOfId(itemId); @@ -298,6 +303,7 @@ public class SQLContainer implements Container, Container.Filterable, * {@inheritDoc} */ + @Override public Collection<?> getItemIds() { updateCount(); ArrayList<RowId> ids = new ArrayList<RowId>(); @@ -355,6 +361,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#getType(java.lang.Object) */ + @Override public Class<?> getType(Object propertyId) { if (!propertyIds.contains(propertyId)) { return null; @@ -368,6 +375,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#size() */ + @Override public int size() { updateCount(); return size + sizeOfAddedItems() - removedItems.size(); @@ -379,6 +387,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#removeItem(java.lang.Object) */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { if (!containsId(itemId)) { @@ -447,6 +456,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#removeAllItems() */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { if (autoCommit) { /* Remove and commit instantly. */ @@ -508,6 +518,7 @@ public class SQLContainer implements Container, Container.Filterable, * {@inheritDoc} */ + @Override public void addContainerFilter(Filter filter) throws UnsupportedFilterException { // filter.setCaseSensitive(!ignoreCase); @@ -520,6 +531,7 @@ public class SQLContainer implements Container, Container.Filterable, * {@inheritDoc} */ + @Override public void removeContainerFilter(Filter filter) { filters.remove(filter); } @@ -560,6 +572,7 @@ public class SQLContainer implements Container, Container.Filterable, * {@inheritDoc} */ + @Override public void removeAllContainerFilters() { filters.clear(); refresh(); @@ -575,6 +588,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Indexed#indexOfId(java.lang.Object) */ + @Override public int indexOfId(Object itemId) { // First check if the id is in the added items for (int ix = 0; ix < addedItems.size(); ix++) { @@ -622,6 +636,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Indexed#getIdByIndex(int) */ + @Override public Object getIdByIndex(int index) { if (index < 0 || index > size() - 1) { return null; @@ -649,6 +664,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object) */ + @Override public Object nextItemId(Object itemId) { return getIdByIndex(indexOfId(itemId) + 1); } @@ -659,6 +675,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object) */ + @Override public Object prevItemId(Object itemId) { return getIdByIndex(indexOfId(itemId) - 1); } @@ -669,6 +686,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#firstItemId() */ + @Override public Object firstItemId() { updateCount(); if (size == 0) { @@ -697,6 +715,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#lastItemId() */ + @Override public Object lastItemId() { if (addedItems.isEmpty()) { int lastIx = size() - 1; @@ -723,6 +742,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object) */ + @Override public boolean isFirstId(Object itemId) { return firstItemId().equals(itemId); } @@ -733,6 +753,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object) */ + @Override public boolean isLastId(Object itemId) { return lastItemId().equals(itemId); } @@ -748,6 +769,7 @@ public class SQLContainer implements Container, Container.Filterable, * boolean[]) */ + @Override public void sort(Object[] propertyId, boolean[] ascending) { sorters.clear(); if (propertyId == null || propertyId.length == 0) { @@ -777,6 +799,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() */ + @Override public Collection<?> getSortableContainerPropertyIds() { return getContainerPropertyIds(); } @@ -1351,6 +1374,7 @@ public class SQLContainer implements Container, Container.Filterable, * java.lang.Class, java.lang.Object) */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -1362,6 +1386,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object) */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -1373,6 +1398,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container#addItem(java.lang.Object) */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -1384,6 +1410,7 @@ public class SQLContainer implements Container, Container.Filterable, * java.lang.Object) */ + @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -1395,6 +1422,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Indexed#addItemAt(int, java.lang.Object) */ + @Override public Item addItemAt(int index, Object newItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -1406,6 +1434,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Indexed#addItemAt(int) */ + @Override public Object addItemAt(int index) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -1416,6 +1445,7 @@ public class SQLContainer implements Container, Container.Filterable, * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) */ + @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -1433,6 +1463,7 @@ public class SQLContainer implements Container, Container.Filterable, * .data.Container.ItemSetChangeListener) */ + @Override public void addListener(Container.ItemSetChangeListener listener) { if (itemSetChangeListeners == null) { itemSetChangeListeners = new LinkedList<Container.ItemSetChangeListener>(); @@ -1448,6 +1479,7 @@ public class SQLContainer implements Container, Container.Filterable, * .data.Container.ItemSetChangeListener) */ + @Override public void removeListener(Container.ItemSetChangeListener listener) { if (itemSetChangeListeners != null) { itemSetChangeListeners.remove(listener); @@ -1477,6 +1509,7 @@ public class SQLContainer implements Container, Container.Filterable, super(source); } + @Override public Container getContainer() { return (Container) getSource(); } diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java index 40d0d0426f..9aa4f7c4be 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -26,6 +26,7 @@ public class J2EEConnectionPool implements JDBCConnectionPool { this.dataSourceJndiName = dataSourceJndiName; } + @Override public Connection reserveConnection() throws SQLException { Connection conn = getDataSource().getConnection(); conn.setAutoCommit(false); @@ -51,6 +52,7 @@ public class J2EEConnectionPool implements JDBCConnectionPool { } } + @Override public void releaseConnection(Connection conn) { if (conn != null) { try { @@ -62,6 +64,7 @@ public class J2EEConnectionPool implements JDBCConnectionPool { } } + @Override public void destroy() { dataSource = null; } diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index 2a1068e786..21760014b9 100644 --- a/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -81,6 +81,7 @@ public class SimpleJDBCConnectionPool implements JDBCConnectionPool { initialized = true; } + @Override public synchronized Connection reserveConnection() throws SQLException { if (!initialized) { initializeConnections(); @@ -100,6 +101,7 @@ public class SimpleJDBCConnectionPool implements JDBCConnectionPool { return c; } + @Override public synchronized void releaseConnection(Connection conn) { if (conn == null || !initialized) { return; @@ -139,6 +141,7 @@ public class SimpleJDBCConnectionPool implements JDBCConnectionPool { return c; } + @Override public void destroy() { for (Connection c : availableConnections) { try { diff --git a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java index 56a8455a16..ec986fab95 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java @@ -99,6 +99,7 @@ public class FreeformQuery implements QueryDelegate { * * {@inheritDoc} */ + @Override public int getCount() throws SQLException { // First try the delegate int count = countByDelegate(); @@ -187,6 +188,7 @@ public class FreeformQuery implements QueryDelegate { * * @see FreeformQueryDelegate#getQueryString(int, int) */ + @Override @SuppressWarnings("deprecation") public ResultSet getResults(int offset, int pagelength) throws SQLException { if (activeConnection == null) { @@ -218,6 +220,7 @@ public class FreeformQuery implements QueryDelegate { return rs; } + @Override @SuppressWarnings("deprecation") public boolean implementationRespectsPagingLimits() { if (delegate == null) { @@ -251,6 +254,7 @@ public class FreeformQuery implements QueryDelegate { * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#setFilters(java * .util.List) */ + @Override public void setFilters(List<Filter> filters) throws UnsupportedOperationException { if (delegate != null) { @@ -268,6 +272,7 @@ public class FreeformQuery implements QueryDelegate { * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#setOrderBy(java * .util.List) */ + @Override public void setOrderBy(List<OrderBy> orderBys) throws UnsupportedOperationException { if (delegate != null) { @@ -285,6 +290,7 @@ public class FreeformQuery implements QueryDelegate { * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#storeRow(com.vaadin * .data.util.sqlcontainer.RowItem) */ + @Override public int storeRow(RowItem row) throws SQLException { if (activeConnection == null) { throw new IllegalStateException("No transaction is active!"); @@ -307,6 +313,7 @@ public class FreeformQuery implements QueryDelegate { * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#removeRow(com.vaadin * .data.util.sqlcontainer.RowItem) */ + @Override public boolean removeRow(RowItem row) throws SQLException { if (activeConnection == null) { throw new IllegalStateException("No transaction is active!"); @@ -328,6 +335,7 @@ public class FreeformQuery implements QueryDelegate { * @see * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#beginTransaction() */ + @Override public synchronized void beginTransaction() throws UnsupportedOperationException, SQLException { if (activeConnection != null) { @@ -342,6 +350,7 @@ public class FreeformQuery implements QueryDelegate { * * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate#commit() */ + @Override public synchronized void commit() throws UnsupportedOperationException, SQLException { if (activeConnection == null) { @@ -359,6 +368,7 @@ public class FreeformQuery implements QueryDelegate { * * @see com.vaadin.data.util.sqlcontainer.query.QueryDelegate#rollback() */ + @Override public synchronized void rollback() throws UnsupportedOperationException, SQLException { if (activeConnection == null) { @@ -376,6 +386,7 @@ public class FreeformQuery implements QueryDelegate { * com.vaadin.data.util.sqlcontainer.query.QueryDelegate#getPrimaryKeyColumns * () */ + @Override public List<String> getPrimaryKeyColumns() { return primaryKeyColumns; } @@ -403,6 +414,7 @@ public class FreeformQuery implements QueryDelegate { * @see FreeformQueryDelegate#getContainsRowQueryString(Object...) * */ + @Override @SuppressWarnings("deprecation") public boolean containsRowWithKey(Object... keys) throws SQLException { String query = null; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java index 22ca30cc32..d0606704f7 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java @@ -111,6 +111,7 @@ public class TableQuery implements QueryDelegate, * * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getCount() */ + @Override public int getCount() throws SQLException { getLogger().log(Level.FINE, "Fetching count..."); StatementHelper sh = sqlGenerator.generateSelectQuery(tableName, @@ -137,6 +138,7 @@ public class TableQuery implements QueryDelegate, * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getResults(int, * int) */ + @Override public ResultSet getResults(int offset, int pagelength) throws SQLException { StatementHelper sh; /* @@ -161,6 +163,7 @@ public class TableQuery implements QueryDelegate, * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate# * implementationRespectsPagingLimits() */ + @Override public boolean implementationRespectsPagingLimits() { return true; } @@ -172,6 +175,7 @@ public class TableQuery implements QueryDelegate, * com.vaadin.addon.sqlcontainer.query.QueryDelegate#storeRow(com.vaadin * .addon.sqlcontainer.RowItem) */ + @Override public int storeRow(RowItem row) throws UnsupportedOperationException, SQLException { if (row == null) { @@ -254,6 +258,7 @@ public class TableQuery implements QueryDelegate, * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setFilters(java.util * .List) */ + @Override public void setFilters(List<Filter> filters) throws UnsupportedOperationException { if (filters == null) { @@ -270,6 +275,7 @@ public class TableQuery implements QueryDelegate, * com.vaadin.addon.sqlcontainer.query.QueryDelegate#setOrderBy(java.util * .List) */ + @Override public void setOrderBy(List<OrderBy> orderBys) throws UnsupportedOperationException { if (orderBys == null) { @@ -284,6 +290,7 @@ public class TableQuery implements QueryDelegate, * * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#beginTransaction() */ + @Override public void beginTransaction() throws UnsupportedOperationException, SQLException { if (transactionOpen && activeConnection != null) { @@ -301,6 +308,7 @@ public class TableQuery implements QueryDelegate, * * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#commit() */ + @Override public void commit() throws UnsupportedOperationException, SQLException { if (transactionOpen && activeConnection != null) { getLogger().log(Level.FINE, "DB -> commit"); @@ -329,6 +337,7 @@ public class TableQuery implements QueryDelegate, * * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#rollback() */ + @Override public void rollback() throws UnsupportedOperationException, SQLException { if (transactionOpen && activeConnection != null) { getLogger().log(Level.FINE, "DB -> rollback"); @@ -346,6 +355,7 @@ public class TableQuery implements QueryDelegate, * @see * com.vaadin.addon.sqlcontainer.query.QueryDelegate#getPrimaryKeyColumns() */ + @Override public List<String> getPrimaryKeyColumns() { return Collections.unmodifiableList(primaryKeyColumns); } @@ -581,6 +591,7 @@ public class TableQuery implements QueryDelegate, * com.vaadin.addon.sqlcontainer.query.QueryDelegate#removeRow(com.vaadin * .addon.sqlcontainer.RowItem) */ + @Override public boolean removeRow(RowItem row) throws UnsupportedOperationException, SQLException { getLogger().log(Level.FINE, @@ -604,6 +615,7 @@ public class TableQuery implements QueryDelegate, * com.vaadin.addon.sqlcontainer.query.QueryDelegate#containsRowWithKey( * java.lang.Object[]) */ + @Override public boolean containsRowWithKey(Object... keys) throws SQLException { ArrayList<Filter> filtersAndKeys = new ArrayList<Filter>(); if (filters != null) { @@ -665,10 +677,12 @@ public class TableQuery implements QueryDelegate, this.newId = newId; } + @Override public RowId getNewRowId() { return newId; } + @Override public RowId getOldRowId() { return oldId; } @@ -677,6 +691,7 @@ public class TableQuery implements QueryDelegate, /** * Adds RowIdChangeListener to this query */ + @Override public void addListener(RowIdChangeListener listener) { if (rowIdChangeListeners == null) { rowIdChangeListeners = new LinkedList<QueryDelegate.RowIdChangeListener>(); @@ -687,6 +702,7 @@ public class TableQuery implements QueryDelegate, /** * Removes the given RowIdChangeListener from this query */ + @Override public void removeListener(RowIdChangeListener listener) { if (rowIdChangeListeners != null) { rowIdChangeListeners.remove(listener); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 24d283c9ab..a6798f972b 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -51,6 +51,7 @@ public class DefaultSQLGenerator implements SQLGenerator { * generateSelectQuery(java.lang.String, java.util.List, java.util.List, * int, int, java.lang.String) */ + @Override public StatementHelper generateSelectQuery(String tableName, List<Filter> filters, List<OrderBy> orderBys, int offset, int pagelength, String toSelect) { @@ -84,6 +85,7 @@ public class DefaultSQLGenerator implements SQLGenerator { * generateUpdateQuery(java.lang.String, * com.vaadin.addon.sqlcontainer.RowItem) */ + @Override public StatementHelper generateUpdateQuery(String tableName, RowItem item) { if (tableName == null || tableName.trim().equals("")) { throw new IllegalArgumentException("Table name must be given."); @@ -133,6 +135,7 @@ public class DefaultSQLGenerator implements SQLGenerator { * generateInsertQuery(java.lang.String, * com.vaadin.addon.sqlcontainer.RowItem) */ + @Override public StatementHelper generateInsertQuery(String tableName, RowItem item) { if (tableName == null || tableName.trim().equals("")) { throw new IllegalArgumentException("Table name must be given."); @@ -184,6 +187,7 @@ public class DefaultSQLGenerator implements SQLGenerator { * generateDeleteQuery(java.lang.String, * com.vaadin.addon.sqlcontainer.RowItem) */ + @Override public StatementHelper generateDeleteQuery(String tableName, List<String> primaryKeyColumns, String versionColumn, RowItem item) { if (tableName == null || tableName.trim().equals("")) { diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index 02d6671b60..251a543a8a 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class AndTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof And; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { return QueryBuilder.group(QueryBuilder.getJoinedFilterString( ((And) filter).getFilters(), "AND", sh)); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java index e8a87a82d8..4fcaf759ea 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class BetweenTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof Between; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { Between between = (Between) filter; sh.addParameterValue(between.getStartValue()); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java index 72d72dd069..4293e1d630 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class CompareTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof Compare; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { Compare compare = (Compare) filter; sh.addParameterValue(compare.getValue()); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java index 2593bbae57..a2a6cd2c09 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class IsNullTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof IsNull; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { IsNull in = (IsNull) filter; return QueryBuilder.quote(in.getPropertyId()) + " IS NULL"; diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java index b1c779ae73..25a85caec0 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class LikeTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof Like; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { Like like = (Like) filter; if (like.isCaseSensitive()) { diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java index 7c1bba2bb5..5dfbe240e7 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java @@ -10,10 +10,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class NotTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof Not; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { Not not = (Not) filter; if (not.getFilter() instanceof IsNull) { diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 9724ee7944..2f0ed814e0 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -9,10 +9,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class OrTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof Or; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { return QueryBuilder.group(QueryBuilder.getJoinedFilterString( ((Or) filter).getFilters(), "OR", sh)); diff --git a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java index 1aae68abc0..f108003535 100644 --- a/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java +++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java @@ -10,10 +10,12 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; public class SimpleStringTranslator implements FilterTranslator { + @Override public boolean translatesFilter(Filter filter) { return filter instanceof SimpleStringFilter; } + @Override public String getWhereStringForFilter(Filter filter, StatementHelper sh) { SimpleStringFilter ssf = (SimpleStringFilter) filter; // Create a Like filter based on the SimpleStringFilter and execute the diff --git a/src/com/vaadin/data/validator/AbstractValidator.java b/src/com/vaadin/data/validator/AbstractValidator.java index 27eaaca485..8febe5338a 100644 --- a/src/com/vaadin/data/validator/AbstractValidator.java +++ b/src/com/vaadin/data/validator/AbstractValidator.java @@ -84,6 +84,7 @@ public abstract class AbstractValidator<T> implements Validator { */ protected abstract boolean isValidValue(T value); + @Override public void validate(Object value) throws InvalidValueException { // isValidType ensures that value can safely be cast to TYPE if (!isValidType(value) || !isValidValue((T) value)) { diff --git a/src/com/vaadin/data/validator/BeanValidator.java b/src/com/vaadin/data/validator/BeanValidator.java index 817df85248..816ff79b83 100644 --- a/src/com/vaadin/data/validator/BeanValidator.java +++ b/src/com/vaadin/data/validator/BeanValidator.java @@ -67,10 +67,12 @@ public class BeanValidator implements Validator { this.descriptor = descriptor; } + @Override public ConstraintDescriptor<?> getConstraintDescriptor() { return descriptor; } + @Override public Object getValidatedValue() { return value; } @@ -96,6 +98,7 @@ public class BeanValidator implements Validator { * * @see com.vaadin.data.Validator#validate(java.lang.Object) */ + @Override public void validate(final Object value) throws InvalidValueException { Set<?> violations = getJavaxBeanValidator().validateValue(beanClass, propertyName, value); diff --git a/src/com/vaadin/data/validator/CompositeValidator.java b/src/com/vaadin/data/validator/CompositeValidator.java index 956d773032..cad31c9d4d 100644 --- a/src/com/vaadin/data/validator/CompositeValidator.java +++ b/src/com/vaadin/data/validator/CompositeValidator.java @@ -101,6 +101,7 @@ public class CompositeValidator implements Validator { * @throws Validator.InvalidValueException * if the value is not valid. */ + @Override public void validate(Object value) throws Validator.InvalidValueException { switch (mode) { case AND: diff --git a/src/com/vaadin/data/validator/NullValidator.java b/src/com/vaadin/data/validator/NullValidator.java index 62b2580d48..551d88c776 100644 --- a/src/com/vaadin/data/validator/NullValidator.java +++ b/src/com/vaadin/data/validator/NullValidator.java @@ -43,6 +43,7 @@ public class NullValidator implements Validator { * @throws Validator.InvalidValueException * if the value was invalid. */ + @Override public void validate(Object value) throws Validator.InvalidValueException { if ((onlyNullAllowed && value != null) || (!onlyNullAllowed && value == null)) { diff --git a/src/com/vaadin/event/ActionManager.java b/src/com/vaadin/event/ActionManager.java index 08e9c85043..64fdeea69b 100644 --- a/src/com/vaadin/event/ActionManager.java +++ b/src/com/vaadin/event/ActionManager.java @@ -75,6 +75,7 @@ public class ActionManager implements Action.Container, Action.Handler, requestRepaint(); // this goes to the new viewer } + @Override public <T extends Action & Action.Listener> void addAction(T action) { if (ownActions == null) { ownActions = new HashSet<Action>(); @@ -84,6 +85,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public <T extends Action & Action.Listener> void removeAction(T action) { if (ownActions != null) { if (ownActions.remove(action)) { @@ -92,6 +94,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public void addActionHandler(Handler actionHandler) { if (actionHandler == this) { // don't add the actionHandler to itself @@ -109,6 +112,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public void removeActionHandler(Action.Handler actionHandler) { if (actionHandlers != null && actionHandlers.contains(actionHandler)) { @@ -206,6 +210,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public Action[] getActions(Object target, Object sender) { HashSet<Action> actions = new HashSet<Action>(); if (ownActions != null) { @@ -226,6 +231,7 @@ public class ActionManager implements Action.Container, Action.Handler, return actions.toArray(new Action[actions.size()]); } + @Override public void handleAction(Action action, Object sender, Object target) { if (actionHandlers != null) { Handler[] array = actionHandlers.toArray(new Handler[actionHandlers diff --git a/src/com/vaadin/event/EventRouter.java b/src/com/vaadin/event/EventRouter.java index 49b29de9bb..90c080b860 100644 --- a/src/com/vaadin/event/EventRouter.java +++ b/src/com/vaadin/event/EventRouter.java @@ -35,6 +35,7 @@ public class EventRouter implements MethodEventSource { * events generated by this component. Don't add a JavaDoc comment here, we * use the default documentation from implemented interface. */ + @Override public void addListener(Class<?> eventType, Object object, Method method) { if (listenerList == null) { listenerList = new LinkedHashSet<ListenerMethod>(); @@ -47,6 +48,7 @@ public class EventRouter implements MethodEventSource { * listen events generated by this component. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public void addListener(Class<?> eventType, Object object, String methodName) { if (listenerList == null) { listenerList = new LinkedHashSet<ListenerMethod>(); @@ -59,6 +61,7 @@ public class EventRouter implements MethodEventSource { * a JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Class<?> eventType, Object target) { if (listenerList != null) { final Iterator<ListenerMethod> i = listenerList.iterator(); @@ -77,6 +80,7 @@ public class EventRouter implements MethodEventSource { * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void removeListener(Class<?> eventType, Object target, Method method) { if (listenerList != null) { final Iterator<ListenerMethod> i = listenerList.iterator(); @@ -95,6 +99,7 @@ public class EventRouter implements MethodEventSource { * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void removeListener(Class<?> eventType, Object target, String methodName) { diff --git a/src/com/vaadin/event/FieldEvents.java b/src/com/vaadin/event/FieldEvents.java index 20e9fabb36..3c5f0f5652 100644 --- a/src/com/vaadin/event/FieldEvents.java +++ b/src/com/vaadin/event/FieldEvents.java @@ -261,10 +261,12 @@ public interface FieldEvents { protected abstract void fireEvent(Event event); + @Override public void blur() { fireEvent(new BlurEvent(component)); } + @Override public void focus() { fireEvent(new FocusEvent(component)); } diff --git a/src/com/vaadin/event/ShortcutListener.java b/src/com/vaadin/event/ShortcutListener.java index 0656ed0e1f..b760cfabe6 100644 --- a/src/com/vaadin/event/ShortcutListener.java +++ b/src/com/vaadin/event/ShortcutListener.java @@ -28,5 +28,6 @@ public abstract class ShortcutListener extends ShortcutAction implements super(shorthandCaption); } + @Override abstract public void handleAction(Object sender, Object target); } diff --git a/src/com/vaadin/event/TransferableImpl.java b/src/com/vaadin/event/TransferableImpl.java index 621ea95bc1..4c973571f7 100644 --- a/src/com/vaadin/event/TransferableImpl.java +++ b/src/com/vaadin/event/TransferableImpl.java @@ -24,18 +24,22 @@ public class TransferableImpl implements Transferable { this.rawVariables = rawVariables; } + @Override public Component getSourceComponent() { return sourceComponent; } + @Override public Object getData(String dataFlavor) { return rawVariables.get(dataFlavor); } + @Override public void setData(String dataFlavor, Object value) { rawVariables.put(dataFlavor, value); } + @Override public Collection<String> getDataFlavors() { return rawVariables.keySet(); } diff --git a/src/com/vaadin/event/dd/TargetDetailsImpl.java b/src/com/vaadin/event/dd/TargetDetailsImpl.java index 27afc32680..4a459777ed 100644 --- a/src/com/vaadin/event/dd/TargetDetailsImpl.java +++ b/src/com/vaadin/event/dd/TargetDetailsImpl.java @@ -29,6 +29,7 @@ public class TargetDetailsImpl implements TargetDetails { this.dropTarget = dropTarget; } + @Override public Object getData(String key) { return data.get(key); } @@ -37,6 +38,7 @@ public class TargetDetailsImpl implements TargetDetails { return data.put(key, value); } + @Override public DropTarget getTarget() { return dropTarget; } diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java index 52ffab9263..1457ea9df3 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java +++ b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java @@ -29,6 +29,7 @@ public final class AcceptAll extends ClientSideCriterion { return singleton; } + @Override public boolean accept(DragAndDropEvent dragEvent) { return true; } diff --git a/src/com/vaadin/event/dd/acceptcriteria/And.java b/src/com/vaadin/event/dd/acceptcriteria/And.java index a0340a9cdb..4122d67160 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/And.java +++ b/src/com/vaadin/event/dd/acceptcriteria/And.java @@ -41,6 +41,7 @@ public class And extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { for (ClientSideCriterion crit : criteria) { if (!crit.accept(dragEvent)) { diff --git a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index 0f4ae2990c..7d2c42ecb0 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -33,10 +33,12 @@ public abstract class ClientSideCriterion implements Serializable, * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#isClientSideVerifiable * () */ + @Override public final boolean isClientSideVerifiable() { return true; } + @Override public void paint(PaintTarget target) throws PaintException { target.startTag("-ac"); target.addAttribute("name", getIdentifier()); @@ -51,6 +53,7 @@ public abstract class ClientSideCriterion implements Serializable, return getClass().getCanonicalName(); } + @Override public final void paintResponse(PaintTarget target) throws PaintException { // NOP, nothing to do as this is client side verified criterion } diff --git a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 7eb04d9647..4c52698a4a 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -39,6 +39,7 @@ public class ContainsDataFlavor extends ClientSideCriterion { target.addAttribute("p", dataFlavorId); } + @Override public boolean accept(DragAndDropEvent dragEvent) { return dragEvent.getTransferable().getDataFlavors() .contains(dataFlavorId); diff --git a/src/com/vaadin/event/dd/acceptcriteria/Not.java b/src/com/vaadin/event/dd/acceptcriteria/Not.java index 85ff7e9bc9..1ed40a324d 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Not.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Not.java @@ -31,6 +31,7 @@ public class Not extends ClientSideCriterion { acceptCriterion.paint(target); } + @Override public boolean accept(DragAndDropEvent dragEvent) { return !acceptCriterion.accept(dragEvent); } diff --git a/src/com/vaadin/event/dd/acceptcriteria/Or.java b/src/com/vaadin/event/dd/acceptcriteria/Or.java index 077e9114d8..6ad45c54af 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Or.java @@ -39,6 +39,7 @@ public class Or extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { for (AcceptCriterion crit : criteria) { if (crit.accept(dragEvent)) { diff --git a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index 77840bc94f..47f06d434c 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -31,10 +31,12 @@ public abstract class ServerSideCriterion implements Serializable, private static final long serialVersionUID = 2128510128911628902L; + @Override public final boolean isClientSideVerifiable() { return false; } + @Override public void paint(PaintTarget target) throws PaintException { target.startTag("-ac"); target.addAttribute("name", getIdentifier()); @@ -45,6 +47,7 @@ public abstract class ServerSideCriterion implements Serializable, public void paintContent(PaintTarget target) { } + @Override public void paintResponse(PaintTarget target) throws PaintException { } diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java index d7c47dc915..d4fd20c952 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -49,6 +49,7 @@ public class SourceIs extends ClientSideCriterion { target.addAttribute("c", paintedComponents); } + @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java index 454159b3da..a644b858e2 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java +++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java @@ -33,6 +33,7 @@ public class SourceIsTarget extends ClientSideCriterion { private SourceIsTarget() { } + @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent diff --git a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java index 641fddc3ea..5df8f3f618 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java +++ b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java @@ -58,6 +58,7 @@ public class TargetDetailIs extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { Object data = dragEvent.getTargetDetails().getData(propertyName); return value.equals(data); diff --git a/src/com/vaadin/external/json/JSONException.java b/src/com/vaadin/external/json/JSONException.java index fecc38974e..895ffcb457 100644 --- a/src/com/vaadin/external/json/JSONException.java +++ b/src/com/vaadin/external/json/JSONException.java @@ -25,6 +25,7 @@ public class JSONException extends Exception { this.cause = cause; } + @Override public Throwable getCause() { return this.cause; } diff --git a/src/com/vaadin/external/json/JSONStringer.java b/src/com/vaadin/external/json/JSONStringer.java index e4ccc8e195..ae905cb15f 100644 --- a/src/com/vaadin/external/json/JSONStringer.java +++ b/src/com/vaadin/external/json/JSONStringer.java @@ -77,6 +77,7 @@ public class JSONStringer extends JSONWriter { * * @return The JSON text. */ + @Override public String toString() { return this.mode == 'd' ? this.writer.toString() : null; } diff --git a/src/com/vaadin/navigator/Navigator.java b/src/com/vaadin/navigator/Navigator.java index c5e7de836a..1813301fe6 100644 --- a/src/com/vaadin/navigator/Navigator.java +++ b/src/com/vaadin/navigator/Navigator.java @@ -54,6 +54,7 @@ public class Navigator implements Serializable { setHeight("0px"); } + @Override public void navigateTo(String fragmentParameters) { // nothing to do } @@ -88,14 +89,17 @@ public class Navigator implements Serializable { page.addListener(this); } + @Override public String getFragment() { return page.getFragment(); } + @Override public void setFragment(String fragment) { page.setFragment(fragment, false); } + @Override public void fragmentChanged(FragmentChangedEvent event) { UriFragmentManager.this.navigator.navigateTo(getFragment()); } @@ -122,6 +126,7 @@ public class Navigator implements Serializable { setSizeFull(); } + @Override public void showView(View view) { if (view instanceof Component) { setCompositionRoot((Component) view); @@ -155,6 +160,7 @@ public class Navigator implements Serializable { this.container = container; } + @Override public void showView(View view) { if (view instanceof Component) { container.removeAllComponents(); @@ -190,6 +196,7 @@ public class Navigator implements Serializable { this.view = view; } + @Override public String getViewName(String viewAndParameters) { if (null == viewAndParameters) { return null; @@ -200,6 +207,7 @@ public class Navigator implements Serializable { return null; } + @Override public View getView(String viewName) { if (this.viewName.equals(viewName)) { return view; @@ -250,6 +258,7 @@ public class Navigator implements Serializable { this.viewClass = viewClass; } + @Override public String getViewName(String viewAndParameters) { if (null == viewAndParameters) { return null; @@ -261,6 +270,7 @@ public class Navigator implements Serializable { return null; } + @Override public View getView(String viewName) { if (this.viewName.equals(viewName)) { try { diff --git a/src/com/vaadin/terminal/AbstractClientConnector.java b/src/com/vaadin/terminal/AbstractClientConnector.java index 752b5326fc..564643c1fc 100644 --- a/src/com/vaadin/terminal/AbstractClientConnector.java +++ b/src/com/vaadin/terminal/AbstractClientConnector.java @@ -69,6 +69,7 @@ public abstract class AbstractClientConnector implements ClientConnector { private ClientConnector parent; /* Documentation copied from interface */ + @Override public void requestRepaint() { Root root = getRoot(); if (root != null) { @@ -125,6 +126,7 @@ public abstract class AbstractClientConnector implements ClientConnector { registerRpc(implementation, type); } + @Override public SharedState getState() { if (null == sharedState) { sharedState = createState(); @@ -164,6 +166,7 @@ public abstract class AbstractClientConnector implements ClientConnector { * * @see com.vaadin.terminal.gwt.server.ClientConnector#getStateType() */ + @Override public Class<? extends SharedState> getStateType() { try { Method m = getClass().getMethod("getState", (Class[]) null); @@ -214,6 +217,7 @@ public abstract class AbstractClientConnector implements ClientConnector { this.connector = connector; } + @Override public Iterator<ClientConnector> iterator() { CombinedIterator<ClientConnector> iterator = new CombinedIterator<ClientConnector>(); iterator.addIterator(connector.getExtensions().iterator()); @@ -236,6 +240,7 @@ public abstract class AbstractClientConnector implements ClientConnector { rpcInterfaceName = rpcInterface.getName().replaceAll("\\$", "."); } + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { addMethodInvocationToQueue(rpcInterfaceName, method, args); @@ -274,10 +279,12 @@ public abstract class AbstractClientConnector implements ClientConnector { * * @since 7.0 */ + @Override public RpcManager getRpcManager(Class<?> rpcInterface) { return rpcManagerMap.get(rpcInterface); } + @Override public List<ClientMethodInvocation> retrievePendingRpcCalls() { if (pendingInvocations.isEmpty()) { return Collections.emptyList(); @@ -288,6 +295,7 @@ public abstract class AbstractClientConnector implements ClientConnector { } } + @Override public String getConnectorId() { if (connectorId == null) { if (getApplication() == null) { @@ -322,6 +330,7 @@ public abstract class AbstractClientConnector implements ClientConnector { * @return the Root ancestor of this connector, or <code>null</code> if none * is found. */ + @Override public Root getRoot() { ClientConnector connector = this; while (connector != null) { @@ -337,6 +346,7 @@ public abstract class AbstractClientConnector implements ClientConnector { return Logger.getLogger(AbstractClientConnector.class.getName()); } + @Override public void requestRepaintAll() { requestRepaint(); @@ -354,6 +364,7 @@ public abstract class AbstractClientConnector implements ClientConnector { iterators.add(iterator); } + @Override public boolean hasNext() { for (Iterator<? extends T> i : iterators) { if (i.hasNext()) { @@ -363,6 +374,7 @@ public abstract class AbstractClientConnector implements ClientConnector { return false; } + @Override public T next() { for (Iterator<? extends T> i : iterators) { if (i.hasNext()) { @@ -372,6 +384,7 @@ public abstract class AbstractClientConnector implements ClientConnector { throw new NoSuchElementException(); } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -390,6 +403,7 @@ public abstract class AbstractClientConnector implements ClientConnector { return new AllChildrenIterable(connector); } + @Override public Collection<Extension> getExtensions() { return Collections.unmodifiableCollection(extensions); } @@ -416,12 +430,14 @@ public abstract class AbstractClientConnector implements ClientConnector { requestRepaint(); } + @Override public void removeExtension(Extension extension) { extension.setParent(null); extensions.remove(extension); requestRepaint(); } + @Override public void setParent(ClientConnector parent) { // If the parent is not changed, don't do anything @@ -448,10 +464,12 @@ public abstract class AbstractClientConnector implements ClientConnector { } } + @Override public ClientConnector getParent() { return parent; } + @Override public void attach() { requestRepaint(); @@ -471,6 +489,7 @@ public abstract class AbstractClientConnector implements ClientConnector { * <code>null</code> after this method is called. * </p> */ + @Override public void detach() { for (ClientConnector connector : getAllChildrenIterable(this)) { connector.detach(); @@ -479,6 +498,7 @@ public abstract class AbstractClientConnector implements ClientConnector { getRoot().getConnectorTracker().unregisterConnector(this); } + @Override public boolean isConnectorEnabled() { if (getParent() == null) { // No parent -> the component cannot receive updates from the client diff --git a/src/com/vaadin/terminal/AbstractErrorMessage.java b/src/com/vaadin/terminal/AbstractErrorMessage.java index 3f526f7339..f7cd0e6aad 100644 --- a/src/com/vaadin/terminal/AbstractErrorMessage.java +++ b/src/com/vaadin/terminal/AbstractErrorMessage.java @@ -68,6 +68,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage { } /* Documented in interface */ + @Override public ErrorLevel getErrorLevel() { return level; } @@ -92,6 +93,7 @@ public abstract class AbstractErrorMessage implements ErrorMessage { causes.add(cause); } + @Override public String getFormattedHtmlMessage() { String result = null; switch (getMode()) { diff --git a/src/com/vaadin/terminal/ClassResource.java b/src/com/vaadin/terminal/ClassResource.java index e7419576f1..b74c8e7bb7 100644 --- a/src/com/vaadin/terminal/ClassResource.java +++ b/src/com/vaadin/terminal/ClassResource.java @@ -89,6 +89,7 @@ public class ClassResource implements ApplicationResource, Serializable { * * @see com.vaadin.terminal.Resource#getMIMEType() */ + @Override public String getMIMEType() { return FileTypeResolver.getMIMEType(resourceName); } @@ -98,6 +99,7 @@ public class ClassResource implements ApplicationResource, Serializable { * * @see com.vaadin.terminal.ApplicationResource#getApplication() */ + @Override public Application getApplication() { return application; } @@ -108,6 +110,7 @@ public class ClassResource implements ApplicationResource, Serializable { * @return the file name associated to this resource. * @see com.vaadin.terminal.ApplicationResource#getFilename() */ + @Override public String getFilename() { int index = 0; int next = 0; @@ -123,6 +126,7 @@ public class ClassResource implements ApplicationResource, Serializable { * * @see com.vaadin.terminal.ApplicationResource#getStream() */ + @Override public DownloadStream getStream() { final DownloadStream ds = new DownloadStream( associatedClass.getResourceAsStream(resourceName), @@ -133,6 +137,7 @@ public class ClassResource implements ApplicationResource, Serializable { } /* documented in superclass */ + @Override public int getBufferSize() { return bufferSize; } @@ -148,6 +153,7 @@ public class ClassResource implements ApplicationResource, Serializable { } /* documented in superclass */ + @Override public long getCacheTime() { return cacheTime; } diff --git a/src/com/vaadin/terminal/CombinedRequest.java b/src/com/vaadin/terminal/CombinedRequest.java index abf5e0412a..5b92feb39a 100644 --- a/src/com/vaadin/terminal/CombinedRequest.java +++ b/src/com/vaadin/terminal/CombinedRequest.java @@ -63,6 +63,7 @@ public class CombinedRequest implements WrappedRequest { } + @Override public String getParameter(String parameter) { String[] strings = getParameterMap().get(parameter); if (strings == null || strings.length == 0) { @@ -72,48 +73,60 @@ public class CombinedRequest implements WrappedRequest { } } + @Override public Map<String, String[]> getParameterMap() { return parameterMap; } + @Override public int getContentLength() { return secondRequest.getContentLength(); } + @Override public InputStream getInputStream() throws IOException { return secondRequest.getInputStream(); } + @Override public Object getAttribute(String name) { return secondRequest.getAttribute(name); } + @Override public void setAttribute(String name, Object value) { secondRequest.setAttribute(name, value); } + @Override public String getRequestPathInfo() { return secondRequest.getParameter("initialPath"); } + @Override public int getSessionMaxInactiveInterval() { return secondRequest.getSessionMaxInactiveInterval(); } + @Override public Object getSessionAttribute(String name) { return secondRequest.getSessionAttribute(name); } + @Override public void setSessionAttribute(String name, Object attribute) { secondRequest.setSessionAttribute(name, attribute); } + @Override public String getContentType() { return secondRequest.getContentType(); } + @Override public BrowserDetails getBrowserDetails() { return new BrowserDetails() { + @Override public String getUriFragment() { String fragment = secondRequest.getParameter("fr"); if (fragment == null) { @@ -123,10 +136,12 @@ public class CombinedRequest implements WrappedRequest { } } + @Override public String getWindowName() { return secondRequest.getParameter("wn"); } + @Override public WebBrowser getWebBrowser() { WebApplicationContext context = (WebApplicationContext) Application .getCurrent().getContext(); @@ -145,22 +160,27 @@ public class CombinedRequest implements WrappedRequest { return secondRequest; } + @Override public Locale getLocale() { return secondRequest.getLocale(); } + @Override public String getRemoteAddr() { return secondRequest.getRemoteAddr(); } + @Override public boolean isSecure() { return secondRequest.isSecure(); } + @Override public String getHeader(String name) { return secondRequest.getHeader(name); } + @Override public DeploymentConfiguration getDeploymentConfiguration() { return secondRequest.getDeploymentConfiguration(); } diff --git a/src/com/vaadin/terminal/ExternalResource.java b/src/com/vaadin/terminal/ExternalResource.java index 0abff91638..84fcc65a44 100644 --- a/src/com/vaadin/terminal/ExternalResource.java +++ b/src/com/vaadin/terminal/ExternalResource.java @@ -100,6 +100,7 @@ public class ExternalResource implements Resource, Serializable { * * @see com.vaadin.terminal.Resource#getMIMEType() */ + @Override public String getMIMEType() { if (mimeType == null) { mimeType = FileTypeResolver.getMIMEType(getURL().toString()); diff --git a/src/com/vaadin/terminal/FileResource.java b/src/com/vaadin/terminal/FileResource.java index 8dc3b00fd0..e3c9f0172a 100644 --- a/src/com/vaadin/terminal/FileResource.java +++ b/src/com/vaadin/terminal/FileResource.java @@ -61,6 +61,7 @@ public class FileResource implements ApplicationResource { * * @see com.vaadin.terminal.ApplicationResource#getStream() */ + @Override public DownloadStream getStream() { try { final DownloadStream ds = new DownloadStream(new FileInputStream( @@ -74,6 +75,7 @@ public class FileResource implements ApplicationResource { // Log the exception using the application error handler getApplication().getErrorHandler().terminalError(new ErrorEvent() { + @Override public Throwable getThrowable() { return e; } @@ -106,6 +108,7 @@ public class FileResource implements ApplicationResource { /** * @see com.vaadin.terminal.ApplicationResource#getApplication() */ + @Override public Application getApplication() { return application; } @@ -113,6 +116,7 @@ public class FileResource implements ApplicationResource { /** * @see com.vaadin.terminal.ApplicationResource#getFilename() */ + @Override public String getFilename() { return sourceFile.getName(); } @@ -120,6 +124,7 @@ public class FileResource implements ApplicationResource { /** * @see com.vaadin.terminal.Resource#getMIMEType() */ + @Override public String getMIMEType() { return FileTypeResolver.getMIMEType(sourceFile); } @@ -132,6 +137,7 @@ public class FileResource implements ApplicationResource { * * @return Cache time in milliseconds. */ + @Override public long getCacheTime() { return cacheTime; } @@ -150,6 +156,7 @@ public class FileResource implements ApplicationResource { } /* documented in superclass */ + @Override public int getBufferSize() { return bufferSize; } diff --git a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/src/com/vaadin/terminal/JavaScriptCallbackHelper.java index 01db0267d9..4b052c33d9 100644 --- a/src/com/vaadin/terminal/JavaScriptCallbackHelper.java +++ b/src/com/vaadin/terminal/JavaScriptCallbackHelper.java @@ -65,6 +65,7 @@ public class JavaScriptCallbackHelper implements Serializable { private void ensureRpc() { if (javascriptCallbackRpc == null) { javascriptCallbackRpc = new JavaScriptCallbackRpc() { + @Override public void call(String name, JSONArray arguments) { JavaScriptCallback callback = callbacks.get(name); try { diff --git a/src/com/vaadin/terminal/StreamResource.java b/src/com/vaadin/terminal/StreamResource.java index 1e13169292..1afd91dc08 100644 --- a/src/com/vaadin/terminal/StreamResource.java +++ b/src/com/vaadin/terminal/StreamResource.java @@ -79,6 +79,7 @@ public class StreamResource implements ApplicationResource { /** * @see com.vaadin.terminal.Resource#getMIMEType() */ + @Override public String getMIMEType() { if (MIMEType != null) { return MIMEType; @@ -123,6 +124,7 @@ public class StreamResource implements ApplicationResource { * * @return the filename. */ + @Override public String getFilename() { return filename; } @@ -140,6 +142,7 @@ public class StreamResource implements ApplicationResource { /** * @see com.vaadin.terminal.ApplicationResource#getApplication() */ + @Override public Application getApplication() { return application; } @@ -147,6 +150,7 @@ public class StreamResource implements ApplicationResource { /** * @see com.vaadin.terminal.ApplicationResource#getStream() */ + @Override public DownloadStream getStream() { final StreamSource ss = getStreamSource(); if (ss == null) { @@ -176,6 +180,7 @@ public class StreamResource implements ApplicationResource { } /* documented in superclass */ + @Override public int getBufferSize() { return bufferSize; } @@ -191,6 +196,7 @@ public class StreamResource implements ApplicationResource { } /* documented in superclass */ + @Override public long getCacheTime() { return cacheTime; } diff --git a/src/com/vaadin/terminal/ThemeResource.java b/src/com/vaadin/terminal/ThemeResource.java index d456047653..41674b2373 100644 --- a/src/com/vaadin/terminal/ThemeResource.java +++ b/src/com/vaadin/terminal/ThemeResource.java @@ -89,6 +89,7 @@ public class ThemeResource implements Resource { /** * @see com.vaadin.terminal.Resource#getMIMEType() */ + @Override public String getMIMEType() { return FileTypeResolver.getMIMEType(getResourceId()); } diff --git a/src/com/vaadin/terminal/gwt/client/AbstractFieldState.java b/src/com/vaadin/terminal/gwt/client/AbstractFieldState.java index 3a66a01f23..6a869893f7 100644 --- a/src/com/vaadin/terminal/gwt/client/AbstractFieldState.java +++ b/src/com/vaadin/terminal/gwt/client/AbstractFieldState.java @@ -121,6 +121,7 @@ public class AbstractFieldState extends ComponentState implements TabIndexState * * @see com.vaadin.terminal.gwt.client.ComponentState#getTabIndex() */ + @Override public int getTabIndex() { return tabIndex; } @@ -130,6 +131,7 @@ public class AbstractFieldState extends ComponentState implements TabIndexState * * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { this.tabIndex = tabIndex; } diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 31775d1d02..877f2a70b8 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -348,6 +348,7 @@ public class ApplicationConfiguration implements EntryPoint { public static void startApplication(final String applicationId) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { ApplicationConfiguration appConf = getConfigFromDOM(applicationId); ApplicationConnection a = GWT @@ -553,6 +554,7 @@ public class ApplicationConfiguration implements EntryPoint { private static DeferredWidgetLoader deferredWidgetLoader; + @Override public void onModuleLoad() { // Prepare VConsole for debugging @@ -571,6 +573,7 @@ public class ApplicationConfiguration implements EntryPoint { */ GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { + @Override public void onUncaughtException(Throwable e) { /* * Note in case of null console (without ?debug) we eat diff --git a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ComponentConnector.java index 95e9a4cf78..1da73edcf6 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ComponentConnector.java @@ -22,6 +22,7 @@ public interface ComponentConnector extends ServerConnector { * * @see com.vaadin.terminal.gwt.client.VPaintable#getState() */ + @Override public ComponentState getState(); /** diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java index 2b88867cfe..5e15bae48a 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java +++ b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java @@ -49,6 +49,7 @@ public class JavaScriptConnectorHelper { public void init() { connector.addStateChangeHandler(new StateChangeHandler() { + @Override public void onStateChanged(StateChangeEvent stateChangeEvent) { JavaScriptObject wrapper = getConnectorWrapper(); JavaScriptConnectorState state = getConnectorState(); diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java b/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java index 2a97e4a770..6fa9904230 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java +++ b/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java @@ -21,6 +21,7 @@ public final class JavaScriptExtension extends AbstractExtensionConnector helper.init(); } + @Override public JavaScriptConnectorHelper getJavascriptConnectorHelper() { return helper; } diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptExtensionState.java b/src/com/vaadin/terminal/gwt/client/JavaScriptExtensionState.java index e7bfbc4bb2..82fcc51f8a 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptExtensionState.java +++ b/src/com/vaadin/terminal/gwt/client/JavaScriptExtensionState.java @@ -18,6 +18,7 @@ public class JavaScriptExtensionState extends SharedState implements private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); + @Override public Set<String> getCallbackNames() { return callbackNames; } @@ -26,6 +27,7 @@ public class JavaScriptExtensionState extends SharedState implements this.callbackNames = callbackNames; } + @Override public Map<String, Set<String>> getRpcInterfaces() { return rpcInterfaces; } diff --git a/src/com/vaadin/terminal/gwt/client/NullConsole.java b/src/com/vaadin/terminal/gwt/client/NullConsole.java index 2d15ffd46c..7db513ca82 100644 --- a/src/com/vaadin/terminal/gwt/client/NullConsole.java +++ b/src/com/vaadin/terminal/gwt/client/NullConsole.java @@ -15,39 +15,48 @@ import com.google.gwt.core.client.GWT; */ public class NullConsole implements Console { + @Override public void dirUIDL(ValueMap u, ApplicationConfiguration cnf) { } + @Override public void error(String msg) { GWT.log(msg); } + @Override public void log(String msg) { GWT.log(msg); } + @Override public void printObject(Object msg) { GWT.log(msg.toString()); } + @Override public void printLayoutProblems(ValueMap meta, ApplicationConnection applicationConnection, Set<ComponentConnector> zeroHeightComponents, Set<ComponentConnector> zeroWidthComponents) { } + @Override public void log(Throwable e) { GWT.log(e.getMessage(), e); } + @Override public void error(Throwable e) { // Borrow exception handling from VDebugConsole VDebugConsole.handleError(e, this); } + @Override public void setQuietMode(boolean quietDebugMode) { } + @Override public void init() { } diff --git a/src/com/vaadin/terminal/gwt/client/ResourceLoader.java b/src/com/vaadin/terminal/gwt/client/ResourceLoader.java index 8c481e0356..21577ce87e 100644 --- a/src/com/vaadin/terminal/gwt/client/ResourceLoader.java +++ b/src/com/vaadin/terminal/gwt/client/ResourceLoader.java @@ -206,10 +206,12 @@ public class ResourceLoader { if (preloadListeners.containsKey(url)) { // Preload going on, continue when preloaded preloadResource(url, new ResourceLoadListener() { + @Override public void onLoad(ResourceLoadEvent event) { loadScript(url, resourceLoadListener); } + @Override public void onError(ResourceLoadEvent event) { // Preload failed -> signal error to own listener if (resourceLoadListener != null) { @@ -225,10 +227,12 @@ public class ResourceLoader { scriptTag.setSrc(url); scriptTag.setType("text/javascript"); addOnloadHandler(scriptTag, new ResourceLoadListener() { + @Override public void onLoad(ResourceLoadEvent event) { fireLoad(event); } + @Override public void onError(ResourceLoadEvent event) { fireError(event); } @@ -280,10 +284,12 @@ public class ResourceLoader { Element element = getPreloadElement(url); addOnloadHandler(element, new ResourceLoadListener() { + @Override public void onLoad(ResourceLoadEvent event) { fireLoad(event); } + @Override public void onError(ResourceLoadEvent event) { fireError(event); } @@ -358,10 +364,12 @@ public class ResourceLoader { if (preloadListeners.containsKey(url)) { // Preload going on, continue when preloaded preloadResource(url, new ResourceLoadListener() { + @Override public void onLoad(ResourceLoadEvent event) { loadStylesheet(url, resourceLoadListener); } + @Override public void onError(ResourceLoadEvent event) { // Preload failed -> signal error to own listener if (resourceLoadListener != null) { @@ -384,6 +392,7 @@ public class ResourceLoader { Scheduler.get().scheduleFixedPeriod(new RepeatingCommand() { private final Duration duration = new Duration(); + @Override public boolean execute() { int styleSheetLength = getStyleSheetLength(url); if (getStyleSheetLength(url) > 0) { @@ -403,6 +412,7 @@ public class ResourceLoader { }, 10); } else { addOnloadHandler(linkElement, new ResourceLoadListener() { + @Override public void onLoad(ResourceLoadEvent event) { // Chrome && IE fires load for errors, must check // stylesheet data @@ -418,6 +428,7 @@ public class ResourceLoader { fireLoad(event); } + @Override public void onError(ResourceLoadEvent event) { fireError(event); } diff --git a/src/com/vaadin/terminal/gwt/client/ServerConnector.java b/src/com/vaadin/terminal/gwt/client/ServerConnector.java index 3809073076..b016e2e88c 100644 --- a/src/com/vaadin/terminal/gwt/client/ServerConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ServerConnector.java @@ -93,6 +93,7 @@ public interface ServerConnector extends Connector { * @return The parent of this connector, as set by * {@link #setParent(ServerConnector)}. */ + @Override public ServerConnector getParent(); /** diff --git a/src/com/vaadin/terminal/gwt/client/SimpleTree.java b/src/com/vaadin/terminal/gwt/client/SimpleTree.java index 350e0d707d..506d990aac 100644 --- a/src/com/vaadin/terminal/gwt/client/SimpleTree.java +++ b/src/com/vaadin/terminal/gwt/client/SimpleTree.java @@ -49,6 +49,7 @@ public class SimpleTree extends ComplexPanel { getElement().appendChild(children); addDomHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { if (event.getNativeEvent().getEventTarget().cast() == handle) { if (children.getStyle().getDisplay().intern() == Display.NONE diff --git a/src/com/vaadin/terminal/gwt/client/SuperDevMode.java b/src/com/vaadin/terminal/gwt/client/SuperDevMode.java index 02df811d51..e435b3c6ed 100644 --- a/src/com/vaadin/terminal/gwt/client/SuperDevMode.java +++ b/src/com/vaadin/terminal/gwt/client/SuperDevMode.java @@ -53,6 +53,7 @@ public class SuperDevMode { + getRecompileParameters(GWT.getModuleName()), new AsyncCallback<RecompileResult>() { + @Override public void onSuccess(RecompileResult result) { VConsole.log("JSONP compile call successful"); @@ -72,6 +73,7 @@ public class SuperDevMode { Location.reload(); } + @Override public void onFailure(Throwable caught) { VConsole.error("JSONP compile call failed"); // Don't log exception as they are shown as @@ -86,6 +88,7 @@ public class SuperDevMode { VNotification n = new VNotification(); n.addEventListener(new EventListener() { + @Override public void notificationHidden(HideEvent event) { recompileWidgetsetAndStartInDevMode(serverUrl); } diff --git a/src/com/vaadin/terminal/gwt/client/UIDL.java b/src/com/vaadin/terminal/gwt/client/UIDL.java index a523016b60..e662e08b3f 100644 --- a/src/com/vaadin/terminal/gwt/client/UIDL.java +++ b/src/com/vaadin/terminal/gwt/client/UIDL.java @@ -283,10 +283,12 @@ public final class UIDL extends JavaScriptObject { int index = -1; + @Override public void remove() { throw new UnsupportedOperationException(); } + @Override public Object next() { if (hasNext()) { @@ -308,6 +310,7 @@ public final class UIDL extends JavaScriptObject { return null; } + @Override public boolean hasNext() { int count = getChildCount(); return count > index + 1; diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 4687512b47..1bda2401f0 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -447,6 +447,7 @@ public class Util { elem.getStyle().setProperty("overflow", "hidden"); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { // Dough, Safari scroll auto means actually just a moped elem.getStyle().setProperty("overflow", originalOverflow); @@ -1021,6 +1022,7 @@ public class Util { } Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { try { target.dispatchEvent(createMouseDownEvent); diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java index ce893741d3..a7bd943912 100644 --- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java +++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java @@ -84,6 +84,7 @@ public class VDebugConsole extends VOverlay implements Console { this.label = label; } + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { if (event.getTypeInt() == Event.ONKEYDOWN && event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ESCAPE) { @@ -199,6 +200,7 @@ public class VDebugConsole extends VOverlay implements Console { private EventPreview dragpreview = new EventPreview() { + @Override public boolean onEventPreview(Event event) { onBrowserEvent(event); return false; @@ -346,6 +348,7 @@ public class VDebugConsole extends VOverlay implements Console { * * @see com.vaadin.terminal.gwt.client.Console#log(java.lang.String) */ + @Override public void log(String msg) { if (msg == null) { msg = "null"; @@ -362,6 +365,7 @@ public class VDebugConsole extends VOverlay implements Console { private List<String> msgQueue = new LinkedList<String>(); private ScheduledCommand doSend = new ScheduledCommand() { + @Override public void execute() { if (!msgQueue.isEmpty()) { RequestBuilder requestBuilder = new RequestBuilder( @@ -375,12 +379,14 @@ public class VDebugConsole extends VOverlay implements Console { requestBuilder.sendRequest(requestData, new RequestCallback() { + @Override public void onResponseReceived(Request request, Response response) { // TODO Auto-generated method stub } + @Override public void onError(Request request, Throwable exception) { // TODO Auto-generated method stub @@ -438,6 +444,7 @@ public class VDebugConsole extends VOverlay implements Console { * * @see com.vaadin.terminal.gwt.client.Console#error(java.lang.String) */ + @Override public void error(String msg) { if (msg == null) { msg = "null"; @@ -466,6 +473,7 @@ public class VDebugConsole extends VOverlay implements Console { * @see com.vaadin.terminal.gwt.client.Console#printObject(java.lang. * Object) */ + @Override public void printObject(Object msg) { String str; if (msg == null) { @@ -483,6 +491,7 @@ public class VDebugConsole extends VOverlay implements Console { * @see com.vaadin.terminal.gwt.client.Console#dirUIDL(com.vaadin * .terminal.gwt.client.UIDL) */ + @Override public void dirUIDL(ValueMap u, ApplicationConfiguration conf) { if (panel.isAttached()) { VUIDLBrowser vuidlBrowser = new VUIDLBrowser(u, conf); @@ -522,6 +531,7 @@ public class VDebugConsole extends VOverlay implements Console { } }-*/; + @Override public void printLayoutProblems(ValueMap meta, ApplicationConnection ac, Set<ComponentConnector> zeroHeightComponents, Set<ComponentConnector> zeroWidthComponents) { @@ -576,6 +586,7 @@ public class VDebugConsole extends VOverlay implements Console { final CheckBox emphasisInUi = new CheckBox( "Emphasize components parent in UI (the actual component is not visible)"); emphasisInUi.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { Element element2 = layout.getElement(); Widget.setStyleName(element2, "invalidlayout", @@ -609,6 +620,7 @@ public class VDebugConsole extends VOverlay implements Console { } final CheckBox emphasisInUi = new CheckBox("Emphasize component in UI"); emphasisInUi.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { if (paintable != null) { Element element2 = paintable.getWidget().getElement(); @@ -634,6 +646,7 @@ public class VDebugConsole extends VOverlay implements Console { root.add(errorNode); } + @Override public void log(Throwable e) { if (e instanceof UmbrellaException) { UmbrellaException ue = (UmbrellaException) e; @@ -646,6 +659,7 @@ public class VDebugConsole extends VOverlay implements Console { GWT.log(e.getMessage(), e); } + @Override public void error(Throwable e) { handleError(e, this); } @@ -677,6 +691,7 @@ public class VDebugConsole extends VOverlay implements Console { } } + @Override public void init() { panel = new FlowPanel(); if (!quietMode) { @@ -732,6 +747,7 @@ public class VDebugConsole extends VOverlay implements Console { panel.add(new HTML("<i>" + help + "</i>")); clear.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { int width = panel.getOffsetWidth(); int height = panel.getOffsetHeight(); @@ -744,6 +760,7 @@ public class VDebugConsole extends VOverlay implements Console { }); restart.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { String queryString = Window.Location.getQueryString(); @@ -771,6 +788,7 @@ public class VDebugConsole extends VOverlay implements Console { }); forceLayout.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { for (ApplicationConnection applicationConnection : ApplicationConfiguration .getRunningApplications()) { @@ -780,6 +798,7 @@ public class VDebugConsole extends VOverlay implements Console { }); analyzeLayout.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { List<ApplicationConnection> runningApplications = ApplicationConfiguration .getRunningApplications(); @@ -795,6 +814,7 @@ public class VDebugConsole extends VOverlay implements Console { + " all non committed variables form client side."); savePosition.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { String pos = getAbsoluteLeft() + "," + getAbsoluteTop() + "," + getOffsetWidth() + "," + getOffsetHeight() @@ -805,6 +825,7 @@ public class VDebugConsole extends VOverlay implements Console { highlight.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { final Label label = new Label("--"); log("<i>Use mouse to select a component or click ESC to exit highlight mode.</i>"); @@ -819,6 +840,7 @@ public class VDebugConsole extends VOverlay implements Console { } connectorStats.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { for (ApplicationConnection a : ApplicationConfiguration .getRunningApplications()) { @@ -851,6 +873,7 @@ public class VDebugConsole extends VOverlay implements Console { } superDevMode.addValueChangeHandler(new ValueChangeHandler<Boolean>() { + @Override public void onValueChange(ValueChangeEvent<Boolean> event) { SuperDevMode.redirect(event.getValue()); } @@ -865,6 +888,7 @@ public class VDebugConsole extends VOverlay implements Console { devMode.setValue(true); } devMode.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { if (devMode.getValue()) { addHMParameter(); @@ -951,6 +975,7 @@ public class VDebugConsole extends VOverlay implements Console { } }; simpleTree.addDomHandler(new MouseOutHandler() { + @Override public void onMouseOut(MouseOutEvent event) { VUIDLBrowser.deHiglight(); } @@ -972,6 +997,7 @@ public class VDebugConsole extends VOverlay implements Console { return Util.getConnectorString(connector); } + @Override public void setQuietMode(boolean quietDebugMode) { quietMode = quietDebugMode; } diff --git a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java b/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java index 65d5d6a9a2..6f5e5854b2 100644 --- a/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java +++ b/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java @@ -19,6 +19,7 @@ public class VSchedulerImpl extends SchedulerImpl { super.scheduleDeferred(cmd); super.scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { deferredCommandTrackers--; } diff --git a/src/com/vaadin/terminal/gwt/client/VTooltip.java b/src/com/vaadin/terminal/gwt/client/VTooltip.java index 7fd3a3238b..38d1235c69 100644 --- a/src/com/vaadin/terminal/gwt/client/VTooltip.java +++ b/src/com/vaadin/terminal/gwt/client/VTooltip.java @@ -82,6 +82,7 @@ public class VTooltip extends VOverlay { // first to 0,0 position so that the calculation goes correctly. setPopupPosition(0, 0); setPopupPositionAndShow(new PositionCallback() { + @Override public void setPosition(int offsetWidth, int offsetHeight) { if (offsetWidth > MAX_WIDTH) { @@ -294,6 +295,7 @@ public class VTooltip extends VOverlay { currentTooltipInfo = null; } + @Override public void onMouseMove(MouseMoveEvent mme) { Event event = Event.as(mme.getNativeEvent()); com.google.gwt.dom.client.Element element = Element.as(event @@ -322,10 +324,12 @@ public class VTooltip extends VOverlay { } } + @Override public void onClick(ClickEvent event) { handleHideEvent(); } + @Override public void onKeyDown(KeyDownEvent event) { handleHideEvent(); } diff --git a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java index 491e569411..749a8343c8 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java +++ b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java @@ -8,10 +8,12 @@ import com.google.gwt.core.client.RunAsyncCallback; /** A helper class used by WidgetMap implementation. Used by the generated code. */ abstract class WidgetLoader implements RunAsyncCallback { + @Override public void onFailure(Throwable reason) { ApplicationConfiguration.endDependencyLoading(); } + @Override public void onSuccess() { addInstantiator(); ApplicationConfiguration.endDependencyLoading(); diff --git a/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java b/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java index bab0f385ed..8a7d5f2b69 100644 --- a/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java +++ b/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java @@ -13,6 +13,7 @@ public class URLReference_Serializer implements JSONSerializer<URLReference> { // setURL() -> uRL as first char becomes lower case... private static final String URL_FIELD = "uRL"; + @Override public URLReference deserialize(Type type, JSONValue jsonValue, ApplicationConnection connection) { URLReference reference = GWT.create(URLReference.class); @@ -27,6 +28,7 @@ public class URLReference_Serializer implements JSONSerializer<URLReference> { return reference; } + @Override public JSONValue serialize(URLReference value, ApplicationConnection connection) { JSONObject json = new JSONObject(); diff --git a/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java index 8656783a86..49eb198e13 100644 --- a/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java +++ b/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java @@ -23,6 +23,7 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector { @Override protected void init() { registerRpc(ExecuteJavaScriptRpc.class, new ExecuteJavaScriptRpc() { + @Override public void executeJavaScript(String Script) { eval(Script); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java index e0ca798682..9de465e4a5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java @@ -53,6 +53,7 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, */ private final NativePreviewHandler mouseUpPreviewHandler = new NativePreviewHandler() { + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { if (event.getTypeInt() == Event.ONMOUSEUP) { mouseUpEventPreviewRegistration.removeHandler(); @@ -144,6 +145,7 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, * popping up if there is a listener for right clicks. */ + @Override public void onContextMenu(ContextMenuEvent event) { if (hasEventListener() && shouldFireEvent(event)) { // Prevent showing the browser's context menu when there is a right @@ -152,6 +154,7 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, } } + @Override public void onMouseDown(MouseDownEvent event) { /* * When getting a mousedown event, we must detect where the @@ -163,6 +166,7 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, .addNativePreviewHandler(mouseUpPreviewHandler); } + @Override public void onMouseUp(MouseUpEvent event) { /* * Only fire a click if the mouseup hits the same element as the @@ -208,6 +212,7 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler, * double click will result in two click events and one double click event. */ + @Override public void onDoubleClick(DoubleClickEvent event) { if (hasEventListener() && shouldFireEvent(event)) { fireClick(event.getNativeEvent()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java index 6105c545f6..e95d4ca280 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java @@ -73,6 +73,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector * * @return The widget associated with this paintable */ + @Override public Widget getWidget() { if (widget == null) { widget = createWidget(); @@ -138,6 +139,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector updateComponentSize(); } + @Override public void setWidgetEnabled(boolean widgetEnabled) { // add or remove v-disabled style name from the widget setWidgetStyleName(ApplicationConnection.DISABLED_CLASSNAME, @@ -196,18 +198,22 @@ public abstract class AbstractComponentConnector extends AbstractConnector widget.setWidth(newWidth); } + @Override public boolean isRelativeHeight() { return getState().getHeight().endsWith("%"); } + @Override public boolean isRelativeWidth() { return getState().getWidth().endsWith("%"); } + @Override public boolean isUndefinedHeight() { return getState().getHeight().length() == 0; } + @Override public boolean isUndefinedWidth() { return getState().getWidth().length() == 0; } @@ -219,6 +225,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector * com.vaadin.terminal.gwt.client.ComponentConnector#delegateCaptionHandling * () */ + @Override public boolean delegateCaptionHandling() { return true; } @@ -337,11 +344,13 @@ public abstract class AbstractComponentConnector extends AbstractConnector * * @see com.vaadin.terminal.gwt.client.ComponentConnector#isReadOnly() */ + @Override @Deprecated public boolean isReadOnly() { return getState().isReadOnly(); } + @Override public LayoutManager getLayoutManager() { return LayoutManager.get(getConnection()); } @@ -355,6 +364,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector * @return true if an event listener has been registered with the given * event identifier on the server side, false otherwise */ + @Override public boolean hasEventListener(String eventIdentifier) { Set<String> reg = getState().getRegisteredEventListeners(); return (reg != null && reg.contains(eventIdentifier)); @@ -388,6 +398,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector * com.vaadin.terminal.gwt.client.ComponentConnector#getTooltipInfo(com. * google.gwt.dom.client.Element) */ + @Override public TooltipInfo getTooltipInfo(Element element) { return new TooltipInfo(getState().getDescription(), getState() .getErrorMessage()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java index c6bfba5023..6b294e65b8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java @@ -35,6 +35,7 @@ public abstract class AbstractComponentContainerConnector extends * @see * com.vaadin.terminal.gwt.client.ComponentContainerConnector#getChildren() */ + @Override public List<ComponentConnector> getChildComponents() { if (childComponents == null) { return Collections.emptyList(); @@ -50,6 +51,7 @@ public abstract class AbstractComponentContainerConnector extends * com.vaadin.terminal.gwt.client.ComponentContainerConnector#setChildren * (java.util.Collection) */ + @Override public void setChildComponents(List<ComponentConnector> childComponents) { this.childComponents = childComponents; } @@ -61,6 +63,7 @@ public abstract class AbstractComponentContainerConnector extends * connectorHierarchyChanged * (com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent) */ + @Override public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) { if (debugLogging) { VConsole.log("Hierarchy changed for " @@ -79,6 +82,7 @@ public abstract class AbstractComponentContainerConnector extends } } + @Override public HandlerRegistration addConnectorHierarchyChangeHandler( ConnectorHierarchyChangeHandler handler) { return ensureHandlerManager().addHandler( diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java index bee9c75165..f4e78a39f4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java @@ -57,6 +57,7 @@ public abstract class AbstractConnector implements ServerConnector, * * @see com.vaadin.terminal.gwt.client.VPaintable#getConnection() */ + @Override public final ApplicationConnection getConnection() { return connection; } @@ -66,6 +67,7 @@ public abstract class AbstractConnector implements ServerConnector, * * @see com.vaadin.terminal.gwt.client.Connector#getId() */ + @Override public String getConnectorId() { return id; } @@ -78,6 +80,7 @@ public abstract class AbstractConnector implements ServerConnector, * <p> * Connector classes should override {@link #init()} instead of this method. */ + @Override public final void doInit(String connectorId, ApplicationConnection connection) { this.connection = connection; @@ -140,6 +143,7 @@ public abstract class AbstractConnector implements ServerConnector, } } + @Override public <T extends ClientRpc> Collection<T> getRpcImplementations( String rpcInterfaceId) { if (null == rpcImplementations) { @@ -148,6 +152,7 @@ public abstract class AbstractConnector implements ServerConnector, return (Collection<T>) rpcImplementations.get(rpcInterfaceId); } + @Override public void fireEvent(GwtEvent<?> event) { if (handlerManager != null) { handlerManager.fireEvent(event); @@ -162,11 +167,13 @@ public abstract class AbstractConnector implements ServerConnector, return handlerManager; } + @Override public HandlerRegistration addStateChangeHandler(StateChangeHandler handler) { return ensureHandlerManager() .addHandler(StateChangeEvent.TYPE, handler); } + @Override public void onStateChanged(StateChangeEvent stateChangeEvent) { if (debugLogging) { VConsole.log("State change event for " @@ -182,6 +189,7 @@ public abstract class AbstractConnector implements ServerConnector, * * @see com.vaadin.terminal.gwt.client.ServerConnector#onUnregister() */ + @Override public void onUnregister() { if (debugLogging) { VConsole.log("Unregistered connector " @@ -197,6 +205,7 @@ public abstract class AbstractConnector implements ServerConnector, * * @return the current shared state (never null) */ + @Override public SharedState getState() { if (state == null) { state = createState(); @@ -217,14 +226,17 @@ public abstract class AbstractConnector implements ServerConnector, return ConnectorStateFactory.createState(getClass()); } + @Override public ServerConnector getParent() { return parent; } + @Override public void setParent(ServerConnector parent) { this.parent = parent; } + @Override public List<ServerConnector> getChildren() { if (children == null) { return Collections.emptyList(); @@ -232,10 +244,12 @@ public abstract class AbstractConnector implements ServerConnector, return children; } + @Override public void setChildren(List<ServerConnector> children) { this.children = children; } + @Override public boolean isEnabled() { if (!getState().isEnabled()) { return false; @@ -248,6 +262,7 @@ public abstract class AbstractConnector implements ServerConnector, } } + @Override public void updateEnabledState(boolean enabledState) { if (lastEnabledState == enabledState) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/Action.java b/src/com/vaadin/terminal/gwt/client/ui/Action.java index ca13cfc7f3..1a92e30f3f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Action.java +++ b/src/com/vaadin/terminal/gwt/client/ui/Action.java @@ -25,6 +25,7 @@ public abstract class Action implements Command { /** * Executed when action fired */ + @Override public abstract void execute(); public String getHTML() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java b/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java index 063d9f03a1..03d2069a94 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java +++ b/src/com/vaadin/terminal/gwt/client/ui/ConnectorWidgetFactory.java @@ -15,6 +15,7 @@ public abstract class ConnectorWidgetFactory extends // TODO Move to generator { addCreator(TextFieldConnector.class, new Creator<Widget>() { + @Override public Widget create() { return GWT.create(VTextField.class); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java index fc97bafc46..2fac234587 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java @@ -42,6 +42,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasFocusHandlers#addFocusHandler(com. * google.gwt.event.dom.client.FocusHandler) */ + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } @@ -53,6 +54,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasBlurHandlers#addBlurHandler(com.google * .gwt.event.dom.client.BlurHandler) */ + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } @@ -64,6 +66,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasKeyDownHandlers#addKeyDownHandler( * com.google.gwt.event.dom.client.KeyDownHandler) */ + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } @@ -75,6 +78,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasKeyPressHandlers#addKeyPressHandler * (com.google.gwt.event.dom.client.KeyPressHandler) */ + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } @@ -99,6 +103,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers, * * @see com.vaadin.terminal.gwt.client.Focusable#focus() */ + @Override public void focus() { setFocus(true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java index 831add049b..258fe441af 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java @@ -39,6 +39,7 @@ public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasFocusHandlers#addFocusHandler(com. * google.gwt.event.dom.client.FocusHandler) */ + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } @@ -50,6 +51,7 @@ public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasBlurHandlers#addBlurHandler(com.google * .gwt.event.dom.client.BlurHandler) */ + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } @@ -61,6 +63,7 @@ public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasKeyDownHandlers#addKeyDownHandler( * com.google.gwt.event.dom.client.KeyDownHandler) */ + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } @@ -72,6 +75,7 @@ public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers, * com.google.gwt.event.dom.client.HasKeyPressHandlers#addKeyPressHandler * (com.google.gwt.event.dom.client.KeyPressHandler) */ + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } @@ -94,6 +98,7 @@ public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers, /** * Focus the panel */ + @Override public void focus() { setFocus(true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java index ef1ea8521b..0ba42eb861 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java @@ -110,6 +110,7 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements } } + @Override public HandlerRegistration addScrollHandler(ScrollHandler handler) { return addDomHandler(handler, ScrollEvent.getType()); } @@ -168,8 +169,10 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements } } + @Override public void onScroll(ScrollEvent event) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { focusElement.getStyle().setTop(getScrollPosition(), Unit.PX); focusElement.getStyle().setLeft(getHorizontalScrollPosition(), diff --git a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java index bb062a6677..b317618878 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java @@ -31,6 +31,7 @@ public final class JavaScriptComponentConnector extends helper.init(); } + @Override public JavaScriptConnectorHelper getJavascriptConnectorHelper() { return helper; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentState.java b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentState.java index 6728f85ec9..6675ac69a4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentState.java +++ b/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentState.java @@ -18,6 +18,7 @@ public class JavaScriptComponentState extends ComponentState implements private Set<String> callbackNames = new HashSet<String>(); private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); + @Override public Set<String> getCallbackNames() { return callbackNames; } @@ -26,6 +27,7 @@ public class JavaScriptComponentState extends ComponentState implements this.callbackNames = callbackNames; } + @Override public Map<String, Set<String>> getRpcInterfaces() { return rpcInterfaces; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java index 42027f911b..81d963f981 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java @@ -32,10 +32,12 @@ public abstract class MediaBaseConnector extends AbstractComponentConnector { super.init(); registerRpc(MediaControl.class, new MediaControl() { + @Override public void play() { getWidget().play(); } + @Override public void pause() { getWidget().pause(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java index 37e9ab4a69..40454345bc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java @@ -149,6 +149,7 @@ public class ShortcutActionHandler { } else { shakeTarget(et); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { shakeTarget(et); } @@ -156,6 +157,7 @@ public class ShortcutActionHandler { } Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { if (finalTarget != null) { client.updateVariable(paintableId, "actiontarget", @@ -187,6 +189,7 @@ public class ShortcutActionHandler { // deferred. Will cause a small flickering, so not doing it for all // browsers. Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { focus(e); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java b/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java index 9baa1db007..ec62b82ce1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java @@ -36,18 +36,22 @@ public class SimpleFocusablePanel extends SimplePanel implements setTabIndex(0); } + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } @@ -64,6 +68,7 @@ public class SimpleFocusablePanel extends SimplePanel implements } } + @Override public void focus() { setFocus(true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java b/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java index 7302f9f2ac..16c32acecc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java @@ -121,6 +121,7 @@ public class TouchScrollDelegate implements NativePreviewHandler { setElements(scrollables); } + @Override public void onTouchStart(TouchStartEvent event) { assert delegate != null; delegate.onTouchStart(event); @@ -593,6 +594,7 @@ public class TouchScrollDelegate implements NativePreviewHandler { - scrolledElement.getClientHeight(); } + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { int typeInt = event.getTypeInt(); if (transitionOn) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java index 37f8889463..221a409511 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java +++ b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java @@ -15,6 +15,7 @@ public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages { * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/expanded * .png */ + @Override AbstractImagePrototype treeOpen(); /** @@ -24,6 +25,7 @@ public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages { * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/collapsed * .png */ + @Override AbstractImagePrototype treeClosed(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java index 692e13bd94..607abe893a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java @@ -46,6 +46,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { private VLazyExecutor delayedImageLoadExecutioner = new VLazyExecutor(100, new ScheduledCommand() { + @Override public void execute() { imagesLoaded(); } @@ -103,6 +104,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { Util.sinkOnloadForImages(menu.getElement()); setPopupPositionAndShow(new PositionCallback() { + @Override public void setPosition(int offsetWidth, int offsetHeight) { // mac FF gets bad width due GWT popups overflow hacks, // re-determine width @@ -129,6 +131,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { * the positioning has been done. */ Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { // Focus the menu. menu.setFocus(true); @@ -186,18 +189,22 @@ public class VContextMenu extends VOverlay implements SubPartAware { return super.getItems().get(index); } + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } + @Override public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) { return addDomHandler(handler, KeyPressEvent.getType()); } @@ -215,6 +222,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { setFocus(true); } + @Override public void onLoad(LoadEvent event) { // Handle icon onload events to ensure shadow is resized correctly delayedImageLoadExecutioner.trigger(); @@ -222,6 +230,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { } + @Override public Element getSubPartElement(String subPart) { int index = Integer.parseInt(subPart.substring(6)); // ApplicationConnection.getConsole().log( @@ -232,6 +241,7 @@ public class VContextMenu extends VOverlay implements SubPartAware { return item.getElement().getFirstChildElement().cast(); } + @Override public String getSubPartName(Element subElement) { if (getElement().isOrHasChild(subElement)) { com.google.gwt.dom.client.Element e = subElement; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index 77639c0c3f..a6ef85dcf1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -372,6 +372,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> { } } + @Override public void onClose(CloseEvent<PopupPanel> event) { removeShadowIfPresent(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java b/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java index 7fccdafd2a..f2f0125c86 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java @@ -10,6 +10,7 @@ import com.vaadin.terminal.gwt.client.UIDL; public abstract class Vaadin6Connector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { ((Paintable) getWidget()).updateFromUIDL(uidl, client); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java index 91436f5353..5675f9459e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java @@ -68,6 +68,7 @@ public class AbsoluteLayoutConnector extends element); } + @Override public void updateCaption(ComponentConnector component) { VAbsoluteLayout absoluteLayoutWidget = getWidget(); AbsoluteWrapper componentWrapper = getWrapper(component); @@ -147,6 +148,7 @@ public class AbsoluteLayoutConnector extends } } + @Override public void layoutVertically() { VAbsoluteLayout layout = getWidget(); for (ComponentConnector paintable : getChildComponents()) { @@ -179,6 +181,7 @@ public class AbsoluteLayoutConnector extends } } + @Override public void layoutHorizontally() { VAbsoluteLayout layout = getWidget(); for (ComponentConnector paintable : getChildComponents()) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java b/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java index f022e97973..fd8bb9deed 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java @@ -57,10 +57,12 @@ public class AccordionConnector extends TabsheetBaseConnector implements return (VAccordion) super.getWidget(); } + @Override public void updateCaption(ComponentConnector component) { /* Accordion does not render its children's captions */ } + @Override public void layout() { VAccordion accordion = getWidget(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java index b83d5afb00..d9320787e8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java @@ -434,6 +434,7 @@ public class VAccordion extends VTabsheetBase { } } + @Override public void onClick(ClickEvent event) { onSelectTab(this); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java index d79aa96ac6..ae25a11028 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java @@ -103,18 +103,21 @@ public class ButtonConnector extends AbstractComponentConnector implements return (ButtonState) super.getState(); } + @Override public void onFocus(FocusEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side focusBlurProxy.focus(); } + @Override public void onBlur(BlurEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side focusBlurProxy.blur(); } + @Override public void onClick(ClickEvent event) { if (getState().isDisableOnClick()) { getWidget().setEnabled(false); diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java index 2daceea0e8..9e44f62426 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java +++ b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java @@ -102,6 +102,7 @@ public class ButtonState extends ComponentState implements TabIndexState { * * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#getTabIndex() */ + @Override public int getTabIndex() { return tabIndex; } @@ -111,6 +112,7 @@ public class ButtonState extends ComponentState implements TabIndexState { * * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { this.tabIndex = tabIndex; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java index bb3d8e2985..3232338f62 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java @@ -281,6 +281,7 @@ public class VButton extends FocusWidget implements ClickHandler { * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event * .dom.client.ClickEvent) */ + @Override public void onClick(ClickEvent event) { if (BrowserInfo.get().isSafari()) { VButton.this.setFocus(true); diff --git a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java index bc405b793b..e8ff3f697c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java @@ -114,18 +114,21 @@ public class CheckBoxConnector extends AbstractFieldConnector implements return (VCheckBox) super.getWidget(); } + @Override public void onFocus(FocusEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side focusBlurRpc.focus(); } + @Override public void onBlur(BlurEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side focusBlurRpc.blur(); } + @Override public void onClick(ClickEvent event) { if (!isEnabled()) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java index ff153d30c9..9c0a5431f0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java @@ -27,6 +27,7 @@ public class ComboBoxConnector extends AbstractFieldConnector implements * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection) */ + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { // Save details getWidget().client = client; @@ -230,6 +231,7 @@ public class ComboBoxConnector extends AbstractFieldConnector implements return (VFilterSelect) super.getWidget(); } + @Override public void layout() { VFilterSelect widget = getWidget(); if (widget.initDone) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java index 9831001024..4dc7484459 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java @@ -101,6 +101,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * specified) and the caption of the item */ + @Override public String getDisplayString() { final StringBuffer sb = new StringBuffer(); if (iconUri != null) { @@ -124,6 +125,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * Get a string that represents this item. This is used in the text box. */ + @Override public String getReplacementString() { return caption; } @@ -150,6 +152,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * Executes a selection of this item. */ + @Override public void execute() { onSuggestionSelected(this); } @@ -454,6 +457,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * (int, int) */ + @Override public void setPosition(int offsetWidth, int offsetHeight) { int top = -1; @@ -591,6 +595,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, private VLazyExecutor delayedImageLoadExecutioner = new VLazyExecutor( 100, new ScheduledCommand() { + @Override public void execute() { if (suggestionPopup.isVisible() && suggestionPopup.isAttached()) { @@ -748,6 +753,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, private static final String SUBPART_PREFIX = "item"; + @Override public Element getSubPartElement(String subPart) { int index = Integer.parseInt(subPart.substring(SUBPART_PREFIX .length())); @@ -757,6 +763,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, return item.getElement(); } + @Override public String getSubPartName(Element subElement) { if (!getElement().isOrHasChild(subElement)) { return null; @@ -779,6 +786,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, return null; } + @Override public void onLoad(LoadEvent event) { // Handle icon onload events to ensure shadow is resized // correctly @@ -942,6 +950,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, selectedItemIcon.setStyleName("v-icon"); selectedItemIcon.addLoadHandler(new LoadHandler() { + @Override public void onLoad(LoadEvent event) { if (BrowserInfo.get().isIE8()) { // IE8 needs some help to discover it should reposition the @@ -1194,6 +1203,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * .event.dom.client.KeyDownEvent) */ + @Override public void onKeyDown(KeyDownEvent event) { if (enabled && !readonly) { int keyCode = event.getNativeKeyCode(); @@ -1356,6 +1366,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * The KeyUpEvent of the key depressed */ + @Override public void onKeyUp(KeyUpEvent event) { if (enabled && !readonly) { switch (event.getNativeKeyCode()) { @@ -1404,6 +1415,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * Listener for popupopener */ + @Override public void onClick(ClickEvent event) { if (textInputEnabled && event.getNativeEvent().getEventTarget().cast() == tb @@ -1468,6 +1480,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * .dom.client.FocusEvent) */ + @Override public void onFocus(FocusEvent event) { /* @@ -1505,6 +1518,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * .dom.client.BlurEvent) */ + @Override public void onBlur(BlurEvent event) { if (BrowserInfo.get().isIE() && preventNextBlurEventInIE) { @@ -1562,6 +1576,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * @see com.vaadin.terminal.gwt.client.Focusable#focus() */ + @Override public void focus() { focused = true; if (prompting && !readonly) { @@ -1670,6 +1685,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, suggestionPopup.hide(); } + @Override public Element getSubPartElement(String subPart) { if ("textbox".equals(subPart)) { return this.tb.getElement(); @@ -1679,6 +1695,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, return null; } + @Override public String getSubPartName(Element subElement) { if (tb.getElement().isOrHasChild(subElement)) { return "textbox"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java index 4d341bddfc..96e703538d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java @@ -137,6 +137,7 @@ public class CssLayoutConnector extends AbstractLayoutConnector { return (VCssLayout) super.getWidget(); } + @Override public void updateCaption(ComponentConnector child) { Widget childWidget = child.getWidget(); FlowPane cssLayoutWidgetContainer = getWidget().panel; diff --git a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java index 5001711d6c..2b2bca83c4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java @@ -19,6 +19,7 @@ public class CustomComponentConnector extends return (VCustomComponent) super.getWidget(); } + @Override public void updateCaption(ComponentConnector component) { // NOP, custom component dont render composition roots caption } diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java index f8861caf92..2cebeb5c1a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java @@ -102,10 +102,12 @@ public class CustomLayoutConnector extends AbstractLayoutConnector implements return (VCustomLayout) super.getWidget(); } + @Override public void updateCaption(ComponentConnector paintable) { getWidget().updateCaption(paintable); } + @Override public void layout() { getWidget().iLayoutJS(DOM.getFirstChild(getWidget().getElement())); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java index f9d02d403b..159b5bc414 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java @@ -15,6 +15,7 @@ import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector; public class AbstractDateFieldConnector extends AbstractFieldConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java index 7cd9c110ba..e7d1d48d5f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java @@ -40,6 +40,7 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector { if (getWidget().currentResolution > VDateField.RESOLUTION_DAY) { getWidget().calendarPanel .setTimeChangeListener(new TimeChangeListener() { + @Override public void changed(int hour, int min, int sec, int msec) { Date d = getWidget().getDate(); if (d == null) { @@ -64,6 +65,7 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector { if (getWidget().currentResolution <= VDateField.RESOLUTION_MONTH) { getWidget().calendarPanel .setFocusChangeListener(new FocusChangeListener() { + @Override public void focusChanged(Date date) { Date date2 = new Date(); if (getWidget().calendarPanel.getDate() != null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java index dfe0b327ac..85753095ca 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java @@ -53,6 +53,7 @@ public class PopupDateFieldConnector extends TextualDateConnector { if (getWidget().currentResolution <= VPopupCalendar.RESOLUTION_MONTH) { getWidget().calendar .setFocusChangeListener(new FocusChangeListener() { + @Override public void focusChanged(Date date) { getWidget().updateValue(date); getWidget().buildDate(); @@ -68,6 +69,7 @@ public class PopupDateFieldConnector extends TextualDateConnector { if (getWidget().currentResolution > VPopupCalendar.RESOLUTION_DAY) { getWidget().calendar .setTimeChangeListener(new TimeChangeListener() { + @Override public void changed(int hour, int min, int sec, int msec) { Date d = getWidget().getDate(); if (d == null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java index acfff60d53..e4e25a5a2e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java @@ -121,6 +121,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt * .event.dom.client.ClickEvent) */ + @Override public void onClick(ClickEvent event) { Day day = (Day) event.getSource(); focusDay(day.getDate()); @@ -718,6 +719,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.KeyDownHandler#onKeyDown(com.google.gwt * .event.dom.client.KeyDownEvent) */ + @Override public void onKeyDown(KeyDownEvent event) { handleKeyPress(event); } @@ -729,6 +731,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.KeyPressHandler#onKeyPress(com.google * .gwt.event.dom.client.KeyPressEvent) */ + @Override public void onKeyPress(KeyPressEvent event) { handleKeyPress(event); } @@ -1124,6 +1127,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.MouseOutHandler#onMouseOut(com.google * .gwt.event.dom.client.MouseOutEvent) */ + @Override public void onMouseOut(MouseOutEvent event) { if (mouseTimer != null) { mouseTimer.cancel(); @@ -1137,6 +1141,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.MouseDownHandler#onMouseDown(com.google * .gwt.event.dom.client.MouseDownEvent) */ + @Override public void onMouseDown(MouseDownEvent event) { // Allow user to click-n-hold for fast-forward or fast-rewind. // Timer is first used for a 500ms delay after mousedown. After that has @@ -1169,6 +1174,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.MouseUpHandler#onMouseUp(com.google.gwt * .event.dom.client.MouseUpEvent) */ + @Override public void onMouseUp(MouseUpEvent event) { if (mouseTimer != null) { mouseTimer.cancel(); @@ -1354,6 +1360,7 @@ public class VCalendarPanel extends FocusableFlexTable implements ListBox lastDropDown = getLastDropDown(); lastDropDown.addKeyDownHandler(new KeyDownHandler() { + @Override public void onKeyDown(KeyDownEvent event) { boolean shiftKey = event.getNativeEvent().getShiftKey(); if (shiftKey) { @@ -1439,6 +1446,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.ChangeHandler#onChange(com.google.gwt * .event.dom.client.ChangeEvent) */ + @Override public void onChange(ChangeEvent event) { /* * Value from dropdowns gets always set for the value. Like year and @@ -1589,6 +1597,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.BlurHandler#onBlur(com.google.gwt.event * .dom.client.BlurEvent) */ + @Override public void onBlur(final BlurEvent event) { if (event.getSource() instanceof VCalendarPanel) { hasFocus = false; @@ -1603,6 +1612,7 @@ public class VCalendarPanel extends FocusableFlexTable implements * com.google.gwt.event.dom.client.FocusHandler#onFocus(com.google.gwt.event * .dom.client.FocusEvent) */ + @Override public void onFocus(FocusEvent event) { if (event.getSource() instanceof VCalendarPanel) { hasFocus = true; @@ -1627,6 +1637,7 @@ public class VCalendarPanel extends FocusableFlexTable implements private static final String SUBPART_DAY = "day"; private static final String SUBPART_MONTH_YEAR_HEADER = "header"; + @Override public String getSubPartName(Element subElement) { if (contains(nextMonth, subElement)) { return SUBPART_NEXT_MONTH; @@ -1685,6 +1696,7 @@ public class VCalendarPanel extends FocusableFlexTable implements return w.getElement().isOrHasChild(subElement); } + @Override public Element getSubPartElement(String subPart) { if (SUBPART_NEXT_MONTH.equals(subPart)) { return nextMonth.getElement(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java index 84b3c678eb..e411fb3013 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java @@ -23,16 +23,19 @@ public class VDateFieldCalendar extends VDateField { calendarPanel = new VCalendarPanel(); add(calendarPanel); calendarPanel.setSubmitListener(new SubmitListener() { + @Override public void onSubmit() { updateValueFromPanel(); } + @Override public void onCancel() { // TODO Auto-generated method stub } }); calendarPanel.setFocusOutListener(new FocusOutListener() { + @Override public boolean onFocusOut(DomEvent<?> event) { updateValueFromPanel(); return false; diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java index 7011e5358b..de6ebf29af 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java @@ -66,6 +66,7 @@ public class VPopupCalendar extends VTextualDate implements Field, calendar = GWT.create(VCalendarPanel.class); calendar.setFocusOutListener(new FocusOutListener() { + @Override public boolean onFocusOut(DomEvent<?> event) { event.preventDefault(); closeCalendarPanel(); @@ -74,6 +75,7 @@ public class VPopupCalendar extends VTextualDate implements Field, }); calendar.setSubmitListener(new SubmitListener() { + @Override public void onSubmit() { // Update internal value and send valuechange event if immediate updateValue(calendar.getDate()); @@ -84,6 +86,7 @@ public class VPopupCalendar extends VTextualDate implements Field, closeCalendarPanel(); } + @Override public void onCancel() { closeCalendarPanel(); } @@ -164,6 +167,7 @@ public class VPopupCalendar extends VTextualDate implements Field, popup.setWidth(""); popup.setHeight(""); popup.setPopupPositionAndShow(new PositionCallback() { + @Override public void setPosition(int offsetWidth, int offsetHeight) { final int w = offsetWidth; final int h = offsetHeight; @@ -232,6 +236,7 @@ public class VPopupCalendar extends VTextualDate implements Field, * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event * .dom.client.ClickEvent) */ + @Override public void onClick(ClickEvent event) { if (event.getSource() == calendarToggle && isEnabled()) { openCalendarPanel(); @@ -245,6 +250,7 @@ public class VPopupCalendar extends VTextualDate implements Field, * com.google.gwt.event.logical.shared.CloseHandler#onClose(com.google.gwt * .event.logical.shared.CloseEvent) */ + @Override public void onClose(CloseEvent<PopupPanel> event) { if (event.getSource() == popup) { buildDate(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java index db4eca152a..5febb05440 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java @@ -50,6 +50,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, text.addStyleName(CLASSNAME + "-textfield"); text.addChangeHandler(this); text.addFocusHandler(new FocusHandler() { + @Override public void onFocus(FocusEvent event) { text.addStyleName(VTextField.CLASSNAME + "-" + VTextField.CLASSNAME_FOCUS); @@ -66,6 +67,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, } }); text.addBlurHandler(new BlurHandler() { + @Override public void onBlur(BlurEvent event) { text.removeStyleName(VTextField.CLASSNAME + "-" + VTextField.CLASSNAME_FOCUS); @@ -168,6 +170,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, } } + @Override @SuppressWarnings("deprecation") public void onChange(ChangeEvent event) { if (!text.getText().equals("")) { @@ -291,6 +294,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, return format.trim(); } + @Override public void focus() { text.setFocus(true); } @@ -315,6 +319,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, private final String TEXTFIELD_ID = "field"; + @Override public Element getSubPartElement(String subPart) { if (subPart.equals(TEXTFIELD_ID)) { return text.getElement(); @@ -323,6 +328,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, return null; } + @Override public String getSubPartName(Element subElement) { if (text.getElement().isOrHasChild(subElement)) { return TEXTFIELD_ID; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java index ce47c7d13a..ce0533ac1f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java @@ -47,6 +47,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { /** * Default implementation does nothing. */ + @Override public void dragOver(VDragEvent drag) { } @@ -55,6 +56,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { * Default implementation does nothing. Implementors should clean possible * emphasis or drag icons here. */ + @Override public void dragLeave(VDragEvent drag) { } @@ -73,8 +75,10 @@ public abstract class VAbstractDropHandler implements VDropHandler { * implementation. * */ + @Override public void dragEnter(final VDragEvent drag) { validate(new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { dragAccepted(drag); } @@ -94,6 +98,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { protected void validate(final VAcceptCallback cb, final VDragEvent event) { Command checkCriteria = new Command() { + @Override public void execute() { acceptCriteria.accept(event, criterioUIDL, cb); } @@ -109,12 +114,14 @@ public abstract class VAbstractDropHandler implements VDropHandler { * can't be verified on client or if {@link AcceptCriterion} are met on * client. */ + @Override public boolean drop(VDragEvent drag) { if (acceptCriteria.needsServerSideCheck(drag, criterioUIDL)) { return true; } else { validated = false; acceptCriteria.accept(drag, criterioUIDL, new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { validated = true; } @@ -129,6 +136,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { * side counterpart of the Paintable is expected to implement * {@link DropTarget} interface. */ + @Override public abstract ComponentConnector getConnector(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java index 0d71e23903..b1a88166ec 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java @@ -19,6 +19,7 @@ public abstract class VAcceptCriterion { final VAcceptCallback callback) { if (needsServerSideCheck(drag, configuration)) { VDragEventServerCallback acceptCallback = new VDragEventServerCallback() { + @Override public void handleResponse(boolean accepted, UIDL response) { if (accepted) { callback.accepted(drag); diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java index 19399d7d4a..9d11ccc500 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java @@ -33,6 +33,7 @@ final public class VAnd extends VAcceptCriterion implements VAcceptCallback { return true; } + @Override public void accepted(VDragEvent event) { b1 = true; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java index 2f404a3028..45b3cdaf4b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java @@ -48,6 +48,7 @@ public class VDragAndDropManager { private final class DefaultDragAndDropEventHandler implements NativePreviewHandler { + @Override public void onPreviewNativeEvent(NativePreviewEvent event) { NativeEvent nativeEvent = event.getNativeEvent(); @@ -307,6 +308,7 @@ public class VDragAndDropManager { final Command startDrag = new Command() { + @Override public void execute() { isStarted = true; addActiveDragSourceStyleName(); @@ -352,6 +354,7 @@ public class VDragAndDropManager { deferredStartRegistration = Event .addNativePreviewHandler(new NativePreviewHandler() { + @Override public void onPreviewNativeEvent( NativePreviewEvent event) { int typeInt = event.getTypeInt(); @@ -509,6 +512,7 @@ public class VDragAndDropManager { final ApplicationConnection client = currentDropHandler .getApplicationConnection(); Scheduler.get().scheduleFixedDelay(new RepeatingCommand() { + @Override public boolean execute() { if (!client.hasActiveRequest()) { removeActiveDragSourceStyleName(dragSource); diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java index e3bed02642..a1dbccdfc7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java @@ -48,6 +48,7 @@ public class VLazyInitItemIdentifiers extends VAcceptCriterion { VDragEventServerCallback acceptCallback = new VDragEventServerCallback() { + @Override public void handleResponse(boolean accepted, UIDL response) { hashSet = new HashSet<String>(); String[] stringArrayAttribute = response diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java index e4d2dff606..52b9358791 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java @@ -33,6 +33,7 @@ final public class VNot extends VAcceptCriterion { b1 = false; VAcceptCallback accept1cb = new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { b1 = true; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java index 91ba4bf0c4..c5c8dbb052 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java @@ -41,6 +41,7 @@ final public class VOr extends VAcceptCriterion implements VAcceptCallback { return false; // not used here } + @Override public void accepted(VDragEvent event) { accepted = true; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java index 64c2da5320..865df821d9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java @@ -16,6 +16,7 @@ final public class VServerAccept extends VAcceptCriterion { final VAcceptCallback callback) { VDragEventServerCallback acceptCallback = new VDragEventServerCallback() { + @Override public void handleResponse(boolean accepted, UIDL response) { if (accepted) { callback.accepted(drag); diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java index 2a78cc4433..9d99eadeba 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java @@ -17,6 +17,7 @@ import com.vaadin.ui.DragAndDropWrapper; public class DragAndDropWrapperConnector extends CustomComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; if (isRealUpdate(uidl) && !uidl.hasAttribute("hidden")) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java index b1fffc8355..145e5b0768 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java +++ b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java @@ -68,6 +68,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements setStyleName(CLASSNAME); addDomHandler(new MouseDownHandler() { + @Override public void onMouseDown(MouseDownEvent event) { if (startDrag(event.getNativeEvent())) { event.preventDefault(); // prevent text selection @@ -77,6 +78,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements addDomHandler(new TouchStartHandler() { + @Override public void onTouchStart(TouchStartEvent event) { if (startDrag(event.getNativeEvent())) { /* @@ -166,6 +168,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements private ReadyStateChangeHandler readyStateChangeHandler = new ReadyStateChangeHandler() { + @Override public void onReadyStateChange(XMLHttpRequest xhr) { if (xhr.getReadyState() == XMLHttpRequest.DONE) { // visit server for possible @@ -182,6 +185,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements void startNextUpload() { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { if (!uploading) { if (fileIds.size() > 0) { @@ -413,6 +417,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements files.add(file); } + @Override public VDropHandler getDropHandler() { return dropHandler; } @@ -451,6 +456,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements currentlyValid = false; validate(new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { dragAccepted(drag); } @@ -495,6 +501,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements VDragAndDropWrapper.this); } + @Override public ApplicationConnection getApplicationConnection() { return client; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java index fe3549e7f2..dbbf91e091 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java @@ -41,6 +41,7 @@ public class EmbeddedConnector extends AbstractComponentConnector implements rpc = RpcProxy.create(EmbeddedServerRpc.class, this); } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java index 981c753dd1..54f82eb9b9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java @@ -25,6 +25,7 @@ public class FormConnector extends AbstractComponentContainerConnector implements Paintable, MayScrollChildren { private final ElementResizeListener footerResizeListener = new ElementResizeListener() { + @Override public void onElementResize(ElementResizeEvent e) { VForm form = getWidget(); @@ -57,6 +58,7 @@ public class FormConnector extends AbstractComponentContainerConnector return false; } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; getWidget().id = uidl.getId(); @@ -180,6 +182,7 @@ public class FormConnector extends AbstractComponentContainerConnector } } + @Override public void updateCaption(ComponentConnector component) { // NOP form don't render caption for neither field layout nor footer // layout diff --git a/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java index 81f24a8e7e..823b0e83ae 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java +++ b/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java @@ -62,6 +62,7 @@ public class VForm extends ComplexPanel implements KeyDownHandler { fieldSet.appendChild(footerContainer); } + @Override public void onKeyDown(KeyDownEvent event) { shortcutHandler.handleKeyboardEvent(Event.as(event.getNativeEvent())); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java index c08651ded1..ebe83654fe 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java @@ -79,6 +79,7 @@ public class FormLayoutConnector extends AbstractLayoutConnector { } + @Override public void updateCaption(ComponentConnector component) { getWidget().table.updateCaption(component.getWidget(), component.getState(), component.isEnabled()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java index 1a161c529d..757315f72e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java @@ -87,6 +87,7 @@ public class VFormLayout extends SimplePanel { * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt * .event.dom.client.ClickEvent) */ + @Override public void onClick(ClickEvent event) { Caption caption = (Caption) event.getSource(); if (caption.getOwner() != null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java index f28b0237f7..5d53c688b1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java @@ -83,6 +83,7 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { VGridLayout layout = getWidget(); layout.client = client; @@ -186,6 +187,7 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector } + @Override public void updateCaption(ComponentConnector childConnector) { if (!childConnector.delegateCaptionHandling()) { // Check not required by interface but by workarounds in this class @@ -224,10 +226,12 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector return (VGridLayout) super.getWidget(); } + @Override public void layoutVertically() { getWidget().updateHeight(); } + @Override public void layoutHorizontally() { getWidget().updateWidth(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java b/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java index c002d2dd50..070e74d6bf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java @@ -22,6 +22,7 @@ public class LinkConnector extends AbstractComponentConnector implements return false; } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java b/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java index bef7943e3f..4df3220ef1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java +++ b/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java @@ -53,6 +53,7 @@ public class VLink extends HTML implements ClickHandler { setStyleName(CLASSNAME); } + @Override public void onClick(ClickEvent event) { if (enabled) { if (target == null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java index 1b1c2c44e3..6f3f876fb7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java @@ -105,6 +105,7 @@ public class VListSelect extends VOptionGroupBase { getOptionsContainer().setTabIndex(tabIndex); } + @Override public void focus() { select.setFocus(true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java index 7bee870387..5cb3fb83b4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java @@ -246,6 +246,7 @@ public class MenuBar extends Widget implements PopupListener { } } + @Override public void onPopupClosed(PopupPanel sender, boolean autoClosed) { // If the menu popup was auto-closed, close all of its parents as well. if (autoClosed) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java index a18e4d734a..7966185c00 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java @@ -31,6 +31,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements * This method is called when the page is loaded for the first time, and * every time UI changes in the component are received from the server. */ + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; @@ -107,6 +108,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements // Construct a command that fires onMenuClick(int) with the // item's id-number cmd = new Command() { + @Override public void execute() { getWidget().hostReference.onMenuClick(itemId); } @@ -160,6 +162,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements return (VMenuBar) super.getWidget(); } + @Override public void layout() { getWidget().iLayout(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java index af79ba7c5e..7f150d9a5f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java +++ b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java @@ -121,6 +121,7 @@ public class MenuItem extends UIObject implements HasHTML { return command; } + @Override public String getHTML() { return DOM.getInnerHTML(getElement()); } @@ -143,6 +144,7 @@ public class MenuItem extends UIObject implements HasHTML { return subMenu; } + @Override public String getText() { return DOM.getInnerText(getElement()); } @@ -157,6 +159,7 @@ public class MenuItem extends UIObject implements HasHTML { command = cmd; } + @Override public void setHTML(String html) { DOM.setInnerHTML(getElement(), html); } @@ -171,6 +174,7 @@ public class MenuItem extends UIObject implements HasHTML { this.subMenu = subMenu; } + @Override public void setText(String text) { DOM.setInnerText(getElement(), text); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java index 6133b7d80c..a96be0bc2f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java @@ -91,6 +91,7 @@ public class VMenuBar extends SimpleFocusablePanel implements private VLazyExecutor iconLoadedExecutioner = new VLazyExecutor(100, new ScheduledCommand() { + @Override public void execute() { iLayout(true); } @@ -635,6 +636,7 @@ public class VMenuBar extends SimpleFocusablePanel implements /** * Listener method, fired when this menu is closed */ + @Override public void onClose(CloseEvent<PopupPanel> event) { hideChildren(); if (event.isAutoClosed()) { @@ -849,10 +851,12 @@ public class VMenuBar extends SimpleFocusablePanel implements return command; } + @Override public String getHTML() { return html; } + @Override public void setHTML(String html) { this.html = html; DOM.setInnerHTML(getElement(), html); @@ -862,10 +866,12 @@ public class VMenuBar extends SimpleFocusablePanel implements Util.sinkOnloadForImages(getElement()); } + @Override public String getText() { return html; } + @Override public void setText(String text) { setHTML(Util.escapeHTML(text)); } @@ -1048,6 +1054,7 @@ public class VMenuBar extends SimpleFocusablePanel implements * com.google.gwt.event.dom.client.KeyPressHandler#onKeyPress(com.google * .gwt.event.dom.client.KeyPressEvent) */ + @Override public void onKeyPress(KeyPressEvent event) { if (handleNavigation(event.getNativeEvent().getKeyCode(), event.isControlKeyDown() || event.isMetaKeyDown(), @@ -1063,6 +1070,7 @@ public class VMenuBar extends SimpleFocusablePanel implements * com.google.gwt.event.dom.client.KeyDownHandler#onKeyDown(com.google.gwt * .event.dom.client.KeyDownEvent) */ + @Override public void onKeyDown(KeyDownEvent event) { if (handleNavigation(event.getNativeEvent().getKeyCode(), event.isControlKeyDown() || event.isMetaKeyDown(), @@ -1383,12 +1391,14 @@ public class VMenuBar extends SimpleFocusablePanel implements * com.google.gwt.event.dom.client.FocusHandler#onFocus(com.google.gwt.event * .dom.client.FocusEvent) */ + @Override public void onFocus(FocusEvent event) { } private final String SUBPART_PREFIX = "item"; + @Override public Element getSubPartElement(String subPart) { int index = Integer .parseInt(subPart.substring(SUBPART_PREFIX.length())); @@ -1397,6 +1407,7 @@ public class VMenuBar extends SimpleFocusablePanel implements return item.getElement(); } + @Override public String getSubPartName(Element subElement) { if (!getElement().isOrHasChild(subElement)) { return null; diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java index c010fba711..1f2b188b3d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java @@ -107,12 +107,14 @@ public class NativeButtonConnector extends AbstractComponentConnector implements return (ButtonState) super.getState(); } + @Override public void onFocus(FocusEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side focusBlurRpc.focus(); } + @Override public void onBlur(BlurEvent event) { // EventHelper.updateFocusHandler ensures that this is called only when // there is a listener on server side diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java index e5a2e1253c..d0ddae30a4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java @@ -100,6 +100,7 @@ public class VNativeButton extends Button implements ClickHandler { * com.google.gwt.event.dom.client.ClickHandler#onClick(com.google.gwt.event * .dom.client.ClickEvent) */ + @Override public void onClick(ClickEvent event) { if (paintableId == null || client == null) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java index cab23b1bc2..ea5292724d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java @@ -108,6 +108,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field { getOptionsContainer().setTabIndex(tabIndex); } + @Override public void focus() { select.setFocus(true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java index 3658126a97..a4dd72906d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -14,6 +14,7 @@ import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; public abstract class OptionGroupBaseConnector extends AbstractFieldConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { // Save details diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java index d6e6949242..49e75afe92 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java +++ b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java @@ -51,6 +51,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, protected List<HandlerRegistration> blurHandlers = null; private final LoadHandler iconLoadHandler = new LoadHandler() { + @Override public void onLoad(LoadEvent event) { Util.notifyParentOfSizeChange(VOptionGroup.this, true); } @@ -154,6 +155,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, } } + @Override public void focus() { Iterator<Widget> iterator = panel.iterator(); if (iterator.hasNext()) { @@ -161,6 +163,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, } } + @Override public void onFocus(FocusEvent arg0) { if (!blurOccured) { // no blur occured before this focus event @@ -178,10 +181,12 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, } } + @Override public void onBlur(BlurEvent arg0) { blurOccured = true; if (sendBlurEvents) { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { // check whether blurOccured still is true and then send the // event out to the server diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java index a512f024b8..d128d7deb1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java +++ b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java @@ -126,6 +126,7 @@ public abstract class VOptionGroupBase extends Composite implements Field, abstract protected void setTabIndex(int tabIndex); + @Override public void onClick(ClickEvent event) { if (event.getSource() == newItemButton && !newItemField.getText().equals("")) { @@ -135,6 +136,7 @@ public abstract class VOptionGroupBase extends Composite implements Field, } } + @Override public void onChange(ChangeEvent event) { if (multiselect) { client.updateVariable(paintableId, "selected", getSelectedItems(), @@ -145,6 +147,7 @@ public abstract class VOptionGroupBase extends Composite implements Field, } } + @Override public void onKeyPress(KeyPressEvent event) { if (event.getSource() == newItemField && event.getCharCode() == KeyCodes.KEY_ENTER) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java index 7c748df29d..b7d243c241 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java @@ -73,6 +73,7 @@ public abstract class AbstractOrderedLayoutConnector extends return (AbstractOrderedLayoutState) super.getState(); } + @Override public void updateCaption(ComponentConnector component) { VMeasuringOrderedLayout layout = getWidget(); if (VCaption.isNeeded(component.getState())) { @@ -263,6 +264,7 @@ public abstract class AbstractOrderedLayoutConnector extends } } + @Override public void layoutHorizontally() { if (getWidget().isVertical) { layoutSecondaryDirection(); @@ -271,6 +273,7 @@ public abstract class AbstractOrderedLayoutConnector extends } } + @Override public void layoutVertically() { if (getWidget().isVertical) { layoutPrimaryDirection(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java index ea7ffda9db..c28432e917 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java @@ -71,6 +71,7 @@ public class PanelConnector extends AbstractComponentContainerConnector return false; } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (isRealUpdate(uidl)) { @@ -165,6 +166,7 @@ public class PanelConnector extends AbstractComponentContainerConnector getWidget().contentNode.setTabIndex(getState().getTabIndex()); } + @Override public void updateCaption(ComponentConnector component) { // NOP: layouts caption, errors etc not rendered in Panel } @@ -174,6 +176,7 @@ public class PanelConnector extends AbstractComponentContainerConnector return (VPanel) super.getWidget(); } + @Override public void layout() { updateSizes(); } @@ -200,6 +203,7 @@ public class PanelConnector extends AbstractComponentContainerConnector panel.scrollLeft = panel.contentNode.getScrollLeft(); } + @Override public void postLayout() { VPanel panel = getWidget(); if (uidlScrollTop != null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java index d56a82c46b..8764d61c3a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java @@ -100,6 +100,7 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, * @see com.vaadin.terminal.gwt.client.Focusable#focus() */ + @Override public void focus() { setFocus(true); @@ -170,6 +171,7 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, } } + @Override public ShortcutActionHandler getShortcutActionHandler() { return shortcutHandler; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java b/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java index c5117fdddb..96ffd04391 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java @@ -31,6 +31,7 @@ public class PopupViewConnector extends AbstractComponentContainerConnector * @see com.vaadin.terminal.gwt.client.ComponentConnector#updateFromUIDL(com.vaadin.terminal.gwt.client.UIDL, * com.vaadin.terminal.gwt.client.ApplicationConnection) */ + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; @@ -81,6 +82,7 @@ public class PopupViewConnector extends AbstractComponentContainerConnector } }// updateFromUIDL + @Override public void updateCaption(ComponentConnector component) { if (VCaption.isNeeded(component.getState())) { if (getWidget().popup.captionWrapper != null) { @@ -104,6 +106,7 @@ public class PopupViewConnector extends AbstractComponentContainerConnector return (VPopupView) super.getWidget(); } + @Override public void postLayout() { if (centerAfterLayout) { centerAfterLayout = false; diff --git a/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java index c8a0222ee2..c923c5d0ab 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java @@ -59,6 +59,7 @@ public class VPopupView extends HTML { // When we click to open the popup... addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { updateState(true); } @@ -66,6 +67,7 @@ public class VPopupView extends HTML { // ..and when we close it popup.addCloseHandler(new CloseHandler<PopupPanel>() { + @Override public void onClose(CloseEvent<PopupPanel> event) { updateState(false); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java b/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java index 9d0532fae3..c37e9beee3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java @@ -16,6 +16,7 @@ import com.vaadin.ui.ProgressIndicator; public class ProgressIndicatorConnector extends AbstractFieldConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java index db52640088..7647221656 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java @@ -17,6 +17,7 @@ import com.vaadin.ui.RichTextArea; public class RichTextAreaConnector extends AbstractFieldConnector implements Paintable, BeforeShortcutActionListener { + @Override public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) { getWidget().client = client; getWidget().id = uidl.getId(); @@ -59,6 +60,7 @@ public class RichTextAreaConnector extends AbstractFieldConnector implements } + @Override public void onBeforeShortcutAction(Event e) { getWidget().synchronizeContentToServer(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java index eb062a3799..5d5f7d7b8c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java @@ -160,6 +160,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, } // TODO is this really used, or does everything go via onBlur() only? + @Override public void onChange(ChangeEvent event) { synchronizeContentToServer(); } @@ -177,6 +178,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, } } + @Override public void onBlur(BlurEvent event) { synchronizeContentToServer(); // TODO notify possible server side blur/focus listeners @@ -242,6 +244,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, * delay the height setting so the DOM has had time to stabilize. */ Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { int editorHeight = getOffsetHeight() - getExtraVerticalPixels() @@ -281,9 +284,11 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, } } + @Override public void onKeyPress(KeyPressEvent event) { if (maxLength >= 0) { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { if (rta.getHTML().length() > maxLength) { rta.setHTML(rta.getHTML().substring(0, maxLength)); @@ -293,6 +298,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, } } + @Override public void onKeyDown(KeyDownEvent event) { // delegate to closest shortcut action handler // throw event from the iframe forward to the shortcuthandler @@ -320,14 +326,17 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, return hasShortcutActionHandler; } + @Override public int getTabIndex() { return rta.getTabIndex(); } + @Override public void setAccessKey(char key) { rta.setAccessKey(key); } + @Override public void setFocus(boolean focused) { /* * Similar issue as with selectAll. Focusing must happen before possible @@ -342,6 +351,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, }.schedule(300); } + @Override public void setTabIndex(int index) { rta.setTabIndex(index); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java index 1e1805efdf..d86c7a4bf5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java @@ -172,6 +172,7 @@ public class VRichTextToolbar extends Composite { private class EventHandler implements ClickHandler, ChangeHandler, KeyUpHandler { + @Override @SuppressWarnings("deprecation") public void onChange(ChangeEvent event) { Object sender = event.getSource(); @@ -193,6 +194,7 @@ public class VRichTextToolbar extends Composite { } } + @Override @SuppressWarnings("deprecation") public void onClick(ClickEvent event) { Object sender = event.getSource(); @@ -249,6 +251,7 @@ public class VRichTextToolbar extends Composite { } } + @Override public void onKeyUp(KeyUpEvent event) { if (event.getSource() == richText) { // We use the RichTextArea's onKeyUp event to update the toolbar diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java b/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java index 142a0fd89c..fddb76e755 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java @@ -123,6 +123,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, */ private final ValueChangeHandler<String> historyChangeHandler = new ValueChangeHandler<String>() { + @Override public void onValueChange(ValueChangeEvent<String> event) { String newFragment = event.getValue(); @@ -138,6 +139,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, private VLazyExecutor delayedResizeExecutor = new VLazyExecutor(200, new ScheduledCommand() { + @Override public void execute() { performSizeCheck(); } @@ -361,6 +363,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, * .gwt.event.logical.shared.ResizeEvent) */ + @Override public void onResize(ResizeEvent event) { triggerSizeChangeCheck(); } @@ -416,6 +419,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, $wnd.location = url; }-*/; + @Override public void onWindowClosing(Window.ClosingEvent event) { // Change focus on this window in order to ensure that all state is // collected from textfields @@ -435,10 +439,12 @@ public class VRoot extends SimplePanel implements ResizeHandler, } }-*/; + @Override public ShortcutActionHandler getShortcutActionHandler() { return actionHandler; } + @Override public void focus() { getElement().focus(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java b/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java index 6fd7f8b6aa..978ea162ab 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java @@ -16,6 +16,7 @@ import com.vaadin.ui.Slider; public class SliderConnector extends AbstractFieldConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; @@ -51,6 +52,7 @@ public class SliderConnector extends AbstractFieldConnector implements if (!getWidget().vertical) { // Draw handle with a delay to allow base to gain maximum width Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { getWidget().buildHandle(); getWidget().setValue(getWidget().value, false); diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java index e5282dc45e..06608c95fe 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java +++ b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java @@ -78,6 +78,7 @@ public class VSlider extends SimpleFocusablePanel implements Field, private VLazyExecutor delayedValueUpdater = new VLazyExecutor(100, new ScheduledCommand() { + @Override public void execute() { updateValueToServer(); acceleration = 1; @@ -159,6 +160,7 @@ public class VSlider extends SimpleFocusablePanel implements Field, DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px"); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { final Element p = DOM.getParent(getElement()); if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) { @@ -416,6 +418,7 @@ public class VSlider extends SimpleFocusablePanel implements Field, } } + @Override public void iLayout() { if (vertical) { setHeight(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java index e33755bc9b..8a210ecced 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java @@ -41,6 +41,7 @@ public abstract class AbstractSplitPanelConnector extends getWidget().addHandler(new SplitterMoveHandler() { + @Override public void splitterMoved(SplitterMoveEvent event) { String position = getWidget().getSplitterPosition(); float pos = 0; @@ -61,6 +62,7 @@ public abstract class AbstractSplitPanelConnector extends }, SplitterMoveEvent.TYPE); } + @Override public void updateCaption(ComponentConnector component) { // TODO Implement caption handling } @@ -145,6 +147,7 @@ public abstract class AbstractSplitPanelConnector extends getWidget().makeScrollable(); } + @Override public void layout() { VAbstractSplitPanel splitPanel = getWidget(); splitPanel.setSplitPosition(splitPanel.position); diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java index e2f30c6676..1c14ce2a73 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java @@ -125,12 +125,14 @@ public class VAbstractSplitPanel extends ComplexPanel { makeScrollable(); addDomHandler(new TouchCancelHandler() { + @Override public void onTouchCancel(TouchCancelEvent event) { // TODO When does this actually happen?? VConsole.log("TOUCH CANCEL"); } }, TouchCancelEvent.getType()); addDomHandler(new TouchStartHandler() { + @Override public void onTouchStart(TouchStartEvent event) { Node target = event.getTouches().get(0).getTarget().cast(); if (splitter.isOrHasChild(target)) { @@ -139,6 +141,7 @@ public class VAbstractSplitPanel extends ComplexPanel { } }, TouchStartEvent.getType()); addDomHandler(new TouchMoveHandler() { + @Override public void onTouchMove(TouchMoveEvent event) { if (resizing) { onMouseMove(Event.as(event.getNativeEvent())); @@ -146,6 +149,7 @@ public class VAbstractSplitPanel extends ComplexPanel { } }, TouchMoveEvent.getType()); addDomHandler(new TouchEndHandler() { + @Override public void onTouchEnd(TouchEndEvent event) { if (resizing) { onMouseUp(Event.as(event.getNativeEvent())); diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java index ab867ea045..7ca449c0b7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java @@ -44,6 +44,7 @@ public class TableConnector extends AbstractComponentContainerConnector * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection) */ + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().rendering = true; @@ -180,6 +181,7 @@ public class TableConnector extends AbstractComponentContainerConnector // *shouldn't* have changed (unless the number of rows // or the height of the widget has also changed) Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { Util.runWebkitOverflowAutoFix(getWidget().scrollBodyPanel .getElement()); @@ -267,23 +269,28 @@ public class TableConnector extends AbstractComponentContainerConnector return (VScrollTable) super.getWidget(); } + @Override public void updateCaption(ComponentConnector component) { // NOP, not rendered } + @Override public void layoutVertically() { getWidget().updateHeight(); } + @Override public void layoutHorizontally() { getWidget().updateWidth(); } + @Override public void postLayout() { VScrollTable table = getWidget(); if (table.sizeNeedsInit) { table.sizeInit(); Scheduler.get().scheduleFinally(new ScheduledCommand() { + @Override public void execute() { getLayoutManager().setNeedsMeasure(TableConnector.this); ServerConnector parent = getParent(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java index e2aedd123f..4574a9ea44 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java @@ -328,6 +328,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private KeyPressHandler navKeyPressHandler = new KeyPressHandler() { + @Override public void onKeyPress(KeyPressEvent keyPressEvent) { // This is used for Firefox only, since Firefox auto-repeat // works correctly only if we use a key press handler, other @@ -365,6 +366,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private KeyUpHandler navKeyUpHandler = new KeyUpHandler() { + @Override public void onKeyUp(KeyUpEvent keyUpEvent) { NativeEvent event = keyUpEvent.getNativeEvent(); int keyCode = event.getKeyCode(); @@ -392,6 +394,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private KeyDownHandler navKeyDownHandler = new KeyDownHandler() { + @Override public void onKeyDown(KeyDownEvent keyDownEvent) { NativeEvent event = keyDownEvent.getNativeEvent(); // This is not used for Firefox @@ -520,6 +523,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBodyPanel.sinkEvents(Event.ONCONTEXTMENU); scrollBodyPanel.addDomHandler(new ContextMenuHandler() { + @Override public void onContextMenu(ContextMenuEvent event) { handleBodyContextMenu(event); } @@ -540,6 +544,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // closes. See #8526. client.getContextMenu().addCloseHandler(new CloseHandler<PopupPanel>() { + @Override public void onClose(CloseEvent<PopupPanel> event) { contextMenu = null; } @@ -1849,6 +1854,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Deferred due to some Firefox oddities Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { scrollBodyPanel .setScrollPosition(measureRowHeightOffset(firstvisible)); @@ -1884,6 +1890,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBody.reLayoutComponents(); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { Util.runWebkitOverflowAutoFix(scrollBodyPanel.getElement()); } @@ -2215,6 +2222,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } else { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { int tdWidth = width + scrollBody.getCellExtraWidth(); @@ -2813,6 +2821,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, Scheduler.get().scheduleDeferred( new ScheduledCommand() { + @Override public void execute() { setColWidth(colIx, newWidth, true); } @@ -2841,6 +2850,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // Recalculate the column sizings if any column has changed Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { triggerLazyColumnAdjustment(true); } @@ -2952,6 +2962,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, visibleCells.add(newIndex, hCell); } + @Override public Iterator<Widget> iterator() { return visibleCells.iterator(); } @@ -3101,6 +3112,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * Returns columns as Action array for column select popup */ + @Override public Action[] getActions() { Object[] cols; if (columnReordering && columnOrder != null) { @@ -3139,10 +3151,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return actions; } + @Override public ApplicationConnection getClient() { return client; } + @Override public String getPaintableId() { return paintableId; } @@ -3310,6 +3324,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } else { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { int tdWidth = width + scrollBody.getCellExtraWidth() @@ -3573,6 +3588,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @see com.google.gwt.user.client.ui.HasWidgets#iterator() */ + @Override public Iterator<Widget> iterator() { return visibleCells.iterator(); } @@ -4111,6 +4127,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, renderedRows.add(actualIx, row); } + @Override public Iterator<Widget> iterator() { return renderedRows.iterator(); } @@ -4704,6 +4721,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, childWidgets.add(w); } + @Override public Iterator<Widget> iterator() { return childWidgets.iterator(); } @@ -5396,6 +5414,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @see com.vaadin.terminal.gwt.client.ui.IActionOwner#getActions () */ + @Override public Action[] getActions() { if (actionKeys == null) { return new Action[] {}; @@ -5419,10 +5438,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return actions; } + @Override public ApplicationConnection getClient() { return client; } + @Override public String getPaintableId() { return paintableId; } @@ -5473,6 +5494,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // widths. Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { if (showRowHeaders) { setCellWidth(0, tHead.getHeaderCell(0).getWidth()); @@ -5804,6 +5826,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBody.reLayoutComponents(); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { Util.runWebkitOverflowAutoFix(scrollBodyPanel.getElement()); } @@ -5925,6 +5948,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // #7607. Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { Util.runWebkitOverflowAutoFix(scrollBodyPanel.getElement()); } @@ -5955,6 +5979,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, if (visible) { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { scrollBodyPanel .setScrollPosition(measureRowHeightOffset(firstRowInViewPort)); @@ -5989,6 +6014,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * user scrolls */ + @Override public void onScroll(ScrollEvent event) { scrollLeft = scrollBodyPanel.getElement().getScrollLeft(); scrollTop = scrollBodyPanel.getScrollPosition(); @@ -6018,6 +6044,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, // value available soon. Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { onScroll(null); } @@ -6098,6 +6125,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return (int) Math.ceil(scrollTop / scrollBody.getRowHeight()); } + @Override public VScrollTableDropHandler getDropHandler() { return dropHandler; } @@ -6178,6 +6206,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, final TableDDDetails newDetails = dropDetails; VAcceptCallback cb = new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { if (newDetails.equals(dropDetails)) { dragAccepted(event); @@ -6254,6 +6283,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return ConnectorMap.get(client).getConnector(VScrollTable.this); } + @Override public ApplicationConnection getApplicationConnection() { return client; } @@ -6585,6 +6615,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * .dom.client.FocusEvent) */ + @Override public void onFocus(FocusEvent event) { if (isFocusable()) { hasFocus = true; @@ -6606,6 +6637,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * .dom.client.BlurEvent) */ + @Override public void onBlur(BlurEvent event) { hasFocus = false; navKeyDown = false; @@ -6679,6 +6711,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @see com.vaadin.terminal.gwt.client.Focusable#focus() */ + @Override public void focus() { if (isFocusable()) { scrollBodyPanel.focus(); @@ -6760,6 +6793,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, public void lazyRevertFocusToRow(final VScrollTableRow currentlyFocusedRow) { Scheduler.get().scheduleFinally(new ScheduledCommand() { + @Override public void execute() { if (currentlyFocusedRow != null) { setRowFocus(currentlyFocusedRow); @@ -6772,6 +6806,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, }); } + @Override public Action[] getActions() { if (bodyActionKeys == null) { return new Action[] {}; @@ -6787,10 +6822,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return actions; } + @Override public ApplicationConnection getClient() { return client; } + @Override public String getPaintableId() { return paintableId; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java index e16e84d112..ea0bea6b04 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java @@ -22,6 +22,7 @@ public abstract class TabsheetBaseConnector extends public static final String ATTRIBUTE_TAB_CAPTION = "caption"; public static final String ATTRIBUTE_TAB_ICON = "icon"; + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java index 51a7801f91..a4de77c495 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java @@ -68,10 +68,12 @@ public class TabsheetConnector extends TabsheetBaseConnector implements return (VTabsheet) super.getWidget(); } + @Override public void updateCaption(ComponentConnector component) { /* Tabsheet does not render its children's captions */ } + @Override public void layout() { VTabsheet tabsheet = getWidget(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java index 844708a892..bbbffefa40 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java +++ b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java @@ -212,14 +212,17 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tabCaption.setWidth(tabCaption.getRequiredWidth() + "px"); } + @Override public HandlerRegistration addFocusHandler(FocusHandler handler) { return addDomHandler(handler, FocusEvent.getType()); } + @Override public HandlerRegistration addBlurHandler(BlurHandler handler) { return addDomHandler(handler, BlurEvent.getType()); } + @Override public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) { return addDomHandler(handler, KeyDownEvent.getType()); } @@ -356,6 +359,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, setElement(el); } + @Override public void onClose(VCloseEvent event) { Tab tab = event.getTab(); if (!tab.isEnabledOnServer()) { @@ -391,6 +395,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, return t; } + @Override public void onClick(ClickEvent event) { TabCaption caption = (TabCaption) event.getSource(); Element targetElement = event.getNativeEvent().getEventTarget() @@ -1031,6 +1036,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, style.setProperty("whiteSpace", "normal"); Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { style.setProperty("whiteSpace", ""); } @@ -1115,6 +1121,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } } + @Override public void onBlur(BlurEvent event) { if (focusedTab != null && event.getSource() instanceof Tab) { focusedTab = null; @@ -1124,6 +1131,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } } + @Override public void onFocus(FocusEvent event) { if (focusedTab == null && event.getSource() instanceof Tab) { focusedTab = (Tab) event.getSource(); @@ -1133,6 +1141,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } } + @Override public void focus() { tb.getTab(activeTabIndex).focus(); } @@ -1141,6 +1150,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tb.getTab(activeTabIndex).blur(); } + @Override public void onKeyDown(KeyDownEvent event) { if (event.getSource() instanceof Tab) { int keycode = event.getNativeEvent().getKeyCode(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java index aede1ef002..c0f6deab53 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java +++ b/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java @@ -57,6 +57,7 @@ public class VTextArea extends VTextField { public void onBrowserEvent(Event event) { if (getMaxLength() >= 0 && event.getTypeInt() == Event.ONKEYUP) { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { if (getText().length() > getMaxLength()) { setText(getText().substring(0, getMaxLength())); diff --git a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java index 04bf029b05..bf4c921109 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java @@ -25,6 +25,7 @@ public class TextFieldConnector extends AbstractFieldConnector implements return (AbstractTextFieldState) super.getState(); } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { // Save details getWidget().client = client; @@ -83,6 +84,7 @@ public class TextFieldConnector extends AbstractFieldConnector implements * Gecko defers setting the text so we need to defer the selection. */ Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { getWidget().setSelectionRange(pos, length); } @@ -95,6 +97,7 @@ public class TextFieldConnector extends AbstractFieldConnector implements return (VTextField) super.getWidget(); } + @Override public void onBeforeShortcutAction(Event e) { getWidget().valueChange(false); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java index bd55c26a24..4050f1bafc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java @@ -274,6 +274,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, return maxLength; } + @Override public void onChange(ChangeEvent event) { valueChange(false); } @@ -349,6 +350,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, } } + @Override public void onFocus(FocusEvent event) { addStyleDependentName(CLASSNAME_FOCUS); if (prompting) { @@ -362,6 +364,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, } } + @Override public void onBlur(BlurEvent event) { removeStyleDependentName(CLASSNAME_FOCUS); focusedTextField = null; @@ -387,6 +390,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, setWidth(columns + "em"); } + @Override public void onKeyDown(KeyDownEvent event) { if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { valueChange(false); diff --git a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java b/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java index 3f96a61bf3..2543838f89 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java @@ -33,6 +33,7 @@ public class TreeConnector extends AbstractComponentConnector implements protected final Map<TreeNode, TooltipInfo> tooltipMap = new HashMap<TreeNode, TooltipInfo>(); + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java index 7462160bad..2c3b105cc0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java +++ b/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java @@ -126,6 +126,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public VLazyExecutor iconLoaded = new VLazyExecutor(50, new ScheduledCommand() { + @Override public void execute() { Util.notifyParentOfSizeChange(VTree.this, true); } @@ -145,6 +146,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, */ sinkEvents(Event.ONCONTEXTMENU); addDomHandler(new ContextMenuHandler() { + @Override public void onContextMenu(ContextMenuEvent event) { handleBodyContextMenu(event); } @@ -333,6 +335,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } if (newKey != null) { validate(new VAcceptCallback() { + @Override public void accepted(VDragEvent event) { VerticalDropLocation curDetail = (VerticalDropLocation) event .getDropDetails().get("detail"); @@ -376,6 +379,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return ConnectorMap.get(client).getConnector(VTree.this); } + @Override public ApplicationConnection getApplicationConnection() { return client; } @@ -419,6 +423,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, */ private void sendSelectionToServer() { Command command = new Command() { + @Override public void execute() { client.updateVariable(paintableId, "selected", selectedIds.toArray(new String[selectedIds.size()]), @@ -586,6 +591,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } ScheduledCommand command = new ScheduledCommand() { + @Override public void execute() { if (multiSelectMode == MULTISELECT_MODE_SIMPLE @@ -776,6 +782,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final MouseEventDetails details = MouseEventDetailsBuilder .buildMouseEventDetails(evt); ScheduledCommand command = new ScheduledCommand() { + @Override public void execute() { // Determine if we should send the event immediately to the // server. We do not want to send the event if there is a @@ -919,6 +926,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return nodes; } + @Override public Action[] getActions() { if (actionKeys == null) { return new Action[] {}; @@ -935,10 +943,12 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return actions; } + @Override public ApplicationConnection getClient() { return client; } + @Override public String getPaintableId() { return paintableId; } @@ -1076,6 +1086,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } + @Override public VDropHandler getDropHandler() { return dropHandler; } @@ -1485,6 +1496,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, node.scrollIntoView(); } else { Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { focusedNode.scrollIntoView(); } @@ -1510,6 +1522,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.google.gwt.event.dom.client.FocusHandler#onFocus(com.google.gwt.event * .dom.client.FocusEvent) */ + @Override public void onFocus(FocusEvent event) { treeHasFocus = true; // If no node has focus, focus the first item in the tree @@ -1529,6 +1542,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.google.gwt.event.dom.client.BlurHandler#onBlur(com.google.gwt.event * .dom.client.BlurEvent) */ + @Override public void onBlur(BlurEvent event) { treeHasFocus = false; if (focusedNode != null) { @@ -1543,6 +1557,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.google.gwt.event.dom.client.KeyPressHandler#onKeyPress(com.google * .gwt.event.dom.client.KeyPressEvent) */ + @Override public void onKeyPress(KeyPressEvent event) { NativeEvent nativeEvent = event.getNativeEvent(); int keyCode = nativeEvent.getKeyCode(); @@ -1566,6 +1581,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.google.gwt.event.dom.client.KeyDownHandler#onKeyDown(com.google.gwt * .event.dom.client.KeyDownEvent) */ + @Override public void onKeyDown(KeyDownEvent event) { if (handleKeyNavigation(event.getNativeEvent().getKeyCode(), event.isControlKeyDown() || event.isMetaKeyDown(), @@ -1946,6 +1962,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.vaadin.terminal.gwt.client.ui.SubPartAware#getSubPartElement(java * .lang.String) */ + @Override public Element getSubPartElement(String subPart) { if ("fe".equals(subPart)) { if (BrowserInfo.get().isOpera() && focusedNode != null) { @@ -1999,6 +2016,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, * com.vaadin.terminal.gwt.client.ui.SubPartAware#getSubPartName(com.google * .gwt.user.client.Element) */ + @Override public String getSubPartName(Element subElement) { // Supported identifiers: // @@ -2049,6 +2067,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return locator; } + @Override public Action[] getActions() { if (bodyActionKeys == null) { return new Action[] {}; @@ -2064,10 +2083,12 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return actions; } + @Override public ApplicationConnection getClient() { return client; } + @Override public String getPaintableId() { return paintableId; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java index 9a8e0e9ce1..91e1fe2a3d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java @@ -257,6 +257,7 @@ public class VTreeTable extends VScrollTable { // widths. Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { if (showRowHeaders) { setCellWidth(0, tHead.getHeaderCell(0).getWidth()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java index 6d5cd3320e..55234f5425 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java @@ -45,6 +45,7 @@ public class TwinColSelectConnector extends OptionGroupBaseConnector implements return (VTwinColSelect) super.getWidget(); } + @Override public void layoutVertically() { if (isUndefinedHeight()) { getWidget().clearInternalHeights(); @@ -53,6 +54,7 @@ public class TwinColSelectConnector extends OptionGroupBaseConnector implements } } + @Override public void layoutHorizontally() { if (isUndefinedWidth()) { getWidget().clearInternalWidths(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java index 8f1ea09b8f..1a2deae3b4 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java @@ -409,6 +409,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, remove.setTabIndex(tabIndex); } + @Override public void focus() { options.setFocus(true); } @@ -430,6 +431,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, * com.google.gwt.event.dom.client.KeyDownHandler#onKeyDown(com.google.gwt * .event.dom.client.KeyDownEvent) */ + @Override public void onKeyDown(KeyDownEvent event) { int keycode = event.getNativeKeyCode(); @@ -493,6 +495,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, * com.google.gwt.event.dom.client.MouseDownHandler#onMouseDown(com.google * .gwt.event.dom.client.MouseDownEvent) */ + @Override public void onMouseDown(MouseDownEvent event) { // Ensure that items are deselected when selecting // from a different source. See #3699 for details. @@ -515,6 +518,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, * com.google.gwt.event.dom.client.DoubleClickHandler#onDoubleClick(com. * google.gwt.event.dom.client.DoubleClickEvent) */ + @Override public void onDoubleClick(DoubleClickEvent event) { if (event.getSource() == options) { addItem(); @@ -539,6 +543,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, private static final String SUBPART_ADD_BUTTON = "add"; private static final String SUBPART_REMOVE_BUTTON = "remove"; + @Override public Element getSubPartElement(String subPart) { if (SUBPART_OPTION_SELECT.equals(subPart)) { return options.getElement(); @@ -568,6 +573,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, return null; } + @Override public String getSubPartName(Element subElement) { if (optionsCaption != null && optionsCaption.getElement().isOrHasChild(subElement)) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java index 153d99229b..c17c81c2dd 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java @@ -16,6 +16,7 @@ import com.vaadin.ui.Upload; public class UploadConnector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java index ac475ce5a5..5cf2f2fe25 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java +++ b/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java @@ -115,6 +115,7 @@ public class VUpload extends SimplePanel { panel.add(fu); submitButton = new VButton(); submitButton.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { if (immediate) { // fire click on upload (eg. focused button and hit space) @@ -203,6 +204,7 @@ public class VUpload extends SimplePanel { private void onSubmitComplete() { /* Needs to be run dereferred to avoid various browser issues. */ Scheduler.get().scheduleDeferred(new Command() { + @Override public void execute() { if (submitted) { if (client != null) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java index 3946a026c6..7bdc7cc066 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java @@ -146,6 +146,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, private VLazyExecutor delayedContentsSizeUpdater = new VLazyExecutor(200, new ScheduledCommand() { + @Override public void execute() { updateContentsSize(); } @@ -266,6 +267,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, orderingDefered = true; Scheduler.get().scheduleFinally(new Command() { + @Override public void execute() { doServerSideOrdering(); VNotification.bringNotificationsToFront(); @@ -279,6 +281,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, VWindow[] array = windowOrder.toArray(new VWindow[windowOrder.size()]); Arrays.sort(array, new Comparator<VWindow>() { + @Override public int compare(VWindow o1, VWindow o2) { /* * Order by modality, then by bringtofront sequence. @@ -851,10 +854,12 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, true); } + @Override public ShortcutActionHandler getShortcutActionHandler() { return shortcutHandler; } + @Override public void onScroll(ScrollEvent event) { client.updateVariable(id, "scrollTop", contentPanel.getScrollPosition(), false); @@ -863,6 +868,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } + @Override public void onKeyDown(KeyDownEvent event) { if (shortcutHandler != null) { shortcutHandler @@ -871,18 +877,21 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } } + @Override public void onBlur(BlurEvent event) { if (client.hasEventListeners(this, EventId.BLUR)) { client.updateVariable(id, EventId.BLUR, "", true); } } + @Override public void onFocus(FocusEvent event) { if (client.hasEventListeners(this, EventId.FOCUS)) { client.updateVariable(id, EventId.FOCUS, "", true); } } + @Override public void focus() { contentPanel.focus(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java index 83de039f0b..16cdaa9cad 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java @@ -72,6 +72,7 @@ public class WindowConnector extends AbstractComponentContainerConnector lm.unregisterDependency(this, window.footer); } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().id = getConnectorId(); getWidget().client = client; @@ -180,10 +181,12 @@ public class WindowConnector extends AbstractComponentContainerConnector } } + @Override public void updateCaption(ComponentConnector component) { // NOP, window has own caption, layout caption not rendered } + @Override public void onBeforeShortcutAction(Event e) { // NOP, nothing to update just avoid workaround ( causes excess // blur/focus ) @@ -210,6 +213,7 @@ public class WindowConnector extends AbstractComponentContainerConnector getWidget().contentPanel.setWidget(newChildWidget); } + @Override public void layout() { LayoutManager lm = getLayoutManager(); VWindow window = getWidget(); @@ -274,6 +278,7 @@ public class WindowConnector extends AbstractComponentContainerConnector } } + @Override public void postLayout() { minWidthChecked = false; VWindow window = getWidget(); diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index acfc926d68..3fcd61036f 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -175,6 +175,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet this.portlet = portlet; } + @Override public void criticalNotification(WrappedRequest request, WrappedResponse response, String cap, String msg, String details, String outOfSyncURL) throws IOException { @@ -213,6 +214,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet private DeploymentConfiguration deploymentConfiguration = new DeploymentConfiguration() { + @Override public String getConfiguredWidgetset(WrappedRequest request) { String widgetset = getApplicationOrSystemProperty( @@ -233,6 +235,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet return widgetset; } + @Override public String getConfiguredTheme(WrappedRequest request) { // is the default theme defined by the portal? @@ -247,12 +250,14 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet return themeName; } + @Override public String getApplicationOrSystemProperty(String propertyName, String defaultValue) { return AbstractApplicationPortlet.this .getApplicationOrSystemProperty(propertyName, defaultValue); } + @Override public boolean isStandalone(WrappedRequest request) { return false; } @@ -272,6 +277,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet * be a VAADIN directory). Does not end with a slash (/). */ + @Override public String getStaticFileLocation(WrappedRequest request) { String staticFileLocation = WrappedPortletRequest.cast(request) .getPortalProperty( @@ -289,6 +295,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet } } + @Override public ClassLoader getClassLoader() { // Custom class loaders not currently supported in portlets (see // #8574) @@ -1067,6 +1074,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet this.throwable = throwable; } + @Override public Throwable getThrowable() { return throwable; } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index f61f40dccc..27768ed8b5 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -74,6 +74,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements this.servlet = servlet; } + @Override public void criticalNotification(WrappedRequest request, WrappedResponse response, String cap, String msg, String details, String outOfSyncURL) throws IOException { @@ -97,6 +98,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements private DeploymentConfiguration deploymentConfiguration = new DeploymentConfiguration() { + @Override public String getStaticFileLocation(WrappedRequest request) { HttpServletRequest servletRequest = WrappedHttpServletRequest .cast(request); @@ -104,27 +106,32 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements .getStaticFilesLocation(servletRequest); } + @Override public String getConfiguredWidgetset(WrappedRequest request) { return getApplicationOrSystemProperty( AbstractApplicationServlet.PARAMETER_WIDGETSET, AbstractApplicationServlet.DEFAULT_WIDGETSET); } + @Override public String getConfiguredTheme(WrappedRequest request) { // Use the default return AbstractApplicationServlet.getDefaultTheme(); } + @Override public String getApplicationOrSystemProperty(String propertyName, String defaultValue) { return AbstractApplicationServlet.this .getApplicationOrSystemProperty(propertyName, defaultValue); } + @Override public boolean isStandalone(WrappedRequest request) { return true; } + @Override public ClassLoader getClassLoader() { try { return AbstractApplicationServlet.this.getClassLoader(); @@ -1706,6 +1713,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements this.throwable = throwable; } + @Override public Throwable getThrowable() { return throwable; } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index 996ada924d..76dab13502 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1164,6 +1164,7 @@ public abstract class AbstractCommunicationManager implements Serializable { * defined by super class is already loaded. */ Collections.sort(newConnectorTypes, new Comparator<Class<?>>() { + @Override public int compare(Class<?> o1, Class<?> o2) { // TODO optimize using Class.isAssignableFrom? return hierarchyDepth(o1) - hierarchyDepth(o2); @@ -1307,6 +1308,7 @@ public abstract class AbstractCommunicationManager implements Serializable { // before children start calling e.g. updateCaption Collections.sort(paintables, new Comparator<Component>() { + @Override public int compare(Component c1, Component c2) { int depth1 = 0; while (c1.getParent() != null) { @@ -1393,14 +1395,17 @@ public abstract class AbstractCommunicationManager implements Serializable { private static class NullIterator<E> implements Iterator<E> { + @Override public boolean hasNext() { return false; } + @Override public E next() { return null; } + @Override public void remove() { } @@ -1874,6 +1879,7 @@ public abstract class AbstractCommunicationManager implements Serializable { this.throwable = throwable; } + @Override public Throwable getThrowable() { return throwable; } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java index 43b175cc36..d3474e736e 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java @@ -15,10 +15,12 @@ abstract class AbstractStreamingEvent implements StreamingEvent { private final long contentLength; private final long bytesReceived; + @Override public final String getFileName() { return filename; } + @Override public final String getMimeType() { return type; } @@ -31,10 +33,12 @@ abstract class AbstractStreamingEvent implements StreamingEvent { this.bytesReceived = bytesReceived; } + @Override public final long getContentLength() { return contentLength; } + @Override public final long getBytesReceived() { return bytesReceived; } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java index bf4ea860a8..73d45f62b1 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java @@ -45,12 +45,14 @@ public abstract class AbstractWebApplicationContext implements private long lastRequestTime = -1; + @Override public void addTransactionListener(TransactionListener listener) { if (listener != null) { listeners.add(listener); } } + @Override public void removeTransactionListener(TransactionListener listener) { listeners.remove(listener); } @@ -119,6 +121,7 @@ public abstract class AbstractWebApplicationContext implements /** * @see javax.servlet.http.HttpSessionBindingListener#valueBound(HttpSessionBindingEvent) */ + @Override public void valueBound(HttpSessionBindingEvent arg0) { // We are not interested in bindings } @@ -126,6 +129,7 @@ public abstract class AbstractWebApplicationContext implements /** * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(HttpSessionBindingEvent) */ + @Override public void valueUnbound(HttpSessionBindingEvent event) { // If we are going to be unbound from the session, the session must be // closing @@ -160,6 +164,7 @@ public abstract class AbstractWebApplicationContext implements return browser; } + @Override public Collection<Application> getApplications() { return Collections.unmodifiableCollection(applications); } @@ -169,6 +174,7 @@ public abstract class AbstractWebApplicationContext implements applicationToAjaxAppMgrMap.remove(application); } + @Override public String generateApplicationResourceURL(ApplicationResource resource, String mapKey) { @@ -197,6 +203,7 @@ public abstract class AbstractWebApplicationContext implements } } + @Override public boolean isApplicationResourceURL(URL context, String relativeUri) { // If the relative uri is null, we are ready if (relativeUri == null) { @@ -214,6 +221,7 @@ public abstract class AbstractWebApplicationContext implements return (prefix.equals("APP")); } + @Override public String getURLKey(URL context, String relativeUri) { final int index = relativeUri.indexOf('/'); final int next = relativeUri.indexOf('/', index + 1); diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java index 7cf66d5fcf..42726c933e 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java @@ -21,6 +21,7 @@ public class ApplicationResourceHandler implements RequestHandler { private static final Pattern APP_RESOURCE_PATTERN = Pattern .compile("^/?APP/(\\d+)/.*"); + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java index d32fa325f4..4038b8f1bc 100644 --- a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java +++ b/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java @@ -113,6 +113,7 @@ public abstract class BootstrapHandler implements RequestHandler { } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java index b6576dce9f..8f0c80332f 100644 --- a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java +++ b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java @@ -23,6 +23,7 @@ public class ChangeVariablesErrorEvent implements ComponentErrorEvent { this.variableChanges = variableChanges; } + @Override public Throwable getThrowable() { return throwable; } diff --git a/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/src/com/vaadin/terminal/gwt/server/ClientConnector.java index ca1ad349c1..1e9166261f 100644 --- a/src/com/vaadin/terminal/gwt/server/ClientConnector.java +++ b/src/com/vaadin/terminal/gwt/server/ClientConnector.java @@ -48,6 +48,7 @@ public interface ClientConnector extends Connector, RpcTarget { */ public Class<? extends SharedState> getStateType(); + @Override public ClientConnector getParent(); /** diff --git a/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java b/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java index ad9484723b..64ea288665 100644 --- a/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java +++ b/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java @@ -61,6 +61,7 @@ public class ClientMethodInvocation implements Serializable, return sequenceNumber; } + @Override public int compareTo(ClientMethodInvocation o) { if (null == o) { return 0; diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index 8e0346f6af..949fd4b757 100644 --- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -44,6 +44,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector { this.manager = manager; } + @Override public void changeVariables(Object source, Map<String, Object> variables) { Object owner = variables.get("dhowner"); @@ -182,10 +183,12 @@ public class DragAndDropService implements VariableOwner, ClientConnector { return transferable; } + @Override public boolean isEnabled() { return isConnectorEnabled(); } + @Override public boolean isImmediate() { return true; } @@ -219,68 +222,82 @@ public class DragAndDropService implements VariableOwner, ClientConnector { return false; } + @Override public SharedState getState() { // TODO Auto-generated method stub return null; } + @Override public String getConnectorId() { return VDragAndDropManager.DD_SERVICE; } + @Override public boolean isConnectorEnabled() { // Drag'n'drop can't be disabled return true; } + @Override public List<ClientMethodInvocation> retrievePendingRpcCalls() { return null; } + @Override public RpcManager getRpcManager(Class<?> rpcInterface) { // TODO Use rpc for drag'n'drop return null; } + @Override public Class<? extends SharedState> getStateType() { return SharedState.class; } + @Override public void requestRepaint() { // TODO Auto-generated method stub } + @Override public ClientConnector getParent() { // TODO Auto-generated method stub return null; } + @Override public void requestRepaintAll() { // TODO Auto-generated method stub } + @Override public void setParent(ClientConnector parent) { // TODO Auto-generated method stub } + @Override public void attach() { // TODO Auto-generated method stub } + @Override public void detach() { // TODO Auto-generated method stub } + @Override public Collection<Extension> getExtensions() { // TODO Auto-generated method stub return Collections.emptySet(); } + @Override public void removeExtension(Extension extension) { // TODO Auto-generated method stub } @@ -289,6 +306,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector { return Logger.getLogger(DragAndDropService.class.getName()); } + @Override public Root getRoot() { return null; } diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index 15b5ced703..aed1c2c0e3 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -103,6 +103,7 @@ public class JsonPaintTarget implements PaintTarget { cacheEnabled = cachingRequired; } + @Override public void startTag(String tagName) throws PaintException { startTag(tagName, false); } @@ -159,6 +160,7 @@ public class JsonPaintTarget implements PaintTarget { * if the paint operation failed. */ + @Override public void endTag(String tagName) throws PaintException { // In case of null data output nothing: if (tagName == null) { @@ -326,14 +328,17 @@ public class JsonPaintTarget implements PaintTarget { * */ + @Override public void addText(String str) throws PaintException { tag.addData("\"" + escapeJSON(str) + "\""); } + @Override public void addAttribute(String name, boolean value) throws PaintException { tag.addAttribute("\"" + name + "\":" + (value ? "true" : "false")); } + @Override @SuppressWarnings("deprecation") public void addAttribute(String name, Resource value) throws PaintException { @@ -363,22 +368,27 @@ public class JsonPaintTarget implements PaintTarget { } + @Override public void addAttribute(String name, int value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } + @Override public void addAttribute(String name, long value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } + @Override public void addAttribute(String name, float value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } + @Override public void addAttribute(String name, double value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } + @Override public void addAttribute(String name, String value) throws PaintException { // In case of null data output nothing: if ((value == null) || (name == null)) { @@ -398,12 +408,14 @@ public class JsonPaintTarget implements PaintTarget { } + @Override public void addAttribute(String name, Component value) throws PaintException { final String id = value.getConnectorId(); addAttribute(name, id); } + @Override public void addAttribute(String name, Map<?, ?> value) throws PaintException { @@ -441,6 +453,7 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute(sb.toString()); } + @Override public void addAttribute(String name, Object[] values) { // In case of null data output nothing: if ((values == null) || (name == null)) { @@ -461,41 +474,49 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute(buf.toString()); } + @Override public void addVariable(VariableOwner owner, String name, String value) throws PaintException { tag.addVariable(new StringVariable(owner, name, escapeJSON(value))); } + @Override public void addVariable(VariableOwner owner, String name, Component value) throws PaintException { tag.addVariable(new StringVariable(owner, name, value.getConnectorId())); } + @Override public void addVariable(VariableOwner owner, String name, int value) throws PaintException { tag.addVariable(new IntVariable(owner, name, value)); } + @Override public void addVariable(VariableOwner owner, String name, long value) throws PaintException { tag.addVariable(new LongVariable(owner, name, value)); } + @Override public void addVariable(VariableOwner owner, String name, float value) throws PaintException { tag.addVariable(new FloatVariable(owner, name, value)); } + @Override public void addVariable(VariableOwner owner, String name, double value) throws PaintException { tag.addVariable(new DoubleVariable(owner, name, value)); } + @Override public void addVariable(VariableOwner owner, String name, boolean value) throws PaintException { tag.addVariable(new BooleanVariable(owner, name, value)); } + @Override public void addVariable(VariableOwner owner, String name, String[] value) throws PaintException { tag.addVariable(new ArrayVariable(owner, name, value)); @@ -515,6 +536,7 @@ public class JsonPaintTarget implements PaintTarget { * if the paint operation failed. */ + @Override public void addUploadStreamVariable(VariableOwner owner, String name) throws PaintException { startTag("uploadstream"); @@ -535,6 +557,7 @@ public class JsonPaintTarget implements PaintTarget { * if the paint operation failed. */ + @Override public void addSection(String sectionTagName, String sectionData) throws PaintException { tag.addData("{\"" + sectionTagName + "\":\"" + escapeJSON(sectionData) @@ -550,6 +573,7 @@ public class JsonPaintTarget implements PaintTarget { * if the paint operation failed. */ + @Override public void addUIDL(String xml) throws PaintException { // Ensure that the target is open @@ -584,6 +608,7 @@ public class JsonPaintTarget implements PaintTarget { * String) */ + @Override public void addXMLSection(String sectionTagName, String sectionData, String namespace) throws PaintException { @@ -649,6 +674,7 @@ public class JsonPaintTarget implements PaintTarget { * .Paintable, java.lang.String) */ + @Override public PaintStatus startPaintable(Component connector, String tagName) throws PaintException { boolean topLevelPaintable = openPaintables.isEmpty(); @@ -675,6 +701,7 @@ public class JsonPaintTarget implements PaintTarget { return PaintStatus.PAINTING; } + @Override public void endPaintable(Component paintable) throws PaintException { getLogger().fine( "endPaintable for " + paintable.getClass().getName() + "@" @@ -698,6 +725,7 @@ public class JsonPaintTarget implements PaintTarget { * @see com.vaadin.terminal.PaintTarget#addCharacterData(java.lang.String ) */ + @Override public void addCharacterData(String text) throws PaintException { if (text != null) { tag.addData(text); @@ -967,6 +995,7 @@ public class JsonPaintTarget implements PaintTarget { return usedResources; } + @Override @SuppressWarnings("unchecked") public String getTag(ClientConnector clientConnector) { Class<? extends ClientConnector> clientConnectorClass = clientConnector @@ -989,6 +1018,7 @@ public class JsonPaintTarget implements PaintTarget { return usedClientConnectors; } + @Override public void addVariable(VariableOwner owner, String name, StreamVariable value) throws PaintException { String url = manager.getStreamVariableTargetUrl( @@ -1005,6 +1035,7 @@ public class JsonPaintTarget implements PaintTarget { * @see com.vaadin.terminal.PaintTarget#isFullRepaint() */ + @Override public boolean isFullRepaint() { return !cacheEnabled; } diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java index de4f918b75..b888ad8e2d 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java @@ -63,6 +63,7 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext { private final Map<String, String> sharedParameterActionNameMap = new HashMap<String, String>(); private final Map<String, String> sharedParameterActionValueMap = new HashMap<String, String>(); + @Override public File getBaseDirectory() { String resultPath = session.getPortletContext().getRealPath("/"); if (resultPath != null) { diff --git a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java index c4ef3fc8e5..9fdffbf9a5 100644 --- a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java +++ b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java @@ -34,112 +34,137 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { this.response = response; } + @Override public void addProperty(String key, String value) { response.addProperty(key, value); } + @Override public PortletURL createActionURL() { return response.createActionURL(); } + @Override public PortletURL createRenderURL() { return response.createRenderURL(); } + @Override public String encodeURL(String path) { return response.encodeURL(path); } + @Override public void flushBuffer() throws IOException { // NOP // TODO throw? } + @Override public int getBufferSize() { return response.getBufferSize(); } + @Override public String getCharacterEncoding() { return response.getCharacterEncoding(); } + @Override public String getContentType() { return response.getContentType(); } + @Override public Locale getLocale() { return response.getLocale(); } + @Override public String getNamespace() { return response.getNamespace(); } + @Override public OutputStream getPortletOutputStream() throws IOException { // write forbidden return null; } + @Override public PrintWriter getWriter() throws IOException { // write forbidden return null; } + @Override public boolean isCommitted() { return response.isCommitted(); } + @Override public void reset() { // NOP // TODO throw? } + @Override public void resetBuffer() { // NOP // TODO throw? } + @Override public void setBufferSize(int size) { // NOP // TODO throw? } + @Override public void setContentType(String type) { // NOP // TODO throw? } + @Override public void setProperty(String key, String value) { response.setProperty(key, value); } + @Override public void setTitle(String title) { response.setTitle(title); } + @Override public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) { // NOP // TODO throw? } + @Override public ResourceURL createResourceURL() { return response.createResourceURL(); } + @Override public CacheControl getCacheControl() { return response.getCacheControl(); } + @Override public void addProperty(Cookie cookie) { // NOP // TODO throw? } + @Override public void addProperty(String key, Element element) { // NOP // TODO throw? } + @Override public Element createElement(String tagName) throws DOMException { // NOP return null; diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java index d9931a9610..0e40ceb8fa 100644 --- a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java +++ b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java @@ -111,6 +111,7 @@ public class ServerRpcManager<T> implements RpcManager { * @param invocation * method invocation to perform */ + @Override public void applyInvocation(ServerRpcMethodInvocation invocation) throws RpcInvocationException { Method method = invocation.getMethod(); diff --git a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java index 7418867fc8..6ab3df2789 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java @@ -17,6 +17,7 @@ final class StreamingErrorEventImpl extends AbstractStreamingEvent implements this.exception = exception; } + @Override public final Exception getException() { return exception; } diff --git a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java index 6a7844abd0..274d05e111 100644 --- a/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java +++ b/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java @@ -16,6 +16,7 @@ final class StreamingStartEventImpl extends AbstractStreamingEvent implements super(filename, type, contentLength, 0); } + @Override public void disposeStreamVariable() { disposed = true; } diff --git a/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java index 334a7acf8d..5248af595e 100644 --- a/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java +++ b/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java @@ -26,6 +26,7 @@ public class UnsupportedBrowserHandler implements RequestHandler { /** Cookie used to ignore browser checks */ public static final String FORCE_LOAD_COOKIE = "vaadinforceload=1"; + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java index 8a1ea792f5..36c08b2ed9 100644 --- a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java @@ -111,6 +111,7 @@ public class WebApplicationContext extends AbstractWebApplicationContext { * * @see com.vaadin.service.ApplicationContext#getBaseDirectory() */ + @Override public File getBaseDirectory() { final String realPath = ApplicationServlet.getResourcePath( session.getServletContext(), "/"); diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java index 38b5409594..14b2ab1d89 100644 --- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java @@ -42,6 +42,7 @@ public class WebBrowser implements Terminal { * @return Always returns null. */ + @Override public String getDefaultTheme() { return null; } @@ -52,6 +53,7 @@ public class WebBrowser implements Terminal { * @see com.vaadin.terminal.Terminal#getScreenHeight() */ + @Override public int getScreenHeight() { return screenHeight; } @@ -62,6 +64,7 @@ public class WebBrowser implements Terminal { * @see com.vaadin.terminal.Terminal#getScreenWidth() */ + @Override public int getScreenWidth() { return screenWidth; } diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java index 0774a79990..cf58f398af 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java +++ b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java @@ -41,18 +41,22 @@ public class WrappedHttpServletRequest extends HttpServletRequestWrapper this.deploymentConfiguration = deploymentConfiguration; } + @Override public String getRequestPathInfo() { return getPathInfo(); } + @Override public int getSessionMaxInactiveInterval() { return getSession().getMaxInactiveInterval(); } + @Override public Object getSessionAttribute(String name) { return getSession().getAttribute(name); } + @Override public void setSessionAttribute(String name, Object attribute) { getSession().setAttribute(name, attribute); } @@ -66,20 +70,25 @@ public class WrappedHttpServletRequest extends HttpServletRequestWrapper return this; } + @Override public DeploymentConfiguration getDeploymentConfiguration() { return deploymentConfiguration; } + @Override public BrowserDetails getBrowserDetails() { return new BrowserDetails() { + @Override public String getUriFragment() { return null; } + @Override public String getWindowName() { return null; } + @Override public WebBrowser getWebBrowser() { WebApplicationContext context = (WebApplicationContext) Application .getCurrent().getContext(); diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java index 14a391b21f..32b2f352a8 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java +++ b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java @@ -47,6 +47,7 @@ public class WrappedHttpServletResponse extends HttpServletResponseWrapper return this; } + @Override public void setCacheTime(long milliseconds) { doSetCacheTime(this, milliseconds); } @@ -67,6 +68,7 @@ public class WrappedHttpServletResponse extends HttpServletResponseWrapper } } + @Override public DeploymentConfiguration getDeploymentConfiguration() { return deploymentConfiguration; } diff --git a/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java index 85d8d5c69c..44858b3e10 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java +++ b/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java @@ -46,10 +46,12 @@ public class WrappedPortletRequest implements WrappedRequest { this.deploymentConfiguration = deploymentConfiguration; } + @Override public Object getAttribute(String name) { return request.getAttribute(name); } + @Override public int getContentLength() { try { return ((ClientDataRequest) request).getContentLength(); @@ -59,6 +61,7 @@ public class WrappedPortletRequest implements WrappedRequest { } } + @Override public InputStream getInputStream() throws IOException { try { return ((ClientDataRequest) request).getPortletInputStream(); @@ -68,18 +71,22 @@ public class WrappedPortletRequest implements WrappedRequest { } } + @Override public String getParameter(String name) { return request.getParameter(name); } + @Override public Map<String, String[]> getParameterMap() { return request.getParameterMap(); } + @Override public void setAttribute(String name, Object o) { request.setAttribute(name, o); } + @Override public String getRequestPathInfo() { if (request instanceof ResourceRequest) { return ((ResourceRequest) request).getResourceID(); @@ -88,14 +95,17 @@ public class WrappedPortletRequest implements WrappedRequest { } } + @Override public int getSessionMaxInactiveInterval() { return request.getPortletSession().getMaxInactiveInterval(); } + @Override public Object getSessionAttribute(String name) { return request.getPortletSession().getAttribute(name); } + @Override public void setSessionAttribute(String name, Object attribute) { request.getPortletSession().setAttribute(name, attribute); } @@ -109,6 +119,7 @@ public class WrappedPortletRequest implements WrappedRequest { return request; } + @Override public String getContentType() { try { return ((ResourceRequest) request).getContentType(); @@ -118,16 +129,20 @@ public class WrappedPortletRequest implements WrappedRequest { } } + @Override public BrowserDetails getBrowserDetails() { return new BrowserDetails() { + @Override public String getUriFragment() { return null; } + @Override public String getWindowName() { return null; } + @Override public WebBrowser getWebBrowser() { PortletApplicationContext2 context = (PortletApplicationContext2) Application .getCurrent().getContext(); @@ -136,18 +151,22 @@ public class WrappedPortletRequest implements WrappedRequest { }; } + @Override public Locale getLocale() { return request.getLocale(); } + @Override public String getRemoteAddr() { return null; } + @Override public boolean isSecure() { return request.isSecure(); } + @Override public String getHeader(String string) { return null; } @@ -164,6 +183,7 @@ public class WrappedPortletRequest implements WrappedRequest { return request.getPortalContext().getProperty(name); } + @Override public DeploymentConfiguration getDeploymentConfiguration() { return deploymentConfiguration; } diff --git a/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java index 8824396352..f7ecf26f3c 100644 --- a/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java +++ b/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java @@ -53,6 +53,7 @@ public class WrappedPortletResponse implements WrappedResponse { this.deploymentConfiguration = deploymentConfiguration; } + @Override public OutputStream getOutputStream() throws IOException { return ((MimeResponse) response).getPortletOutputStream(); } @@ -66,36 +67,44 @@ public class WrappedPortletResponse implements WrappedResponse { return response; } + @Override public void setContentType(String type) { ((MimeResponse) response).setContentType(type); } + @Override public PrintWriter getWriter() throws IOException { return ((MimeResponse) response).getWriter(); } + @Override public void setStatus(int responseStatus) { response.setProperty(ResourceResponse.HTTP_STATUS_CODE, Integer.toString(responseStatus)); } + @Override public void setHeader(String name, String value) { response.setProperty(name, value); } + @Override public void setDateHeader(String name, long timestamp) { response.setProperty(name, HTTP_DATE_FORMAT.format(new Date(timestamp))); } + @Override public void setCacheTime(long milliseconds) { WrappedHttpServletResponse.doSetCacheTime(this, milliseconds); } + @Override public void sendError(int errorCode, String message) throws IOException { setStatus(errorCode); getWriter().write(message); } + @Override public DeploymentConfiguration getDeploymentConfiguration() { return deploymentConfiguration; } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index 1c5b736492..6ee30183c1 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -49,6 +49,7 @@ public class ClassPathExplorer { * File filter that only accepts directories. */ private final static FileFilter DIRECTORIES_ONLY = new FileFilter() { + @Override public boolean accept(File f) { if (f.exists() && f.isDirectory()) { return true; diff --git a/src/com/vaadin/tools/WidgetsetCompiler.java b/src/com/vaadin/tools/WidgetsetCompiler.java index 987fd8f734..ecc1946e60 100644 --- a/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/src/com/vaadin/tools/WidgetsetCompiler.java @@ -51,6 +51,7 @@ public class WidgetsetCompiler { // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197) Runnable runCompiler = new Runnable() { + @Override public void run() { try { // GWTCompiler.main(args); diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java index 7d8c402fc9..3fe5eb055a 100644 --- a/src/com/vaadin/ui/AbsoluteLayout.java +++ b/src/com/vaadin/ui/AbsoluteLayout.java @@ -30,6 +30,7 @@ public class AbsoluteLayout extends AbstractLayout implements private AbsoluteLayoutServerRpc rpc = new AbsoluteLayoutServerRpc() { + @Override public void layoutClick(MouseEventDetails mouseDetails, Connector clickedConnector) { fireEvent(LayoutClickEvent.createEvent(AbsoluteLayout.this, @@ -56,6 +57,7 @@ public class AbsoluteLayout extends AbstractLayout implements * Gets an iterator for going through all components enclosed in the * absolute layout. */ + @Override public Iterator<Component> getComponentIterator() { return componentToCoordinates.keySet().iterator(); } @@ -66,6 +68,7 @@ public class AbsoluteLayout extends AbstractLayout implements * * @return the number of contained components */ + @Override public int getComponentCount() { return componentToCoordinates.size(); } @@ -74,6 +77,7 @@ public class AbsoluteLayout extends AbstractLayout implements * Replaces one component with another one. The new component inherits the * old components position. */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { ComponentPosition position = getPosition(oldComponent); removeComponent(oldComponent); @@ -612,12 +616,14 @@ public class AbsoluteLayout extends AbstractLayout implements } + @Override public void addListener(LayoutClickListener listener) { addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } + @Override public void removeListener(LayoutClickListener listener) { removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java index ba0e5db89c..ead7dee91c 100644 --- a/src/com/vaadin/ui/AbstractComponent.java +++ b/src/com/vaadin/ui/AbstractComponent.java @@ -101,10 +101,12 @@ public abstract class AbstractComponent extends AbstractClientConnector /* Get/Set component properties */ + @Override public void setDebugId(String id) { getState().setDebugId(id); } + @Override public String getDebugId() { return getState().getDebugId(); } @@ -141,6 +143,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Gets the component's style. Don't add a JavaDoc comment here, we use the * default documentation from implemented interface. */ + @Override public String getStyleName() { String s = ""; if (getState().getStyles() != null) { @@ -159,6 +162,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Sets the component's style. Don't add a JavaDoc comment here, we use the * default documentation from implemented interface. */ + @Override public void setStyleName(String style) { if (style == null || "".equals(style)) { getState().setStyles(null); @@ -179,6 +183,7 @@ public abstract class AbstractComponent extends AbstractClientConnector requestRepaint(); } + @Override public void addStyleName(String style) { if (style == null || "".equals(style)) { return; @@ -201,6 +206,7 @@ public abstract class AbstractComponent extends AbstractClientConnector } } + @Override public void removeStyleName(String style) { if (getState().getStyles() != null) { String[] styleParts = style.split(" +"); @@ -217,6 +223,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Get's the component's caption. Don't add a JavaDoc comment here, we use * the default documentation from implemented interface. */ + @Override public String getCaption() { return getState().getCaption(); } @@ -229,6 +236,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * @param caption * the new caption <code>String</code> for the component. */ + @Override public void setCaption(String caption) { getState().setCaption(caption); requestRepaint(); @@ -238,6 +246,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public Locale getLocale() { if (locale != null) { return locale; @@ -283,6 +292,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Gets the component's icon resource. Don't add a JavaDoc comment here, we * use the default documentation from implemented interface. */ + @Override public Resource getIcon() { ResourceReference ref = ((ResourceReference) getState().getIcon()); if (ref == null) { @@ -299,6 +309,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * @param icon * the icon to be shown with the component's caption. */ + @Override public void setIcon(Resource icon) { if (icon == null) { getState().setIcon(null); @@ -313,6 +324,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.ui.Component#isEnabled() */ + @Override public boolean isEnabled() { return getState().isEnabled(); } @@ -322,6 +334,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.ui.Component#setEnabled(boolean) */ + @Override public void setEnabled(boolean enabled) { if (getState().isEnabled() != enabled) { getState().setEnabled(enabled); @@ -377,6 +390,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.ui.Component#isVisible() */ + @Override public boolean isVisible() { return getState().isVisible(); } @@ -386,6 +400,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.ui.Component#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { if (getState().isVisible() == visible) { return; @@ -566,6 +581,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Tests if the component is in read-only mode. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public boolean isReadOnly() { return getState().isReadOnly(); } @@ -574,6 +590,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Sets the component's read-only mode. Don't add a JavaDoc comment here, we * use the default documentation from implemented interface. */ + @Override public void setReadOnly(boolean readOnly) { getState().setReadOnly(readOnly); requestRepaint(); @@ -704,6 +721,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.ui.Component#updateState() */ + @Override public void updateState() { // TODO This logic should be on the client side and the state should // simply be a data object with "width" and "height". @@ -863,6 +881,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * @param method * the activation method. */ + @Override public void addListener(Class<?> eventType, Object target, Method method) { if (eventRouter == null) { eventRouter = new EventRouter(); @@ -904,6 +923,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * @param methodName * the name of the activation method. */ + @Override public void addListener(Class<?> eventType, Object target, String methodName) { if (eventRouter == null) { eventRouter = new EventRouter(); @@ -929,6 +949,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * the target object that has registered to listen to events of * type <code>eventType</code> with one or more methods. */ + @Override public void removeListener(Class<?> eventType, Object target) { if (eventRouter != null) { eventRouter.removeListener(eventType, target); @@ -954,6 +975,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * the method owned by <code>target</code> that's registered to * listen to events of type <code>eventType</code>. */ + @Override public void removeListener(Class<?> eventType, Object target, Method method) { if (eventRouter != null) { eventRouter.removeListener(eventType, target, method); @@ -988,6 +1010,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * the name of the method owned by <code>target</code> that's * registered to listen to events of type <code>eventType</code>. */ + @Override public void removeListener(Class<?> eventType, Object target, String methodName) { if (eventRouter != null) { @@ -1032,6 +1055,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void addListener(Component.Listener listener) { addListener(Component.Event.class, listener, COMPONENT_EVENT_METHOD); } @@ -1041,6 +1065,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Component.Listener listener) { removeListener(Component.Event.class, listener, COMPONENT_EVENT_METHOD); } @@ -1090,6 +1115,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#getHeight() */ + @Override public float getHeight() { return height; } @@ -1099,6 +1125,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#getHeightUnits() */ + @Override public Unit getHeightUnits() { return heightUnit; } @@ -1108,6 +1135,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#getWidth() */ + @Override public float getWidth() { return width; } @@ -1117,6 +1145,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#getWidthUnits() */ + @Override public Unit getWidthUnits() { return widthUnit; } @@ -1126,6 +1155,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setHeight(float, Unit) */ + @Override public void setHeight(float height, Unit unit) { if (unit == null) { throw new IllegalArgumentException("Unit can not be null"); @@ -1141,6 +1171,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setSizeFull() */ + @Override public void setSizeFull() { setWidth(100, Unit.PERCENTAGE); setHeight(100, Unit.PERCENTAGE); @@ -1151,6 +1182,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setSizeUndefined() */ + @Override public void setSizeUndefined() { setWidth(-1, Unit.PIXELS); setHeight(-1, Unit.PIXELS); @@ -1161,6 +1193,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setWidth(float, Unit) */ + @Override public void setWidth(float width, Unit unit) { if (unit == null) { throw new IllegalArgumentException("Unit can not be null"); @@ -1176,6 +1209,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String) */ + @Override public void setWidth(String width) { Size size = parseStringSize(width); if (size != null) { @@ -1190,6 +1224,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * * @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String) */ + @Override public void setHeight(String height) { Size size = parseStringSize(height); if (size != null) { diff --git a/src/com/vaadin/ui/AbstractComponentContainer.java b/src/com/vaadin/ui/AbstractComponentContainer.java index 8ef458b704..bc27242bb8 100644 --- a/src/com/vaadin/ui/AbstractComponentContainer.java +++ b/src/com/vaadin/ui/AbstractComponentContainer.java @@ -38,6 +38,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * Removes all components from the container. This should probably be * re-implemented in extending classes for a more powerful implementation. */ + @Override public void removeAllComponents() { final LinkedList<Component> l = new LinkedList<Component>(); @@ -57,6 +58,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void moveComponentsFrom(ComponentContainer source) { final LinkedList<Component> components = new LinkedList<Component>(); for (final Iterator<Component> i = source.getComponentIterator(); i @@ -93,24 +95,28 @@ public abstract class AbstractComponentContainer extends AbstractComponent } /* documented in interface */ + @Override public void addListener(ComponentAttachListener listener) { addListener(ComponentContainer.ComponentAttachEvent.class, listener, COMPONENT_ATTACHED_METHOD); } /* documented in interface */ + @Override public void addListener(ComponentDetachListener listener) { addListener(ComponentContainer.ComponentDetachEvent.class, listener, COMPONENT_DETACHED_METHOD); } /* documented in interface */ + @Override public void removeListener(ComponentAttachListener listener) { removeListener(ComponentContainer.ComponentAttachEvent.class, listener, COMPONENT_ATTACHED_METHOD); } /* documented in interface */ + @Override public void removeListener(ComponentDetachListener listener) { removeListener(ComponentContainer.ComponentDetachEvent.class, listener, COMPONENT_DETACHED_METHOD); @@ -147,6 +153,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * * @see com.vaadin.ui.ComponentContainer#addComponent(Component) */ + @Override public void addComponent(Component c) { if (c instanceof ComponentContainer) { // Make sure we're not adding the component inside it's own content @@ -177,6 +184,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * * @see com.vaadin.ui.ComponentContainer#removeComponent(Component) */ + @Override public void removeComponent(Component c) { if (c.getParent() == this) { c.setParent(null); @@ -325,6 +333,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent true); } + @Override public Iterator<Component> iterator() { return getComponentIterator(); } @@ -335,6 +344,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * @see * com.vaadin.ui.HasComponents#isComponentVisible(com.vaadin.ui.Component) */ + @Override public boolean isComponentVisible(Component childComponent) { return true; } diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java index ce62fb43ed..c9181ba3f1 100644 --- a/src/com/vaadin/ui/AbstractField.java +++ b/src/com/vaadin/ui/AbstractField.java @@ -178,6 +178,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @return the type of the Field */ + @Override public abstract Class<? extends T> getType(); /** @@ -206,6 +207,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.data.BufferedValidatable#isInvalidCommitted() */ + @Override public boolean isInvalidCommitted() { return invalidCommitted; } @@ -215,6 +217,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.data.BufferedValidatable#setInvalidCommitted(boolean) */ + @Override public void setInvalidCommitted(boolean isCommitted) { invalidCommitted = isCommitted; } @@ -223,6 +226,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * Saves the current value to the data source Don't add a JavaDoc comment * here, we use the default documentation from the implemented interface. */ + @Override public void commit() throws Buffered.SourceException, InvalidValueException { if (dataSource != null && !dataSource.isReadOnly()) { if ((isInvalidCommitted() || isValid())) { @@ -271,6 +275,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * Updates the value from the data source. Don't add a JavaDoc comment here, * we use the default documentation from the implemented interface. */ + @Override public void discard() throws Buffered.SourceException { if (dataSource != null) { @@ -343,6 +348,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * comment here, we use the default documentation from the implemented * interface. */ + @Override public boolean isModified() { return getState().isModified(); } @@ -356,6 +362,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * Tests if the field is in write-through mode. Don't add a JavaDoc comment * here, we use the default documentation from the implemented interface. */ + @Override public boolean isWriteThrough() { return writeThroughMode; } @@ -381,6 +388,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * setReadThrough(true), setWriteThrough(true) equals * setBuffered(false) */ + @Override @Deprecated public void setWriteThrough(boolean writeThrough) throws Buffered.SourceException, InvalidValueException { @@ -397,6 +405,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * Tests if the field is in read-through mode. Don't add a JavaDoc comment * here, we use the default documentation from the implemented interface. */ + @Override public boolean isReadThrough() { return readThroughMode; } @@ -420,6 +429,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * setReadThrough(true), setWriteThrough(true) equals * setBuffered(false) */ + @Override @Deprecated public void setReadThrough(boolean readThrough) throws Buffered.SourceException { @@ -452,6 +462,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param buffered * true if buffered mode should be turned on, false otherwise */ + @Override public void setBuffered(boolean buffered) { setReadThrough(!buffered); setWriteThrough(!buffered); @@ -464,6 +475,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @return true if buffered mode is on, false otherwise */ + @Override public boolean isBuffered() { return !isReadThrough() && !isWriteThrough(); } @@ -517,6 +529,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @return the current value of the field. */ + @Override public T getValue() { return getFieldValue(); } @@ -528,6 +541,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * the New value of the field. * @throws Property.ReadOnlyException */ + @Override public void setValue(Object newFieldValue) throws Property.ReadOnlyException, Converter.ConversionException { // This check is needed as long as setValue accepts Object instead of T @@ -644,6 +658,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @return the current data source as a Property, or <code>null</code> if * none defined. */ + @Override public Property getPropertyDataSource() { return dataSource; } @@ -686,6 +701,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param newDataSource * the new data source Property. */ + @Override public void setPropertyDataSource(Property newDataSource) { // Saves the old value @@ -863,6 +879,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param validator * the new validator to be added. */ + @Override public void addValidator(Validator validator) { if (validators == null) { validators = new LinkedList<Validator>(); @@ -877,6 +894,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @return the Unmodifiable collection that holds all validators for the * field. */ + @Override public Collection<Validator> getValidators() { if (validators == null || validators.isEmpty()) { return null; @@ -890,6 +908,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param validator * the validator to remove. */ + @Override public void removeValidator(Validator validator) { if (validators != null) { validators.remove(validator); @@ -919,6 +938,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * current value is valid or if the field is empty and not required, * <code>false</code> otherwise. */ + @Override public boolean isValid() { try { @@ -943,6 +963,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.data.Validatable#validate() */ + @Override public void validate() throws Validator.InvalidValueException { if (isRequired() && isEmpty()) { @@ -1014,6 +1035,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @return true iff the invalid values are allowed. * @see com.vaadin.data.Validatable#isInvalidAllowed() */ + @Override public boolean isInvalidAllowed() { return invalidAllowed; } @@ -1031,6 +1053,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean) */ + @Override public void setInvalidAllowed(boolean invalidAllowed) throws UnsupportedOperationException { this.invalidAllowed = invalidAllowed; @@ -1103,6 +1126,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * Adds a value change listener for the field. Don't add a JavaDoc comment * here, we use the default documentation from the implemented interface. */ + @Override public void addListener(Property.ValueChangeListener listener) { addListener(AbstractField.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); @@ -1113,6 +1137,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * comment here, we use the default documentation from the implemented * interface. */ + @Override public void removeListener(Property.ValueChangeListener listener) { removeListener(AbstractField.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); @@ -1152,6 +1177,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see Property.ReadOnlyStatusChangeListener */ + @Override public void readOnlyStatusChange(Property.ReadOnlyStatusChangeEvent event) { getState().setPropertyReadOnly(event.getProperty().isReadOnly()); requestRepaint(); @@ -1184,6 +1210,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @return the Source of the event. */ + @Override public Property getProperty() { return (Property) getSource(); } @@ -1194,6 +1221,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * JavaDoc comment here, we use the default documentation from the * implemented interface. */ + @Override public void addListener(Property.ReadOnlyStatusChangeListener listener) { addListener(Property.ReadOnlyStatusChangeEvent.class, listener, READ_ONLY_STATUS_CHANGE_METHOD); @@ -1204,6 +1232,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * JavaDoc comment here, we use the default documentation from the * implemented interface. */ + @Override public void removeListener(Property.ReadOnlyStatusChangeListener listener) { removeListener(Property.ReadOnlyStatusChangeEvent.class, listener, READ_ONLY_STATUS_CHANGE_METHOD); @@ -1228,6 +1257,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * the value change event telling the data source contents have * changed. */ + @Override public void valueChange(Property.ValueChangeEvent event) { if (isReadThrough()) { if (committingValueToDataSource) { @@ -1271,6 +1301,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.ui.Component.Focusable#getTabIndex() */ + @Override public int getTabIndex() { return getState().getTabIndex(); } @@ -1280,6 +1311,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * * @see com.vaadin.ui.Component.Focusable#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { getState().setTabIndex(tabIndex); requestRepaint(); @@ -1362,6 +1394,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @return <code>true</code> if the field is required, otherwise * <code>false</code>. */ + @Override public boolean isRequired() { return getState().isRequired(); } @@ -1381,6 +1414,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param required * Is the field required. */ + @Override public void setRequired(boolean required) { getState().setRequired(required); requestRepaint(); @@ -1395,11 +1429,13 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @param requiredMessage * Message to be shown when this field is required, but empty. */ + @Override public void setRequiredError(String requiredMessage) { requiredError = requiredMessage; requestRepaint(); } + @Override public String getRequiredError() { return requiredError; } diff --git a/src/com/vaadin/ui/AbstractLayout.java b/src/com/vaadin/ui/AbstractLayout.java index 4876b40265..d31c855659 100644 --- a/src/com/vaadin/ui/AbstractLayout.java +++ b/src/com/vaadin/ui/AbstractLayout.java @@ -32,6 +32,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * * @see com.vaadin.ui.Layout#setMargin(boolean) */ + @Override public void setMargin(boolean enabled) { margins.setMargins(enabled); getState().setMarginsBitmask(margins.getBitMask()); @@ -43,6 +44,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * * @see com.vaadin.ui.Layout.MarginHandler#getMargin() */ + @Override public MarginInfo getMargin() { return margins; } @@ -52,6 +54,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * * @see com.vaadin.ui.Layout.MarginHandler#setMargin(MarginInfo) */ + @Override public void setMargin(MarginInfo marginInfo) { margins.setMargins(marginInfo); getState().setMarginsBitmask(margins.getBitMask()); @@ -63,6 +66,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * * @see com.vaadin.ui.Layout#setMargin(boolean, boolean, boolean, boolean) */ + @Override public void setMargin(boolean topEnabled, boolean rightEnabled, boolean bottomEnabled, boolean leftEnabled) { margins.setMargins(topEnabled, rightEnabled, bottomEnabled, leftEnabled); diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java index 2cd6fc2a9a..7230e6534b 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -24,6 +24,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements private AbstractOrderedLayoutServerRpc rpc = new AbstractOrderedLayoutServerRpc() { + @Override public void layoutClick(MouseEventDetails mouseDetails, Connector clickedConnector) { fireEvent(LayoutClickEvent.createEvent(AbstractOrderedLayout.this, @@ -157,6 +158,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @return the Iterator of the components inside the container. */ + @Override public Iterator<Component> getComponentIterator() { return components.iterator(); } @@ -167,11 +169,13 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @return the number of contained components */ + @Override public int getComponentCount() { return components.size(); } /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { // Gets the locations @@ -220,12 +224,14 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * @see com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com * .vaadin.ui.Component, int, int) */ + @Override public void setComponentAlignment(Component childComponent, int horizontalAlignment, int verticalAlignment) { Alignment a = new Alignment(horizontalAlignment + verticalAlignment); setComponentAlignment(childComponent, a); } + @Override public void setComponentAlignment(Component childComponent, Alignment alignment) { ChildComponentData childData = getState().getChildData().get( @@ -247,6 +253,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * @see com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com * .vaadin.ui.Component) */ + @Override public Alignment getComponentAlignment(Component childComponent) { ChildComponentData childData = getState().getChildData().get( childComponent); @@ -263,6 +270,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean) */ + @Override public void setSpacing(boolean spacing) { getState().setSpacing(spacing); requestRepaint(); @@ -273,6 +281,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() */ + @Override public boolean isSpacing() { return getState().isSpacing(); } @@ -334,12 +343,14 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements return childData.getExpandRatio(); } + @Override public void addListener(LayoutClickListener listener) { addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } + @Override public void removeListener(LayoutClickListener listener) { removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 6a927251af..399e08800e 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -320,6 +320,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Paints select attributes @@ -422,6 +423,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { // New option entered (and it is allowed) @@ -542,6 +544,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * */ public class DefaultNewItemHandler implements NewItemHandler { + @Override public void addNewItem(String newItemCaption) { // Checks for readonly if (isReadOnly()) { @@ -692,6 +695,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * the item id. * @return the item from the container. */ + @Override public Item getItem(Object itemId) { return items.getItem(itemId); } @@ -701,6 +705,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @return the Collection of item ids. */ + @Override public Collection<?> getItemIds() { return items.getItemIds(); } @@ -710,6 +715,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @return the Collection of property ids. */ + @Override public Collection<?> getContainerPropertyIds() { return items.getContainerPropertyIds(); } @@ -721,6 +727,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * the Id identifying the property. * @see com.vaadin.data.Container#getType(java.lang.Object) */ + @Override public Class<?> getType(Object propertyId) { return items.getType(propertyId); } @@ -732,6 +739,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container#size() */ + @Override public int size() { return items.size(); } @@ -742,6 +750,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @param itemId * the Id the of item to be tested. */ + @Override public boolean containsId(Object itemId) { if (itemId != null) { return items.containsId(itemId); @@ -756,6 +765,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container#getContainerProperty(Object, Object) */ + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { return items.getContainerProperty(itemId, propertyId); } @@ -771,6 +781,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object, * java.lang.Class, java.lang.Object) */ + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { @@ -791,6 +802,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @return True if the operation succeeded. * @see com.vaadin.data.Container#removeAllItems() */ + @Override public boolean removeAllItems() throws UnsupportedOperationException { final boolean retval = items.removeAllItems(); @@ -812,6 +824,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @return the Id of the created item or null in case of failure. * @see com.vaadin.data.Container#addItem() */ + @Override public Object addItem() throws UnsupportedOperationException { final Object retval = items.addItem(); @@ -836,6 +849,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @return the Created item with the given id, or null in case of failure. * @see com.vaadin.data.Container#addItem(java.lang.Object) */ + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { final Item retval = items.addItem(itemId); @@ -851,6 +865,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container#removeItem(java.lang.Object) */ + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { @@ -873,6 +888,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @return True if the operation succeeded. * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object) */ + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { @@ -896,6 +912,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * @param newDataSource * the new data source. */ + @Override public void setContainerDataSource(Container newDataSource) { if (newDataSource == null) { newDataSource = new IndexedContainer(); @@ -950,6 +967,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.Viewer#getContainerDataSource() */ + @Override public Container getContainerDataSource() { return items; } @@ -1432,6 +1450,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent) */ + @Override public void containerPropertySetChange( Container.PropertySetChangeEvent event) { firePropertySetChange(); @@ -1442,6 +1461,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener) */ + @Override public void addListener(Container.PropertySetChangeListener listener) { if (propertySetEventListeners == null) { propertySetEventListeners = new LinkedHashSet<Container.PropertySetChangeListener>(); @@ -1454,6 +1474,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener) */ + @Override public void removeListener(Container.PropertySetChangeListener listener) { if (propertySetEventListeners != null) { propertySetEventListeners.remove(listener); @@ -1468,6 +1489,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener) */ + @Override public void addListener(Container.ItemSetChangeListener listener) { if (itemSetEventListeners == null) { itemSetEventListeners = new LinkedHashSet<Container.ItemSetChangeListener>(); @@ -1480,6 +1502,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener) */ + @Override public void removeListener(Container.ItemSetChangeListener listener) { if (itemSetEventListeners != null) { itemSetEventListeners.remove(listener); @@ -1516,6 +1539,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent) */ + @Override public void containerItemSetChange(Container.ItemSetChangeEvent event) { // Clears the item id mapping table itemIdMapper.removeAll(); @@ -1566,6 +1590,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer() */ + @Override public Container getContainer() { return AbstractSelect.this; } @@ -1583,6 +1608,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer() */ + @Override public Container getContainer() { return AbstractSelect.this; } @@ -1778,10 +1804,12 @@ public abstract class AbstractSelect extends AbstractField<Object> implements captionChangeNotifiers.clear(); } + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { requestRepaint(); } + @Override public void itemPropertySetChange( com.vaadin.data.Item.PropertySetChangeEvent event) { requestRepaint(); @@ -1809,6 +1837,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements super(select, itemId); } + @Override public boolean accept(DragAndDropEvent dragEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent .getTargetDetails(); @@ -1875,6 +1904,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements super(select, itemId); } + @Override public boolean accept(DragAndDropEvent dragEvent) { DataBoundTransferable transferable = (DataBoundTransferable) dragEvent .getTransferable(); diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java index 876d39f2ae..72d17039ed 100644 --- a/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/src/com/vaadin/ui/AbstractSplitPanel.java @@ -38,11 +38,13 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { private AbstractSplitPanelRpc rpc = new AbstractSplitPanelRpc() { + @Override public void splitterClick(MouseEventDetails mouseDetails) { fireEvent(new SplitterClickEvent(AbstractSplitPanel.this, mouseDetails)); } + @Override public void setSplitterPosition(float position) { getSplitterState().setPosition(position); } @@ -63,6 +65,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { int i = 0; + @Override public boolean hasNext() { if (i < getComponentCount()) { return true; @@ -70,6 +73,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { return false; } + @Override public Component next() { if (!hasNext()) { return null; @@ -84,6 +88,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { return null; } + @Override public void remove() { if (i == 1) { if (getFirstComponent() != null) { @@ -211,6 +216,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @see com.vaadin.ui.ComponentContainer#getComponentIterator() */ + @Override public Iterator<Component> getComponentIterator() { return new ComponentIterator(); } @@ -222,6 +228,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * @return the number of contained components (zero, one or two) */ + @Override public int getComponentCount() { int count = 0; if (getFirstComponent() != null) { @@ -235,6 +242,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { if (oldComponent == getFirstComponent()) { setFirstComponent(newComponent); diff --git a/src/com/vaadin/ui/AbstractTextField.java b/src/com/vaadin/ui/AbstractTextField.java index d584374bda..4f1eef9ae5 100644 --- a/src/com/vaadin/ui/AbstractTextField.java +++ b/src/com/vaadin/ui/AbstractTextField.java @@ -95,6 +95,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements getState().setText(value); } + @Override public void paintContent(PaintTarget target) throws PaintException { if (selectionPosition != -1) { @@ -123,6 +124,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements } + @Override public void changeVariables(Object source, Map<String, Object> variables) { changingVariables = true; @@ -498,11 +500,13 @@ public abstract class AbstractTextField extends AbstractField<String> implements LAZY } + @Override public void addListener(TextChangeListener listener) { addListener(TextChangeListener.EVENT_ID, TextChangeEvent.class, listener, TextChangeListener.EVENT_METHOD); } + @Override public void removeListener(TextChangeListener listener) { removeListener(TextChangeListener.EVENT_ID, TextChangeEvent.class, listener); @@ -645,20 +649,24 @@ public abstract class AbstractTextField extends AbstractField<String> implements return lastKnownCursorPosition; } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java index 0abc50f26f..1fe4055a8b 100644 --- a/src/com/vaadin/ui/Button.java +++ b/src/com/vaadin/ui/Button.java @@ -39,10 +39,12 @@ public class Button extends AbstractComponent implements private ButtonServerRpc rpc = new ButtonServerRpc() { + @Override public void click(MouseEventDetails mouseEventDetails) { fireClick(mouseEventDetails); } + @Override public void disableOnClick() { // Could be optimized so the button is not repainted because of // this (client side has already disabled the button) @@ -332,20 +334,24 @@ public class Button extends AbstractComponent implements fireEvent(new Button.ClickEvent(this, details)); } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); @@ -474,6 +480,7 @@ public class Button extends AbstractComponent implements * * @see com.vaadin.ui.Component.Focusable#getTabIndex() */ + @Override public int getTabIndex() { return getState().getTabIndex(); } @@ -483,6 +490,7 @@ public class Button extends AbstractComponent implements * * @see com.vaadin.ui.Component.Focusable#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { getState().setTabIndex(tabIndex); requestRepaint(); diff --git a/src/com/vaadin/ui/CheckBox.java b/src/com/vaadin/ui/CheckBox.java index 147a270059..39886cd70c 100644 --- a/src/com/vaadin/ui/CheckBox.java +++ b/src/com/vaadin/ui/CheckBox.java @@ -18,6 +18,7 @@ public class CheckBox extends AbstractField<Boolean> { private CheckBoxServerRpc rpc = new CheckBoxServerRpc() { + @Override public void setChecked(boolean checked, MouseEventDetails mouseEventDetails) { if (isReadOnly()) { diff --git a/src/com/vaadin/ui/Component.java b/src/com/vaadin/ui/Component.java index 5d05f9d0f2..d91af1b5ba 100644 --- a/src/com/vaadin/ui/Component.java +++ b/src/com/vaadin/ui/Component.java @@ -305,6 +305,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * * @return the parent component */ + @Override public HasComponents getParent(); /** @@ -507,6 +508,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * @return the Root of the component or <code>null</code> if it is not * attached to a Root */ + @Override public Root getRoot(); /** @@ -585,6 +587,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * } * </pre> */ + @Override public void attach(); /** @@ -620,6 +623,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * * @since 7.0 */ + @Override public ComponentState getState(); /** diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java index e8ec6bd041..eb0b836745 100644 --- a/src/com/vaadin/ui/CssLayout.java +++ b/src/com/vaadin/ui/CssLayout.java @@ -60,6 +60,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { private CssLayoutServerRpc rpc = new CssLayoutServerRpc() { + @Override public void layoutClick(MouseEventDetails mouseDetails, Connector clickedConnector) { fireEvent(LayoutClickEvent.createEvent(CssLayout.this, @@ -167,6 +168,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { * * @return the Iterator of the components inside the container. */ + @Override public Iterator<Component> getComponentIterator() { return components.iterator(); } @@ -177,6 +179,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { * * @return the number of contained components */ + @Override public int getComponentCount() { return components.size(); } @@ -223,6 +226,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { } /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { // Gets the locations @@ -264,12 +268,14 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { } } + @Override public void addListener(LayoutClickListener listener) { addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } + @Override public void removeListener(LayoutClickListener listener) { removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java index 98d650f6db..40b5dcd636 100644 --- a/src/com/vaadin/ui/CustomComponent.java +++ b/src/com/vaadin/ui/CustomComponent.java @@ -100,20 +100,24 @@ public class CustomComponent extends AbstractComponentContainer { Serializable { boolean first = getCompositionRoot() != null; + @Override public boolean hasNext() { return first; } + @Override public Component next() { first = false; return root; } + @Override public void remove() { throw new UnsupportedOperationException(); } } + @Override public Iterator<Component> getComponentIterator() { return new ComponentIterator(); } @@ -124,6 +128,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @return the number of contained components (zero or one) */ + @Override public int getComponentCount() { return (root != null ? 1 : 0); } @@ -134,6 +139,7 @@ public class CustomComponent extends AbstractComponentContainer { * @see com.vaadin.ui.ComponentContainer#replaceComponent(com.vaadin.ui.Component, * com.vaadin.ui.Component) */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { throw new UnsupportedOperationException(); } diff --git a/src/com/vaadin/ui/CustomField.java b/src/com/vaadin/ui/CustomField.java index 0998c11612..ab3797a58c 100644 --- a/src/com/vaadin/ui/CustomField.java +++ b/src/com/vaadin/ui/CustomField.java @@ -123,28 +123,34 @@ public abstract class CustomField<T> extends AbstractField<T> implements Serializable { boolean first = (root != null); + @Override public boolean hasNext() { return first; } + @Override public Component next() { first = false; return getContent(); } + @Override public void remove() { throw new UnsupportedOperationException(); } } + @Override public Iterator<Component> getComponentIterator() { return new ComponentIterator(); } + @Override public Iterator<Component> iterator() { return getComponentIterator(); } + @Override public int getComponentCount() { return (null != getContent()) ? 1 : 0; } @@ -163,22 +169,27 @@ public abstract class CustomField<T> extends AbstractField<T> implements // TODO remove these methods when ComponentContainer interface is cleaned up + @Override public void addComponent(Component c) { throw new UnsupportedOperationException(); } + @Override public void removeComponent(Component c) { throw new UnsupportedOperationException(); } + @Override public void removeAllComponents() { throw new UnsupportedOperationException(); } + @Override public void replaceComponent(Component oldComponent, Component newComponent) { throw new UnsupportedOperationException(); } + @Override public void moveComponentsFrom(ComponentContainer source) { throw new UnsupportedOperationException(); } @@ -197,24 +208,29 @@ public abstract class CustomField<T> extends AbstractField<T> implements } } + @Override public void addListener(ComponentAttachListener listener) { addListener(ComponentContainer.ComponentAttachEvent.class, listener, COMPONENT_ATTACHED_METHOD); } + @Override public void removeListener(ComponentAttachListener listener) { removeListener(ComponentContainer.ComponentAttachEvent.class, listener, COMPONENT_ATTACHED_METHOD); } + @Override public void addListener(ComponentDetachListener listener) { // content never detached } + @Override public void removeListener(ComponentDetachListener listener) { // content never detached } + @Override public boolean isComponentVisible(Component childComponent) { return true; } diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java index 97cea1c49d..6c8073ffa1 100644 --- a/src/com/vaadin/ui/CustomLayout.java +++ b/src/com/vaadin/ui/CustomLayout.java @@ -185,6 +185,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component { * * @return the Iterator of the components inside the container. */ + @Override public Iterator<Component> getComponentIterator() { return slots.values().iterator(); } @@ -195,6 +196,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component { * * @return the number of contained components */ + @Override public int getComponentCount() { return slots.values().size(); } @@ -212,6 +214,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component { } /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { // Gets the locations @@ -305,10 +308,12 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component { "CustomLayout does not support margins."); } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // Nothing to see here } + @Override public void paintContent(PaintTarget target) throws PaintException { // Workaround to make the CommunicationManager read the template file // and send it to the client diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java index 55ff67229c..d0a22f3c29 100644 --- a/src/com/vaadin/ui/DateField.java +++ b/src/com/vaadin/ui/DateField.java @@ -286,6 +286,7 @@ public class DateField extends AbstractField<Date> implements * Paints this component. Don't add a JavaDoc comment here, we use the * default documentation from implemented interface. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Adds the locale as attribute @@ -339,6 +340,7 @@ public class DateField extends AbstractField<Date> implements * comment here, we use the default documentation from implemented * interface. */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { if (!isReadOnly() @@ -729,20 +731,24 @@ public class DateField extends AbstractField<Date> implements return lenient; } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } diff --git a/src/com/vaadin/ui/DefaultFieldFactory.java b/src/com/vaadin/ui/DefaultFieldFactory.java index 9d096094e3..e17f08c1c6 100644 --- a/src/com/vaadin/ui/DefaultFieldFactory.java +++ b/src/com/vaadin/ui/DefaultFieldFactory.java @@ -35,6 +35,7 @@ public class DefaultFieldFactory implements FormFieldFactory, TableFieldFactory protected DefaultFieldFactory() { } + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { Class<?> type = item.getItemProperty(propertyId).getType(); @@ -43,6 +44,7 @@ public class DefaultFieldFactory implements FormFieldFactory, TableFieldFactory return field; } + @Override public Field<?> createField(Container container, Object itemId, Object propertyId, Component uiContext) { Property<?> containerProperty = container.getContainerProperty(itemId, diff --git a/src/com/vaadin/ui/DragAndDropWrapper.java b/src/com/vaadin/ui/DragAndDropWrapper.java index b623197a4c..bfb377b002 100644 --- a/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/src/com/vaadin/ui/DragAndDropWrapper.java @@ -214,10 +214,12 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, requestRepaint(); } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // TODO Remove once Vaadin6Component is no longer implemented } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute(VDragAndDropWrapper.DRAG_START_MODE, dragStartMode.ordinal()); @@ -249,6 +251,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, private DropHandler dropHandler; + @Override public DropHandler getDropHandler() { return dropHandler; } @@ -258,11 +261,13 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, requestRepaint(); } + @Override public TargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { return new WrapperTargetDetails(clientVariables); } + @Override public Transferable getTransferable(final Map<String, Object> rawVariables) { return new WrapperTransferable(this, rawVariables); } @@ -286,6 +291,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, private boolean listenProgressOfUploadedFile; + @Override public OutputStream getOutputStream() { if (file.getStreamVariable() == null) { return null; @@ -293,15 +299,18 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, return file.getStreamVariable().getOutputStream(); } + @Override public boolean listenProgress() { return file.getStreamVariable().listenProgress(); } + @Override public void onProgress(StreamingProgressEvent event) { file.getStreamVariable().onProgress( new ReceivingEventWrapper(event)); } + @Override public void streamingStarted(StreamingStartEvent event) { listenProgressOfUploadedFile = file.getStreamVariable() != null; if (listenProgressOfUploadedFile) { @@ -315,6 +324,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, event.disposeStreamVariable(); } + @Override public void streamingFinished(StreamingEndEvent event) { if (listenProgressOfUploadedFile) { file.getStreamVariable().streamingFinished( @@ -322,6 +332,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, } } + @Override public void streamingFailed(final StreamingErrorEvent event) { if (listenProgressOfUploadedFile) { file.getStreamVariable().streamingFailed( @@ -329,6 +340,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, } } + @Override public boolean isInterrupted() { return file.getStreamVariable().isInterrupted(); } @@ -348,14 +360,17 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, wrappedEvent = e; } + @Override public String getMimeType() { return file.getType(); } + @Override public String getFileName() { return file.getFileName(); } + @Override public long getContentLength() { return file.getFileSize(); } @@ -364,6 +379,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, return ProxyReceiver.this; } + @Override public Exception getException() { if (wrappedEvent instanceof StreamingErrorEvent) { return ((StreamingErrorEvent) wrappedEvent).getException(); @@ -371,6 +387,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, return null; } + @Override public long getBytesReceived() { return wrappedEvent.getBytesReceived(); } @@ -379,6 +396,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, * Calling this method has no effect. DD files are receive only once * anyway. */ + @Override public void disposeStreamVariable() { } diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java index 1bcd984666..8a75c0bb12 100644 --- a/src/com/vaadin/ui/Embedded.java +++ b/src/com/vaadin/ui/Embedded.java @@ -81,6 +81,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { private String altText; private EmbeddedServerRpc rpc = new EmbeddedServerRpc() { + @Override public void click(MouseEventDetails mouseDetails) { fireEvent(new ClickEvent(Embedded.this, mouseDetails)); } @@ -120,6 +121,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { /** * Invoked when the component state should be painted. */ + @Override public void paintContent(PaintTarget target) throws PaintException { switch (type) { @@ -521,6 +523,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { ClickEvent.class, listener); } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // TODO Remove once Vaadin6Component is no longer implemented } diff --git a/src/com/vaadin/ui/Field.java b/src/com/vaadin/ui/Field.java index 3a66db47b0..6dc40d192f 100644 --- a/src/com/vaadin/ui/Field.java +++ b/src/com/vaadin/ui/Field.java @@ -89,6 +89,7 @@ public interface Field<T> extends Component, BufferedValidatable, Property<T>, * * @return the Source Property of the event. */ + @Override public Property getProperty() { return (Property) getSource(); } diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java index 796ad17448..4b66346d86 100644 --- a/src/com/vaadin/ui/Form.java +++ b/src/com/vaadin/ui/Form.java @@ -126,6 +126,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * See e.g. DateField#notifyFormOfValidityChange(). */ private final ValueChangeListener fieldValueChangeListener = new ValueChangeListener() { + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { requestRepaint(); } @@ -194,12 +195,14 @@ public class Form extends AbstractField<Object> implements Item.Editor, } /* Documented in interface */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (ownActionManager != null) { ownActionManager.paintActions(null, target); } } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // Actions if (ownActionManager != null) { @@ -467,6 +470,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @see com.vaadin.data.Item#addItemProperty(Object, Property) */ + @Override public boolean addItemProperty(Object id, Property property) { // Checks inputs @@ -598,6 +602,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @see com.vaadin.data.Item#getItemProperty(Object) */ + @Override public Property<?> getItemProperty(Object id) { final Field<?> field = fields.get(id); if (field == null) { @@ -624,6 +629,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, } /* Documented in interface */ + @Override public Collection<?> getItemPropertyIds() { return Collections.unmodifiableCollection(propertyIds); } @@ -633,6 +639,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @see com.vaadin.data.Item#removeItemProperty(Object) */ + @Override public boolean removeItemProperty(Object id) { ownProperties.remove(id); @@ -687,6 +694,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, } /* Documented in the interface */ + @Override public Item getItemDataSource() { return itemDatasource; } @@ -701,6 +709,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, * * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item) */ + @Override public void setItemDataSource(Item newDataSource) { setItemDataSource(newDataSource, newDataSource != null ? newDataSource.getItemPropertyIds() @@ -1301,10 +1310,12 @@ public class Form extends AbstractField<Object> implements Item.Editor, return ownActionManager; } + @Override public void addActionHandler(Handler actionHandler) { getOwnActionManager().addActionHandler(actionHandler); } + @Override public void removeActionHandler(Handler actionHandler) { if (ownActionManager != null) { ownActionManager.removeActionHandler(actionHandler); @@ -1320,11 +1331,13 @@ public class Form extends AbstractField<Object> implements Item.Editor, } } + @Override public <T extends Action & com.vaadin.event.Action.Listener> void addAction( T action) { getOwnActionManager().addAction(action); } + @Override public <T extends Action & com.vaadin.event.Action.Listener> void removeAction( T action) { if (ownActionManager != null) { @@ -1332,6 +1345,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, } } + @Override public Iterator<Component> iterator() { return getComponentIterator(); } @@ -1345,6 +1359,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, int i = 0; + @Override public boolean hasNext() { if (i < getComponentCount()) { return true; @@ -1352,6 +1367,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, return false; } + @Override public Component next() { if (!hasNext()) { return null; @@ -1365,6 +1381,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, return null; } + @Override public void remove() { if (i == 1) { if (getLayout() != null) { @@ -1379,6 +1396,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, } } + @Override public Iterator<Component> getComponentIterator() { return new ComponentIterator(); } @@ -1395,6 +1413,7 @@ public class Form extends AbstractField<Object> implements Item.Editor, return count; } + @Override public boolean isComponentVisible(Component childComponent) { return true; }; diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java index 0ab729ce5c..0e9336e7ab 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/src/com/vaadin/ui/GridLayout.java @@ -58,6 +58,7 @@ public class GridLayout extends AbstractLayout implements private GridLayoutServerRpc rpc = new GridLayoutServerRpc() { + @Override public void layoutClick(MouseEventDetails mouseDetails, Connector clickedConnector) { fireEvent(LayoutClickEvent.createEvent(GridLayout.this, @@ -417,6 +418,7 @@ public class GridLayout extends AbstractLayout implements * * @return the Iterator of the components inside the layout. */ + @Override public Iterator<Component> getComponentIterator() { return Collections.unmodifiableCollection(components).iterator(); } @@ -427,10 +429,12 @@ public class GridLayout extends AbstractLayout implements * * @return the number of contained components */ + @Override public int getComponentCount() { return components.size(); } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // TODO Remove once Vaadin6Component is no longer implemented } @@ -443,6 +447,7 @@ public class GridLayout extends AbstractLayout implements * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // TODO refactor attribute names in future release. target.addAttribute("structuralChange", structuralChange); @@ -668,6 +673,7 @@ public class GridLayout extends AbstractLayout implements * @see com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com * .vaadin.ui.Component) */ + @Override public Alignment getComponentAlignment(Component childComponent) { Alignment alignment = componentToAlignment.get(childComponent); if (alignment == null) { @@ -1094,6 +1100,7 @@ public class GridLayout extends AbstractLayout implements } /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { // Gets the locations @@ -1143,6 +1150,7 @@ public class GridLayout extends AbstractLayout implements * @see com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com * .vaadin.ui.Component, int, int) */ + @Override public void setComponentAlignment(Component childComponent, int horizontalAlignment, int verticalAlignment) { componentToAlignment.put(childComponent, new Alignment( @@ -1150,6 +1158,7 @@ public class GridLayout extends AbstractLayout implements requestRepaint(); } + @Override public void setComponentAlignment(Component childComponent, Alignment alignment) { componentToAlignment.put(childComponent, alignment); @@ -1161,6 +1170,7 @@ public class GridLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean) */ + @Override public void setSpacing(boolean spacing) { getState().setSpacing(spacing); requestRepaint(); @@ -1171,6 +1181,7 @@ public class GridLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() */ + @Override public boolean isSpacing() { return getState().isSpacing(); } @@ -1388,12 +1399,14 @@ public class GridLayout extends AbstractLayout implements return null; } + @Override public void addListener(LayoutClickListener listener) { addListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener, LayoutClickListener.clickMethod); } + @Override public void removeListener(LayoutClickListener listener) { removeListener(LayoutClickEventHandler.LAYOUT_CLICK_EVENT_IDENTIFIER, LayoutClickEvent.class, listener); diff --git a/src/com/vaadin/ui/JavaScript.java b/src/com/vaadin/ui/JavaScript.java index 5905b56bfb..807ddceea1 100644 --- a/src/com/vaadin/ui/JavaScript.java +++ b/src/com/vaadin/ui/JavaScript.java @@ -41,6 +41,7 @@ public class JavaScript extends AbstractExtension { */ public JavaScript() { registerRpc(new JavaScriptCallbackRpc() { + @Override public void call(String name, JSONArray arguments) { JavaScriptCallback callback = callbacks.get(name); // TODO handle situation if name is not registered diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java index e98da384cf..e7ca26faf8 100644 --- a/src/com/vaadin/ui/Label.java +++ b/src/com/vaadin/ui/Label.java @@ -150,6 +150,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @return the value of the label. */ + @Override public String getValue() { if (getPropertyDataSource() == null) { // Use internal value if we are running without a data source @@ -166,6 +167,7 @@ public class Label extends AbstractComponent implements Property<String>, * @param newStringValue * the New value of the label. */ + @Override public void setValue(Object newStringValue) { if (newStringValue != null && newStringValue.getClass() != String.class) { throw new Converter.ConversionException("Value of type " @@ -197,6 +199,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @see com.vaadin.data.Property#getType() */ + @Override public Class<String> getType() { return String.class; } @@ -207,6 +210,7 @@ public class Label extends AbstractComponent implements Property<String>, * @return the data source property. * @see com.vaadin.data.Property.Viewer#getPropertyDataSource() */ + @Override public Property getPropertyDataSource() { return dataSource; } @@ -218,6 +222,7 @@ public class Label extends AbstractComponent implements Property<String>, * the new data source Property * @see com.vaadin.data.Property.Viewer#setPropertyDataSource(com.vaadin.data.Property) */ + @Override public void setPropertyDataSource(Property newDataSource) { // Stops listening the old data source changes if (dataSource != null @@ -314,6 +319,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() */ + @Override public Property getProperty() { return (Property) getSource(); } @@ -326,6 +332,7 @@ public class Label extends AbstractComponent implements Property<String>, * the Listener to be added. * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com.vaadin.data.Property.ValueChangeListener) */ + @Override public void addListener(Property.ValueChangeListener listener) { addListener(Label.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); } @@ -337,6 +344,7 @@ public class Label extends AbstractComponent implements Property<String>, * the Listener to be removed. * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com.vaadin.data.Property.ValueChangeListener) */ + @Override public void removeListener(Property.ValueChangeListener listener) { removeListener(Label.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); @@ -355,6 +363,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ + @Override public void valueChange(Property.ValueChangeEvent event) { // Update the internal value from the data source getState().setText(getValue()); @@ -399,6 +408,7 @@ public class Label extends AbstractComponent implements Property<String>, * less than, equal to, or greater than the specified object. * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(Label other) { String thisValue = getComparableValue(); diff --git a/src/com/vaadin/ui/Link.java b/src/com/vaadin/ui/Link.java index db0dc58e6b..fd105f3255 100644 --- a/src/com/vaadin/ui/Link.java +++ b/src/com/vaadin/ui/Link.java @@ -96,6 +96,7 @@ public class Link extends AbstractComponent implements Vaadin6Component { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (resource != null) { @@ -234,6 +235,7 @@ public class Link extends AbstractComponent implements Vaadin6Component { requestRepaint(); } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // TODO Remove once Vaadin6Component is no longer implemented } diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 1d5203bc6b..2d4513c5e3 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -48,33 +48,40 @@ public class LoginForm extends CustomComponent { private ApplicationResource loginPage = new ApplicationResource() { + @Override public Application getApplication() { return LoginForm.this.getApplication(); } + @Override public int getBufferSize() { return getLoginHTML().length; } + @Override public long getCacheTime() { return -1; } + @Override public String getFilename() { return "login"; } + @Override public DownloadStream getStream() { return new DownloadStream(new ByteArrayInputStream(getLoginHTML()), getMIMEType(), getFilename()); } + @Override public String getMIMEType() { return "text/html; charset=utf-8"; } }; private final RequestHandler requestHandler = new RequestHandler() { + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/src/com/vaadin/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java index f94bd7ea64..5b5dc13e20 100644 --- a/src/com/vaadin/ui/MenuBar.java +++ b/src/com/vaadin/ui/MenuBar.java @@ -39,6 +39,7 @@ public class MenuBar extends AbstractComponent implements Vaadin6Component { private boolean htmlContentAllowed; /** Paint (serialise) the component for the client. */ + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute(VMenuBar.OPEN_ROOT_MENU_ON_HOWER, openRootOnHover); @@ -125,6 +126,7 @@ public class MenuBar extends AbstractComponent implements Vaadin6Component { } /** Deserialize changes received from client. */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { Stack<MenuItem> items = new Stack<MenuItem>(); boolean found = false; diff --git a/src/com/vaadin/ui/OptionGroup.java b/src/com/vaadin/ui/OptionGroup.java index a4aaf7ec99..e3bcdd61b7 100644 --- a/src/com/vaadin/ui/OptionGroup.java +++ b/src/com/vaadin/ui/OptionGroup.java @@ -75,20 +75,24 @@ public class OptionGroup extends AbstractSelect implements } } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java index c339100cda..bb18780815 100644 --- a/src/com/vaadin/ui/Panel.java +++ b/src/com/vaadin/ui/Panel.java @@ -49,6 +49,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, protected ActionManager actionManager; private PanelServerRpc rpc = new PanelServerRpc() { + @Override public void click(MouseEventDetails mouseDetails) { fireEvent(new ClickEvent(Panel.this, mouseDetails)); } @@ -188,6 +189,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * com.vaadin.terminal.Vaadin6Component#paintContent(com.vaadin.terminal * .PaintTarget) */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (actionManager != null) { actionManager.paintActions(null, target); @@ -229,6 +231,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * @return the Iterator of the components inside the container. * @see com.vaadin.ui.ComponentContainer#getComponentIterator() */ + @Override public Iterator<Component> getComponentIterator() { return Collections.singleton((Component) content).iterator(); } @@ -239,6 +242,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map) */ + @Override @SuppressWarnings("unchecked") public void changeVariables(Object source, Map<String, Object> variables) { // Get new size @@ -277,6 +281,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.Scrollable#setScrollable(boolean) */ + @Override public int getScrollLeft() { return getState().getScrollLeft(); } @@ -286,6 +291,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.Scrollable#setScrollable(boolean) */ + @Override public int getScrollTop() { return getState().getScrollTop(); } @@ -295,6 +301,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.Scrollable#setScrollLeft(int) */ + @Override public void setScrollLeft(int scrollLeft) { if (scrollLeft < 0) { throw new IllegalArgumentException( @@ -309,6 +316,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.terminal.Scrollable#setScrollTop(int) */ + @Override public void setScrollTop(int scrollTop) { if (scrollTop < 0) { throw new IllegalArgumentException( @@ -319,6 +327,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, } /* Documented in superclass */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { content.replaceComponent(oldComponent, newComponent); @@ -329,6 +338,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.ui.ComponentContainer.ComponentAttachListener#componentAttachedToContainer(com.vaadin.ui.ComponentContainer.ComponentAttachEvent) */ + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { if (event.getContainer() == content) { fireComponentAttachEvent(event.getAttachedComponent()); @@ -340,6 +350,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.ui.ComponentContainer.ComponentDetachListener#componentDetachedFromContainer(com.vaadin.ui.ComponentContainer.ComponentDetachEvent) */ + @Override public void componentDetachedFromContainer(ComponentDetachEvent event) { if (event.getContainer() == content) { fireComponentDetachEvent(event.getDetachedComponent()); @@ -367,11 +378,13 @@ public class Panel extends AbstractComponentContainer implements Scrollable, return actionManager; } + @Override public <T extends Action & com.vaadin.event.Action.Listener> void addAction( T action) { getActionManager().addAction(action); } + @Override public <T extends Action & com.vaadin.event.Action.Listener> void removeAction( T action) { if (actionManager != null) { @@ -379,10 +392,12 @@ public class Panel extends AbstractComponentContainer implements Scrollable, } } + @Override public void addActionHandler(Handler actionHandler) { getActionManager().addActionHandler(actionHandler); } + @Override public void removeActionHandler(Handler actionHandler) { if (actionManager != null) { actionManager.removeActionHandler(actionHandler); @@ -429,6 +444,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /** * {@inheritDoc} */ + @Override public int getTabIndex() { return getState().getTabIndex(); } @@ -436,6 +452,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /** * {@inheritDoc} */ + @Override public void setTabIndex(int tabIndex) { getState().setTabIndex(tabIndex); requestRepaint(); @@ -455,6 +472,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * * @see com.vaadin.ui.ComponentContainer#getComponentCount() */ + @Override public int getComponentCount() { // This is so wrong... (#2924) return content.getComponentCount(); diff --git a/src/com/vaadin/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java index 911d926053..766181b50f 100644 --- a/src/com/vaadin/ui/PopupView.java +++ b/src/com/vaadin/ui/PopupView.java @@ -58,10 +58,12 @@ public class PopupView extends AbstractComponentContainer implements first = (component == null); } + @Override public boolean hasNext() { return !first; } + @Override public Component next() { if (!first) { first = true; @@ -71,6 +73,7 @@ public class PopupView extends AbstractComponentContainer implements } } + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -90,10 +93,12 @@ public class PopupView extends AbstractComponentContainer implements */ public PopupView(final java.lang.String small, final Component large) { this(new PopupView.Content() { + @Override public java.lang.String getMinimizedValueAsHTML() { return small; } + @Override public Component getPopupComponent() { return large; } @@ -223,6 +228,7 @@ public class PopupView extends AbstractComponentContainer implements * * @see com.vaadin.ui.ComponentContainer#getComponentIterator() */ + @Override public Iterator<Component> getComponentIterator() { return new SingleComponentIterator(visibleComponent); } @@ -233,6 +239,7 @@ public class PopupView extends AbstractComponentContainer implements * * @return the number of contained components (zero or one) */ + @Override public int getComponentCount() { return (visibleComponent != null ? 1 : 0); } @@ -280,6 +287,7 @@ public class PopupView extends AbstractComponentContainer implements * com.vaadin.ui.Component) * @throws UnsupportedOperationException */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) throws UnsupportedOperationException { @@ -307,6 +315,7 @@ public class PopupView extends AbstractComponentContainer implements * * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget) */ + @Override public void paintContent(PaintTarget target) throws PaintException { String html = content.getMinimizedValueAsHTML(); if (html == null) { @@ -331,6 +340,7 @@ public class PopupView extends AbstractComponentContainer implements * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { if (variables.containsKey("popupVisibility")) { setPopupVisible(((Boolean) variables.get("popupVisibility")) diff --git a/src/com/vaadin/ui/ProgressIndicator.java b/src/com/vaadin/ui/ProgressIndicator.java index 4d585cfdd7..fef54a267c 100644 --- a/src/com/vaadin/ui/ProgressIndicator.java +++ b/src/com/vaadin/ui/ProgressIndicator.java @@ -111,6 +111,7 @@ public class ProgressIndicator extends AbstractField<Number> implements * @throws PaintException * if the Paint Operation fails. */ + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("indeterminate", indeterminate); target.addAttribute("pollinginterval", pollingInterval); @@ -247,6 +248,7 @@ public class ProgressIndicator extends AbstractField<Number> implements return pollingInterval; } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // TODO Remove once Vaadin6Component is no longer implemented diff --git a/src/com/vaadin/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java index 16d4761b40..cec952926b 100644 --- a/src/com/vaadin/ui/RichTextArea.java +++ b/src/com/vaadin/ui/RichTextArea.java @@ -103,6 +103,7 @@ public class RichTextArea extends AbstractField<String> implements setCaption(caption); } + @Override public void paintContent(PaintTarget target) throws PaintException { if (selectAll) { target.addAttribute("selectAll", true); @@ -185,6 +186,7 @@ public class RichTextArea extends AbstractField<String> implements } } + @Override public void changeVariables(Object source, Map<String, Object> variables) { // Sets the text if (variables.containsKey("text") && !isReadOnly()) { diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java index 5398f11391..f60935c64b 100644 --- a/src/com/vaadin/ui/Select.java +++ b/src/com/vaadin/ui/Select.java @@ -677,10 +677,12 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering, super.requestRepaint(); } + @Override public void setFilteringMode(int filteringMode) { this.filteringMode = filteringMode; } + @Override public int getFilteringMode() { return filteringMode; } @@ -719,20 +721,24 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering, return columns; } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java index dc5dc0be98..94afe4e2bd 100644 --- a/src/com/vaadin/ui/Slider.java +++ b/src/com/vaadin/ui/Slider.java @@ -278,6 +278,7 @@ public class Slider extends AbstractField<Double> implements Vaadin6Component { super.setValue(newFieldValue); } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("min", min); @@ -307,6 +308,7 @@ public class Slider extends AbstractField<Double> implements Vaadin6Component { * @param source * @param variables */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { if (variables.containsKey("value")) { final Object value = variables.get("value"); diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java index 061809de67..c52e9394c0 100644 --- a/src/com/vaadin/ui/TabSheet.java +++ b/src/com/vaadin/ui/TabSheet.java @@ -109,6 +109,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, setImmediate(true); setCloseHandler(new CloseHandler() { + @Override public void onTabClose(TabSheet tabsheet, Component c) { tabsheet.removeComponent(c); } @@ -122,6 +123,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @return the unmodifiable Iterator of the tab content components */ + @Override public Iterator<Component> getComponentIterator() { return Collections.unmodifiableList(components).iterator(); } @@ -133,6 +135,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @return the number of contained components */ + @Override public int getComponentCount() { return components.size(); } @@ -366,6 +369,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (areTabsHidden()) { @@ -691,6 +695,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, // inherits javadoc + @Override public void changeVariables(Object source, Map<String, Object> variables) { if (variables.containsKey("selected")) { setSelectedTab(keyMapper.get((String) variables.get("selected"))); @@ -728,6 +733,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * {@inheritDoc} */ + @Override public void replaceComponent(Component oldComponent, Component newComponent) { if (selected == oldComponent) { @@ -1083,28 +1089,34 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * Returns the tab caption. Can never be null. */ + @Override public String getCaption() { return caption; } + @Override public void setCaption(String caption) { this.caption = caption; requestRepaint(); } + @Override public Resource getIcon() { return icon; } + @Override public void setIcon(Resource icon) { this.icon = icon; requestRepaint(); } + @Override public boolean isEnabled() { return enabled; } + @Override public void setEnabled(boolean enabled) { this.enabled = enabled; if (updateSelection()) { @@ -1113,10 +1125,12 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, requestRepaint(); } + @Override public boolean isVisible() { return visible; } + @Override public void setVisible(boolean visible) { this.visible = visible; if (updateSelection()) { @@ -1125,10 +1139,12 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, requestRepaint(); } + @Override public boolean isClosable() { return closable; } + @Override public void setClosable(boolean closable) { this.closable = closable; requestRepaint(); @@ -1138,24 +1154,29 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, } + @Override public String getDescription() { return description; } + @Override public void setDescription(String description) { this.description = description; requestRepaint(); } + @Override public ErrorMessage getComponentError() { return componentError; } + @Override public void setComponentError(ErrorMessage componentError) { this.componentError = componentError; requestRepaint(); } + @Override public Component getComponent() { for (Map.Entry<Component, Tab> entry : tabs.entrySet()) { if (entry.getValue() == this) { @@ -1165,11 +1186,13 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, return null; } + @Override public void setStyleName(String styleName) { this.styleName = styleName; requestRepaint(); } + @Override public String getStyleName() { return styleName; } @@ -1245,29 +1268,35 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, super.focus(); } + @Override public int getTabIndex() { return tabIndex; } + @Override public void setTabIndex(int tabIndex) { this.tabIndex = tabIndex; requestRepaint(); } + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index a1cc4f95fe..274d648d79 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -3681,6 +3681,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler) */ + @Override public void addActionHandler(Action.Handler actionHandler) { if (actionHandler != null) { @@ -3708,6 +3709,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler) */ + @Override public void removeActionHandler(Action.Handler actionHandler) { if (actionHandlers != null && actionHandlers.contains(actionHandler)) { @@ -4117,6 +4119,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object) */ + @Override public Object nextItemId(Object itemId) { return ((Container.Ordered) items).nextItemId(itemId); } @@ -4128,6 +4131,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object) */ + @Override public Object prevItemId(Object itemId) { return ((Container.Ordered) items).prevItemId(itemId); } @@ -4138,6 +4142,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#firstItemId() */ + @Override public Object firstItemId() { return ((Container.Ordered) items).firstItemId(); } @@ -4148,6 +4153,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#lastItemId() */ + @Override public Object lastItemId() { return ((Container.Ordered) items).lastItemId(); } @@ -4159,6 +4165,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object) */ + @Override public boolean isFirstId(Object itemId) { return ((Container.Ordered) items).isFirstId(itemId); } @@ -4170,6 +4177,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object) */ + @Override public boolean isLastId(Object itemId) { return ((Container.Ordered) items).isLastId(itemId); } @@ -4180,6 +4188,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) */ + @Override public Object addItemAfter(Object previousItemId) throws UnsupportedOperationException { Object itemId = ((Container.Ordered) items) @@ -4197,6 +4206,7 @@ public class Table extends AbstractSelect implements Action.Container, * java.lang.Object) */ + @Override public Item addItemAfter(Object previousItemId, Object newItemId) throws UnsupportedOperationException { Item item = ((Container.Ordered) items).addItemAfter(previousItemId, @@ -4290,6 +4300,7 @@ public class Table extends AbstractSelect implements Action.Container, * */ + @Override public void sort(Object[] propertyId, boolean[] ascending) throws UnsupportedOperationException { final Container c = getContainerDataSource(); @@ -4331,6 +4342,7 @@ public class Table extends AbstractSelect implements Action.Container, * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() */ + @Override public Collection<?> getSortableContainerPropertyIds() { final Container c = getContainerDataSource(); if (c instanceof Container.Sortable && isSortEnabled()) { @@ -4544,11 +4556,13 @@ public class Table extends AbstractSelect implements Action.Container, public abstract String getStyle(Object itemId, Object propertyId); } + @Override public void addListener(ItemClickListener listener) { addListener(VScrollTable.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener, ItemClickEvent.ITEM_CLICK_METHOD); } + @Override public void removeListener(ItemClickListener listener) { removeListener(VScrollTable.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener); @@ -4625,11 +4639,13 @@ public class Table extends AbstractSelect implements Action.Container, } + @Override public TableTransferable getTransferable(Map<String, Object> rawVariables) { TableTransferable transferable = new TableTransferable(rawVariables); return transferable; } + @Override public DropHandler getDropHandler() { return dropHandler; } @@ -4638,6 +4654,7 @@ public class Table extends AbstractSelect implements Action.Container, this.dropHandler = dropHandler; } + @Override public AbstractSelectTargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { return new AbstractSelectTargetDetails(clientVariables); @@ -4706,6 +4723,7 @@ public class Table extends AbstractSelect implements Action.Container, * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#accepts(com.vaadin * .event.dd.DragAndDropEvent) */ + @Override @SuppressWarnings("unchecked") public boolean accept(DragAndDropEvent dragEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent @@ -5381,10 +5399,12 @@ public class Table extends AbstractSelect implements Action.Container, super.setVisible(visible); } + @Override public Iterator<Component> iterator() { return getComponentIterator(); } + @Override public Iterator<Component> getComponentIterator() { if (visibleComponents == null) { Collection<Component> empty = Collections.emptyList(); @@ -5394,6 +5414,7 @@ public class Table extends AbstractSelect implements Action.Container, return visibleComponents.iterator(); } + @Override public boolean isComponentVisible(Component childComponent) { return true; } diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java index dacb3a2027..bde58c8b3c 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/src/com/vaadin/ui/Tree.java @@ -721,6 +721,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object) */ + @Override public boolean areChildrenAllowed(Object itemId) { return ((Container.Hierarchical) items).areChildrenAllowed(itemId); } @@ -730,6 +731,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#getChildren(Object) */ + @Override public Collection<?> getChildren(Object itemId) { return ((Container.Hierarchical) items).getChildren(itemId); } @@ -739,6 +741,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#getParent(Object) */ + @Override public Object getParent(Object itemId) { return ((Container.Hierarchical) items).getParent(itemId); } @@ -748,6 +751,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object) */ + @Override public boolean hasChildren(Object itemId) { return ((Container.Hierarchical) items).hasChildren(itemId); } @@ -757,6 +761,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#isRoot(Object) */ + @Override public boolean isRoot(Object itemId) { return ((Container.Hierarchical) items).isRoot(itemId); } @@ -766,6 +771,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.data.Container.Hierarchical#rootItemIds() */ + @Override public Collection<?> rootItemIds() { return ((Container.Hierarchical) items).rootItemIds(); } @@ -776,6 +782,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object, * boolean) */ + @Override public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) { final boolean success = ((Container.Hierarchical) items) .setChildrenAllowed(itemId, areChildrenAllowed); @@ -791,6 +798,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @see com.vaadin.data.Container.Hierarchical#setParent(java.lang.Object , * java.lang.Object) */ + @Override public boolean setParent(Object itemId, Object newParentId) { final boolean success = ((Container.Hierarchical) items).setParent( itemId, newParentId); @@ -1015,6 +1023,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler) */ + @Override public void addActionHandler(Action.Handler actionHandler) { if (actionHandler != null) { @@ -1036,6 +1045,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler) */ + @Override public void removeActionHandler(Action.Handler actionHandler) { if (actionHandlers != null && actionHandlers.contains(actionHandler)) { @@ -1150,11 +1160,13 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, private DropHandler dropHandler; + @Override public void addListener(ItemClickListener listener) { addListener(VTree.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener, ItemClickEvent.ITEM_CLICK_METHOD); } + @Override public void removeListener(ItemClickListener listener) { removeListener(VTree.ITEM_CLICK_EVENT_ID, ItemClickEvent.class, listener); @@ -1206,6 +1218,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, return super.removeItem(itemId); } + @Override public DropHandler getDropHandler() { return dropHandler; } @@ -1304,6 +1317,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @see * com.vaadin.event.dd.DropTarget#translateDropTargetDetails(java.util.Map) */ + @Override public TreeTargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { return new TreeTargetDetails(clientVariables); @@ -1371,6 +1385,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.vaadin.event.dd.DragSource#getTransferable(java.util.Map) */ + @Override public Transferable getTransferable(Map<String, Object> payload) { TreeTransferable transferable = new TreeTransferable(this, payload); // updating drag source variables @@ -1418,6 +1433,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#accepts(com.vaadin * .event.dd.DragAndDropEvent) */ + @Override public boolean accept(DragAndDropEvent dragEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent .getTargetDetails(); @@ -1541,6 +1557,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, this.depthToCheck = depthToCheck; } + @Override public boolean accept(DragAndDropEvent dragEvent) { try { TreeTargetDetails eventDetails = (TreeTargetDetails) dragEvent diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java index 3294f6fab0..6132b652f7 100644 --- a/src/com/vaadin/ui/TreeTable.java +++ b/src/com/vaadin/ui/TreeTable.java @@ -82,6 +82,7 @@ public class TreeTable extends Table implements Hierarchical { * scalability with some container implementations. */ + @Override public int getDepth(Object itemId) { int depth = 0; Hierarchical hierarchicalContainer = getContainerDataSource(); @@ -92,6 +93,7 @@ public class TreeTable extends Table implements Hierarchical { return depth; } + @Override public void containerItemSetChange(ItemSetChangeEvent event) { } @@ -110,44 +112,54 @@ public class TreeTable extends Table implements Hierarchical { return (Collapsible) getContainerDataSource(); } + @Override public void toggleChildVisibility(Object itemId) { c().setCollapsed(itemId, !c().isCollapsed(itemId)); } + @Override public boolean isNodeOpen(Object itemId) { return !c().isCollapsed(itemId); } + @Override public int size() { return TreeTable.super.size(); } + @Override public Object getIdByIndex(int index) { return TreeTable.super.getIdByIndex(index); } + @Override public int indexOfId(Object id) { return TreeTable.super.indexOfId(id); } + @Override public boolean isLastId(Object itemId) { // using the default impl return TreeTable.super.isLastId(itemId); } + @Override public Object lastItemId() { // using the default impl return TreeTable.super.lastItemId(); } + @Override public Object nextItemId(Object itemId) { return TreeTable.super.nextItemId(itemId); } + @Override public Object prevItemId(Object itemId) { return TreeTable.super.prevItemId(itemId); } + @Override public Collection<?> getItemIds() { return TreeTable.super.getItemIds(); } @@ -165,18 +177,22 @@ public class TreeTable extends Table implements Hierarchical { private final HashSet<Object> openItems = new HashSet<Object>(); + @Override public boolean isNodeOpen(Object itemId) { return openItems.contains(itemId); } + @Override public int size() { return getPreOrder().size(); } + @Override public Collection<Object> getItemIds() { return Collections.unmodifiableCollection(getPreOrder()); } + @Override public boolean isLastId(Object itemId) { if (itemId == null) { return false; @@ -185,6 +201,7 @@ public class TreeTable extends Table implements Hierarchical { return itemId.equals(lastItemId()); } + @Override public Object lastItemId() { if (getPreOrder().size() > 0) { return getPreOrder().get(getPreOrder().size() - 1); @@ -193,6 +210,7 @@ public class TreeTable extends Table implements Hierarchical { } } + @Override public Object nextItemId(Object itemId) { int indexOf = getPreOrder().indexOf(itemId); if (indexOf == -1) { @@ -206,6 +224,7 @@ public class TreeTable extends Table implements Hierarchical { } } + @Override public Object prevItemId(Object itemId) { int indexOf = getPreOrder().indexOf(itemId); indexOf--; @@ -216,6 +235,7 @@ public class TreeTable extends Table implements Hierarchical { } } + @Override public void toggleChildVisibility(Object itemId) { boolean removed = openItems.remove(itemId); if (!removed) { @@ -265,10 +285,12 @@ public class TreeTable extends Table implements Hierarchical { } + @Override public int indexOfId(Object id) { return getPreOrder().indexOf(id); } + @Override public Object getIdByIndex(int index) { return getPreOrder().get(index); } @@ -610,36 +632,44 @@ public class TreeTable extends Table implements Hierarchical { return getContainerStrategy().getItemIds(); } + @Override public boolean areChildrenAllowed(Object itemId) { return getContainerDataSource().areChildrenAllowed(itemId); } + @Override public Collection<?> getChildren(Object itemId) { return getContainerDataSource().getChildren(itemId); } + @Override public Object getParent(Object itemId) { return getContainerDataSource().getParent(itemId); } + @Override public boolean hasChildren(Object itemId) { return getContainerDataSource().hasChildren(itemId); } + @Override public boolean isRoot(Object itemId) { return getContainerDataSource().isRoot(itemId); } + @Override public Collection<?> rootItemIds() { return getContainerDataSource().rootItemIds(); } + @Override public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) throws UnsupportedOperationException { return getContainerDataSource().setChildrenAllowed(itemId, areChildrenAllowed); } + @Override public boolean setParent(Object itemId, Object newParentId) throws UnsupportedOperationException { return getContainerDataSource().setParent(itemId, newParentId); diff --git a/src/com/vaadin/ui/Upload.java b/src/com/vaadin/ui/Upload.java index 4dff71e45b..9d533b67f6 100644 --- a/src/com/vaadin/ui/Upload.java +++ b/src/com/vaadin/ui/Upload.java @@ -122,6 +122,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map<String, Object> variables) { if (variables.containsKey("pollForStart")) { int id = (Integer) variables.get("pollForStart"); @@ -141,6 +142,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (notStarted) { target.addAttribute("notStarted", true); @@ -782,6 +784,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * * @see com.vaadin.ui.Component.Focusable#getTabIndex() */ + @Override public int getTabIndex() { return tabIndex; } @@ -791,6 +794,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * * @see com.vaadin.ui.Component.Focusable#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { this.tabIndex = tabIndex; } @@ -974,20 +978,24 @@ public class Upload extends AbstractComponent implements Component.Focusable, streamVariable = new com.vaadin.terminal.StreamVariable() { private StreamingStartEvent lastStartedEvent; + @Override public boolean listenProgress() { return (progressListeners != null && !progressListeners .isEmpty()); } + @Override public void onProgress(StreamingProgressEvent event) { fireUpdateProgress(event.getBytesReceived(), event.getContentLength()); } + @Override public boolean isInterrupted() { return interrupted; } + @Override public OutputStream getOutputStream() { OutputStream receiveUpload = receiver.receiveUpload( lastStartedEvent.getFileName(), @@ -996,6 +1004,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, return receiveUpload; } + @Override public void streamingStarted(StreamingStartEvent event) { startUpload(); contentLength = event.getContentLength(); @@ -1003,6 +1012,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, lastStartedEvent = event; } + @Override public void streamingFinished(StreamingEndEvent event) { fireUploadSuccess(event.getFileName(), event.getMimeType(), event.getContentLength()); @@ -1010,6 +1020,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, requestRepaint(); } + @Override public void streamingFailed(StreamingErrorEvent event) { Exception exception = event.getException(); if (exception instanceof NoInputStreamException) { diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java index e24e62236f..56a9bc0337 100644 --- a/src/com/vaadin/ui/Window.java +++ b/src/com/vaadin/ui/Window.java @@ -60,6 +60,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, private WindowServerRpc rpc = new WindowServerRpc() { + @Override public void click(MouseEventDetails mouseDetails) { fireEvent(new ClickEvent(Window.this, mouseDetails)); } @@ -797,11 +798,13 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, * @see com.vaadin.event.FieldEvents.FocusNotifier#addListener(com.vaadin.event.FieldEvents.FocusListener) */ + @Override public void addListener(FocusListener listener) { addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener, FocusListener.focusMethod); } + @Override public void removeListener(FocusListener listener) { removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener); } @@ -814,11 +817,13 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, * @see com.vaadin.event.FieldEvents.BlurNotifier#addListener(com.vaadin.event.FieldEvents.BlurListener) */ + @Override public void addListener(BlurListener listener) { addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener, BlurListener.blurMethod); } + @Override public void removeListener(BlurListener listener) { removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener); } diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java index 6cbe675fa1..d703fb0364 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java @@ -62,6 +62,7 @@ public abstract class AbstractContainerTest extends TestCase { protected static class ItemSetChangeCounter extends AbstractEventCounter implements ItemSetChangeListener { + @Override public void containerItemSetChange(ItemSetChangeEvent event) { increment(); } diff --git a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java b/tests/server-side/com/vaadin/data/util/BeanContainerTest.java index d9fa8d896e..9037e303a8 100644 --- a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/BeanContainerTest.java @@ -18,6 +18,7 @@ public class BeanContainerTest extends AbstractBeanContainerTest { protected static class PersonNameResolver implements BeanIdResolver<String, Person> { + @Override public String getIdForBean(Person bean) { return bean != null ? bean.getName() : null; } @@ -27,6 +28,7 @@ public class BeanContainerTest extends AbstractBeanContainerTest { protected static class NullResolver implements BeanIdResolver<String, Person> { + @Override public String getIdForBean(Person bean) { return null; } @@ -332,6 +334,7 @@ public class BeanContainerTest extends AbstractBeanContainerTest { container .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTest.Person>() { + @Override public String getIdForBean(Person bean) { return bean.getName(); } diff --git a/tests/server-side/com/vaadin/data/util/BeanItemTest.java b/tests/server-side/com/vaadin/data/util/BeanItemTest.java index 51e11260f5..e1ad75796c 100644 --- a/tests/server-side/com/vaadin/data/util/BeanItemTest.java +++ b/tests/server-side/com/vaadin/data/util/BeanItemTest.java @@ -127,6 +127,7 @@ public class BeanItemTest extends TestCase { public void setSub(int i); + @Override public int getOverride(); public void setOverride(int i); diff --git a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java b/tests/server-side/com/vaadin/data/util/TestContainerSorting.java index 9e69b94fbb..497699605a 100644 --- a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java +++ b/tests/server-side/com/vaadin/data/util/TestContainerSorting.java @@ -205,6 +205,7 @@ public class TestContainerSorting extends TestCase { public class MyObject implements Comparable<MyObject> { private String data; + @Override public int compareTo(MyObject o) { if (o == null) { return 1; diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java index 60894dbe6f..9e0558a122 100644 --- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java +++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java @@ -176,11 +176,13 @@ public class TestHierarchicalContainer extends // Dummy filter that does not remove any items c.addContainerFilter(new Filter() { + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { return true; } + @Override public boolean appliesToProperty(Object propertyId) { return true; } diff --git a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java b/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java index efc31f0bd4..6f96c3a51a 100644 --- a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java +++ b/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java @@ -24,22 +24,27 @@ public abstract class AbstractFilterTest<FILTERTYPE extends Filter> extends protected static class NullProperty implements Property<String> { + @Override public String getValue() { return null; } + @Override public void setValue(Object newValue) throws ReadOnlyException { throw new ReadOnlyException(); } + @Override public Class<String> getType() { return String.class; } + @Override public boolean isReadOnly() { return true; } + @Override public void setReadOnly(boolean newStatus) { // do nothing } @@ -60,11 +65,13 @@ public abstract class AbstractFilterTest<FILTERTYPE extends Filter> extends this.propertyId = propertyId; } + @Override public boolean passesFilter(Object itemId, Item item) throws UnsupportedOperationException { return this.item == item; } + @Override public boolean appliesToProperty(Object propertyId) { return this.propertyId != null ? this.propertyId.equals(propertyId) : true; diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java index c273bbf590..6649bc16e8 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java @@ -323,6 +323,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1132,6 +1133,7 @@ public class SQLContainerTest { delegate.storeRow(EasyMock.isA(Connection.class), EasyMock.isA(RowItem.class))) .andAnswer(new IAnswer<Integer>() { + @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; @@ -1163,6 +1165,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1231,6 +1234,7 @@ public class SQLContainerTest { delegate.storeRow(EasyMock.isA(Connection.class), EasyMock.isA(RowItem.class))) .andAnswer(new IAnswer<Integer>() { + @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; @@ -1262,6 +1266,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1337,6 +1342,7 @@ public class SQLContainerTest { delegate.removeRow(EasyMock.isA(Connection.class), EasyMock.isA(RowItem.class))) .andAnswer(new IAnswer<Boolean>() { + @Override public Boolean answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; @@ -1352,6 +1358,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1414,6 +1421,7 @@ public class SQLContainerTest { delegate.storeRow(EasyMock.isA(Connection.class), EasyMock.isA(RowItem.class))) .andAnswer(new IAnswer<Integer>() { + @Override public Integer answer() throws Throwable { Connection conn = (Connection) EasyMock .getCurrentArguments()[0]; @@ -1432,6 +1440,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1644,6 +1653,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setOrderBy(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<OrderBy> orders = (List<OrderBy>) EasyMock .getCurrentArguments()[0]; @@ -1655,6 +1665,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1756,6 +1767,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setOrderBy(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<OrderBy> orders = (List<OrderBy>) EasyMock .getCurrentArguments()[0]; @@ -1767,6 +1779,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1861,6 +1874,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -1872,6 +1886,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1882,6 +1897,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); @@ -1931,6 +1947,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -1942,6 +1959,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -1952,6 +1970,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); @@ -2000,6 +2019,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -2011,6 +2031,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -2021,6 +2042,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); StringBuffer query = new StringBuffer( @@ -2069,6 +2091,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -2080,6 +2103,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -2090,6 +2114,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); @@ -2145,6 +2170,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -2156,6 +2182,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -2166,6 +2193,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); @@ -2221,6 +2249,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -2232,6 +2261,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -2242,6 +2272,7 @@ public class SQLContainerTest { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); @@ -2323,6 +2354,7 @@ public class SQLContainerTest { EasyMock.expectLastCall().anyTimes(); delegate.setOrderBy(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<OrderBy> orders = (List<OrderBy>) EasyMock .getCurrentArguments()[0]; @@ -2334,6 +2366,7 @@ public class SQLContainerTest { EasyMock.expect( delegate.getQueryString(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<String>() { + @Override public String answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java index 75ab455678..a12786f13a 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java @@ -64,6 +64,7 @@ public class TicketTests { EasyMock.expectLastCall().anyTimes(); delegate.setFilters(EasyMock.isA(List.class)); EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() { + @Override public Object answer() throws Throwable { List<Filter> orders = (List<Filter>) EasyMock .getCurrentArguments()[0]; @@ -75,6 +76,7 @@ public class TicketTests { EasyMock.expect( delegate.getQueryStatement(EasyMock.anyInt(), EasyMock.anyInt())) .andAnswer(new IAnswer<StatementHelper>() { + @Override public StatementHelper answer() throws Throwable { Object[] args = EasyMock.getCurrentArguments(); int offset = (Integer) (args[0]); @@ -85,6 +87,7 @@ public class TicketTests { }).anyTimes(); EasyMock.expect(delegate.getCountStatement()) .andAnswer(new IAnswer<StatementHelper>() { + @Override @SuppressWarnings("deprecation") public StatementHelper answer() throws Throwable { StatementHelper sh = new StatementHelper(); diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java index 3ee260245a..324899e373 100644 --- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java +++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java @@ -22,6 +22,7 @@ public class MockInitialContextFactory implements InitialContextFactory { mockCtx = ctx; } + @Override public Context getInitialContext(java.util.Hashtable<?, ?> environment) throws NamingException { if (mockCtx == null) { diff --git a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java b/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java index 7e45ea50d7..38fca09157 100644 --- a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java +++ b/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java @@ -46,29 +46,35 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase public class DummyServletConfig implements ServletConfig { // public DummyServletConfig(Map<String,String> initParameters, ) + @Override public String getInitParameter(String name) { // TODO Auto-generated method stub return null; } + @Override public Enumeration<Object> getInitParameterNames() { return new Enumeration<Object>() { + @Override public boolean hasMoreElements() { return false; } + @Override public Object nextElement() { return null; } }; } + @Override public ServletContext getServletContext() { // TODO Auto-generated method stub return null; } + @Override public String getServletName() { // TODO Auto-generated method stub return null; diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/tests/server-side/com/vaadin/tests/VaadinClasses.java index 0ee193e8f1..2f937bf58d 100644 --- a/tests/server-side/com/vaadin/tests/VaadinClasses.java +++ b/tests/server-side/com/vaadin/tests/VaadinClasses.java @@ -164,6 +164,7 @@ public class VaadinClasses { Collections.sort(classes, new Comparator<Class<? extends T>>() { + @Override public int compare(Class<? extends T> o1, Class<? extends T> o2) { return o1.getName().compareTo(o2.getName()); } diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java index 4bd9cf0cf7..19a470d816 100644 --- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java +++ b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java @@ -16,20 +16,24 @@ public class ConverterFactory extends TestCase { public static class ConvertTo42 implements Converter<String, Integer> { + @Override public Integer convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { return 42; } + @Override public String convertToPresentation(Integer value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { return "42"; } + @Override public Class<Integer> getModelType() { return Integer.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java index 9906990165..f02e5d2932 100644 --- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java +++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java @@ -148,6 +148,7 @@ public class SourceFileChecker extends TestCase { } abstract class FileContentsValidator implements FileValidator { + @Override public void validateFile(File f) throws Exception { FileInputStream fis = new FileInputStream(f); String contents = IOUtils.toString(fis); diff --git a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java b/tests/server-side/com/vaadin/tests/server/TestEventRouter.java index dc388a66ac..a8f5039042 100644 --- a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java +++ b/tests/server-side/com/vaadin/tests/server/TestEventRouter.java @@ -15,9 +15,11 @@ public class TestEventRouter extends TestCase { final ValueChangeListener outer = new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { ValueChangeListener inner = new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { innerListenerCalls++; System.out.println("The inner listener was called"); diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java index 8cc26a5c7f..b567617fdd 100644 --- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java +++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java @@ -46,6 +46,7 @@ public class TransactionListenersConcurrency extends TestCase { for (int i = 0; i < 5; i++) { Thread t = new Thread(new Runnable() { + @Override public void run() { Application app = new Application() { @@ -98,6 +99,7 @@ public class TransactionListenersConcurrency extends TestCase { threads.add(t); t.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { + @Override public void uncaughtException(Thread t, Throwable e) { e = e.getCause(); exceptions.add(e); @@ -163,6 +165,7 @@ public class TransactionListenersConcurrency extends TestCase { this.delay = delay; } + @Override public void transactionStart(Application application, Object transactionData) { try { @@ -173,6 +176,7 @@ public class TransactionListenersConcurrency extends TestCase { } + @Override public void transactionEnd(Application application, Object transactionData) { try { diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java index 446228583a..57af748247 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java @@ -37,18 +37,22 @@ public class AbstractFieldValueConversions extends TestCase { TextField tf = new TextField(); tf.setConverter(new Converter<String, String>() { + @Override public String convertToModel(String value, Locale locale) { return value; } + @Override public String convertToPresentation(String value, Locale locale) { return value; } + @Override public Class<String> getModelType() { return String.class; } + @Override public Class<String> getPresentationType() { return String.class; } @@ -67,19 +71,23 @@ public class AbstractFieldValueConversions extends TestCase { TextField tf = new TextField(); tf.setConverter(new Converter<String, Integer>() { + @Override public Integer convertToModel(String value, Locale locale) { throw new ConversionException("Failed"); } + @Override public String convertToPresentation(Integer value, Locale locale) { throw new ConversionException("Failed"); } + @Override public Class<Integer> getModelType() { // TODO Auto-generated method stub return null; } + @Override public Class<String> getPresentationType() { // TODO Auto-generated method stub return null; @@ -112,6 +120,7 @@ public class AbstractFieldValueConversions extends TestCase { CheckBox cb = new CheckBox(); cb.setConverter(new Converter<Boolean, Boolean>() { + @Override public Boolean convertToModel(Boolean value, Locale locale) { // value from a CheckBox should never be null as long as it is // not set to null (handled by conversion below). @@ -119,6 +128,7 @@ public class AbstractFieldValueConversions extends TestCase { return value; } + @Override public Boolean convertToPresentation(Boolean value, Locale locale) { // Datamodel -> field if (value == null) { @@ -128,10 +138,12 @@ public class AbstractFieldValueConversions extends TestCase { return value; } + @Override public Class<Boolean> getModelType() { return Boolean.class; } + @Override public Class<Boolean> getPresentationType() { return Boolean.class; } diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index 94385700d8..f66f523770 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -60,15 +60,18 @@ public class RemoveListenersOnDetach { }; Property property = new AbstractProperty() { + @Override public Object getValue() { return null; } + @Override public void setValue(Object newValue) throws ReadOnlyException, ConversionException { fireValueChange(); } + @Override public Class<?> getType() { return String.class; } diff --git a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java b/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java index 464d131996..4fe499a0a0 100644 --- a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java +++ b/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java @@ -38,6 +38,7 @@ public class ButtonClick { private Button getButton() { Button b = new Button(); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent ev) { clicked = true; } diff --git a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java b/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java index a0dadf8cc6..f304315ebc 100644 --- a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java +++ b/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java @@ -87,6 +87,7 @@ public class MenuBarIds extends TestCase implements Command { } } + @Override public void menuSelected(MenuItem selectedItem) { assertNull("lastSelectedItem was not cleared before selecting an item", lastSelectedItem); diff --git a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java b/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java index c6af98a873..bd6dd6c7b1 100644 --- a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java +++ b/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java @@ -57,6 +57,7 @@ public class TextFieldWithPropertyFormatter extends TestCase { listener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { listenerCalled++; assertEquals(1, listenerCalled); diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java b/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java index 49610ff293..4984cf161b 100644 --- a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java @@ -121,12 +121,14 @@ public class TestListeners extends TestCase implements ExpandListener, assertEquals(0, collapseCalled); } + @Override public void nodeExpand(ExpandEvent event) { lastExpanded = event.getItemId(); expandCalled++; } + @Override public void nodeCollapse(CollapseEvent event) { lastCollapsed = event.getItemId(); collapseCalled++; diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java index 7423ba8669..e1435ea2ab 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -47,14 +47,17 @@ public class AttachDetachWindow { windowDetachCalled = true; } + @Override public boolean attachCalled() { return windowAttachCalled; } + @Override public boolean detachCalled() { return windowDetachCalled; } + @Override public TestContent getTestContent() { return testContent; } @@ -111,14 +114,17 @@ public class AttachDetachWindow { // Do nothing } + @Override public boolean attachCalled() { return rootAttachCalled; } + @Override public boolean detachCalled() { return rootDetachCalled; } + @Override public TestContent getTestContent() { return testContent; } diff --git a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java b/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java index 1e01d9a55f..3ba1c4c7f1 100644 --- a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java +++ b/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java @@ -46,6 +46,7 @@ public class ComponentAttachDetachListenerTest extends TestCase { private ComponentPosition componentPosition = null; private class MyAttachListener implements ComponentAttachListener { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { attachCounter++; attachedComponent = event.getAttachedComponent(); @@ -75,6 +76,7 @@ public class ComponentAttachDetachListenerTest extends TestCase { } private class MyDetachListener implements ComponentDetachListener { + @Override public void componentDetachedFromContainer(ComponentDetachEvent event) { detachCounter++; detachedComponent = event.getDetachedComponent(); diff --git a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java index fc0d1b60a0..58bc2c4d4c 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java @@ -15,6 +15,7 @@ public class ClassBasedViewProviderTest extends TestCase { public static class TestView extends Label implements View { public String parameters = null; + @Override public void navigateTo(String parameters) { this.parameters = parameters; } diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java index a7eb2e12fd..0507db6700 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java @@ -27,16 +27,19 @@ public class NavigatorTest extends TestCase { // TODO test listeners blocking navigation, multiple listeners public static class NullDisplay implements ViewDisplay { + @Override public void showView(View view) { // do nothing } } public static class NullFragmentManager implements FragmentManager { + @Override public String getFragment() { return null; } + @Override public void setFragment(String fragment) { // do nothing } @@ -45,6 +48,7 @@ public class NavigatorTest extends TestCase { public static class TestDisplay implements ViewDisplay { private View currentView; + @Override public void showView(View view) { currentView = view; } @@ -118,6 +122,7 @@ public class NavigatorTest extends TestCase { } } + @Override public boolean isViewChangeAllowed(ViewChangeEvent event) { if (referenceEvents.isEmpty()) { fail("Unexpected call to isViewChangeAllowed()"); @@ -136,6 +141,7 @@ public class NavigatorTest extends TestCase { return returnValue; } + @Override public void navigatorViewChanged(ViewChangeEvent event) { if (referenceEvents.isEmpty()) { fail("Unexpected call to navigatorViewChanged()"); diff --git a/tests/testbench/com/vaadin/launcher/DemoLauncher.java b/tests/testbench/com/vaadin/launcher/DemoLauncher.java index 2b2f73abd6..91cdd343c7 100644 --- a/tests/testbench/com/vaadin/launcher/DemoLauncher.java +++ b/tests/testbench/com/vaadin/launcher/DemoLauncher.java @@ -75,6 +75,7 @@ public class DemoLauncher { * dispatch thread. */ java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { try { openServerControlDialog(url); @@ -125,6 +126,7 @@ public class DemoLauncher { // List for close verify buttons final ActionListener buttonListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == okButton) { System.exit(0); diff --git a/tests/testbench/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java index 4352072ccf..b8a007fc1f 100644 --- a/tests/testbench/com/vaadin/tests/Components.java +++ b/tests/testbench/com/vaadin/tests/Components.java @@ -137,6 +137,7 @@ public class Components extends Application.LegacyApplication { naviTree = new Tree(); naviTree.setItemStyleGenerator(new ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Class<?> cls = (Class<?>) itemId; if (!isAbstract(cls)) { @@ -182,6 +183,7 @@ public class Components extends Application.LegacyApplication { naviTree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { Class<?> cls = (Class<?>) event.getItemId(); if (!isAbstract(cls)) { diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java index 73282cc1fb..1c1adbb80d 100644 --- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java @@ -45,6 +45,7 @@ public class CustomLayoutDemo extends com.vaadin.Application.LegacyApplication private final Button loginButton = new Button("Login", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { loginClicked(); } @@ -131,6 +132,7 @@ public class CustomLayoutDemo extends com.vaadin.Application.LegacyApplication * Handle all menu events. Updates body panel contents if menu item is * clicked. */ + @Override public void componentEvent(Event event) { // Check if event occured at fsTree component if (event.getSource() == menu) { diff --git a/tests/testbench/com/vaadin/tests/FocusingComponents.java b/tests/testbench/com/vaadin/tests/FocusingComponents.java index e74a935830..f63989fafb 100644 --- a/tests/testbench/com/vaadin/tests/FocusingComponents.java +++ b/tests/testbench/com/vaadin/tests/FocusingComponents.java @@ -54,6 +54,7 @@ public class FocusingComponents extends CustomComponent { Button focus = new Button("focus"); focus.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.focus(); } diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/tests/testbench/com/vaadin/tests/ListenerOrder.java index 797561eb00..7f136b10ed 100644 --- a/tests/testbench/com/vaadin/tests/ListenerOrder.java +++ b/tests/testbench/com/vaadin/tests/ListenerOrder.java @@ -59,6 +59,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication b1.removeListener(b1Listener); // remove non-existing listener b1.removeListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { } }); @@ -107,6 +108,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication return listener; } + @Override public void buttonClick(ClickEvent event) { System.out.println("ClickEvent from Test1"); s1.addItem("new item " + System.currentTimeMillis()); @@ -133,6 +135,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication System.out.println("Created listener " + name + ", id=" + count); } + @Override public void buttonClick(ClickEvent event) { String msg = "ClickEvent from MyClickListener " + name + ", id=" + count; @@ -142,18 +145,21 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication } + @Override public void containerPropertySetChange(PropertySetChangeEvent event) { String msg = "containerPropertySetChange from " + this; System.out.println(msg); getMainWindow().showNotification(msg); } + @Override public void containerItemSetChange(ItemSetChangeEvent event) { String msg = "containerItemSetChange from " + this; System.out.println(msg); getMainWindow().showNotification(msg); } + @Override public void valueChange(ValueChangeEvent event) { String msg = "valueChange from " + this; System.out.println(msg); diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java index c848803642..340571cd37 100644 --- a/tests/testbench/com/vaadin/tests/ModalWindow.java +++ b/tests/testbench/com/vaadin/tests/ModalWindow.java @@ -54,6 +54,7 @@ public class ModalWindow extends com.vaadin.Application.LegacyApplication } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == reopen) { openSubWindow(); diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 6a561dd861..f1b9ce2ff1 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -26,6 +26,7 @@ public class NativeWindowing extends Application.LegacyApplication { main.addComponent(new Button("Add new subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("sw " + System.currentTimeMillis()); @@ -40,6 +41,7 @@ public class NativeWindowing extends Application.LegacyApplication { final Button closebutton = new Button("Close " + w.getCaption(), new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.removeWindow(w); } @@ -78,6 +80,7 @@ public class NativeWindowing extends Application.LegacyApplication { main.addComponent(new Button( "Open a currently uncreated application level window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { main.open( @@ -114,6 +117,7 @@ public class NativeWindowing extends Application.LegacyApplication { ww.addComponent(new Button("Click me", new Button.ClickListener() { int state = 0; + @Override public void buttonClick(ClickEvent event) { ww.addComponent(new Label("Button clicked " + (++state) + " times")); diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java index 93e6290ee4..af73bdc652 100644 --- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java +++ b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java @@ -60,6 +60,7 @@ public class OrderedLayoutSwapComponents extends CustomComponent { ol.addComponent(new Label(name)); up = new Button("up"); up.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int newIndex = order.indexOf(MyComponent.this) - 1; MyComponent old = order.get(newIndex); @@ -77,6 +78,7 @@ public class OrderedLayoutSwapComponents extends CustomComponent { down = new Button("down"); down.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int newIndex = order.indexOf(MyComponent.this) + 1; MyComponent old = order.get(newIndex); diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index 8d940101c3..1e8ca53875 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -93,6 +93,7 @@ public class Parameters extends com.vaadin.Application.LegacyApplication main.setContent(layout); } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index b3f232f24d..be066269c3 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -39,6 +39,7 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { main.addComponent(new Button("click when rendered", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { endTest(); } @@ -47,6 +48,7 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { main.addComponent(new Button( "Click for layout repaint (cached components)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { testContainer.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java index 882b776d5d..0cd7a5c67d 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -39,6 +39,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { addInfo(); Button b = new Button("start test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { startTest(); } @@ -46,6 +47,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { b.setDescription("Push this button to start test. A test label will be rendered above existing components."); main.addComponent(b); b = new Button("end test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { endTest(); } diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java index bd40a7fb7b..9cd27e9d5c 100644 --- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java @@ -73,6 +73,7 @@ public class ScrollbarStressTest extends Application.LegacyApplication { height.setValue("100%"); final Button set = new Button("Set", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getTable = testComponent.getValue().equals("Table"); diff --git a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java index 9c2703822e..87ab7fa1d4 100644 --- a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java +++ b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java @@ -37,6 +37,7 @@ public class StressComponentsInTable extends CustomComponent { } content.add(new Button("b" + i, new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); System.out.println(b.getCaption() + " click: " diff --git a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java index fa7edc3a45..3f87f2fe4c 100644 --- a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java +++ b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java @@ -45,6 +45,7 @@ public class TableChangingDatasource extends CustomComponent implements } + @Override public void buttonClick(ClickEvent event) { int i = mode % 4; t.setContainerDataSource(ta[i].getContainerDataSource()); diff --git a/tests/testbench/com/vaadin/tests/TableSelectTest.java b/tests/testbench/com/vaadin/tests/TableSelectTest.java index 62070c4b97..823bdfb3c4 100644 --- a/tests/testbench/com/vaadin/tests/TableSelectTest.java +++ b/tests/testbench/com/vaadin/tests/TableSelectTest.java @@ -113,6 +113,7 @@ public class TableSelectTest extends CustomComponent implements return id; } + @Override public void valueChange(ValueChangeEvent event) { final Object val = event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index 1ac497e574..04f71ce535 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -120,6 +120,7 @@ public class TestBench extends com.vaadin.Application.LegacyApplication lo.addComponent(menu); mainWindow.getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent source) { String fragment = source.getFragment(); if (fragment != null && !"".equals(fragment)) { @@ -238,6 +239,7 @@ public class TestBench extends com.vaadin.Application.LegacyApplication } // Handle menu selection and update body + @Override public void valueChange(Property.ValueChangeEvent event) { bodyLayout.removeAllComponents(); bodyLayout.setCaption(null); diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java index 0e49fdd8ae..9f09a3212d 100644 --- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java +++ b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java @@ -195,6 +195,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { layout.addComponent(c); } + @Override public void componentEvent(Event event) { final String feedback = eventListenerString + " source=" + event.getSource() + ", toString()=" + event.toString(); diff --git a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java index 3adaff93ea..e13b907f77 100644 --- a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java +++ b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java @@ -43,6 +43,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { Button b = new Button("use gridlayout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setContent(new GridLayout()); p2.setContent(new GridLayout()); @@ -53,6 +54,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("use orderedlayout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setContent(new VerticalLayout()); p2.setContent(new VerticalLayout()); @@ -63,6 +65,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("move B", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p2.addComponent(l2); } @@ -71,6 +74,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("move p", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p3.addComponent(p); } @@ -79,6 +83,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("add to both", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Label l = new Label("both"); p.addComponent(l); @@ -89,6 +94,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("recurse", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { p3.addComponent(p2); @@ -106,6 +112,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("recurse2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Panel p = new Panel("dynamic"); p.addComponent(p2); diff --git a/tests/testbench/com/vaadin/tests/TestContainerChanges.java b/tests/testbench/com/vaadin/tests/TestContainerChanges.java index b7f24abd8b..87251c0d65 100644 --- a/tests/testbench/com/vaadin/tests/TestContainerChanges.java +++ b/tests/testbench/com/vaadin/tests/TestContainerChanges.java @@ -70,6 +70,7 @@ public class TestContainerChanges extends CustomComponent { tbl2.setMultiSelect(false); tbl2.setImmediate(true); tbl2.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println("Value now " + event.getProperty().getValue()); @@ -85,6 +86,7 @@ public class TestContainerChanges extends CustomComponent { Button b = new Button("table.commit()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.commit(); } @@ -95,6 +97,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addItem(new Integer(cnt++)); } @@ -104,6 +107,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addItem(null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addItem(null); } @@ -113,6 +117,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.removeItem(table.lastItemId()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.removeItem(tbl.lastItemId()); } @@ -123,6 +128,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addContainerProperty()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addContainerProperty("prop" + cnt, String.class, "#" + cnt++); @@ -133,6 +139,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.clear()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.removeAllItems(); } @@ -142,6 +149,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(indexedcontainer)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(cont); } @@ -151,6 +159,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(orderedwrapper)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(ordered); } @@ -160,6 +169,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(hierarchicalwrapper)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(hierarchical); } diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java index 67370039bb..eadc787ad8 100644 --- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -30,6 +30,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { click = new Button("Set height -1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tab.setHeight(null); } @@ -38,6 +39,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { click2 = new Button("Set height 100%", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tab.setHeight(100, TabSheet.UNITS_PERCENTAGE); } diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java index e90231eefd..3852c5f13f 100644 --- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java @@ -53,6 +53,7 @@ public class TestForChildComponentRendering extends CustomComponent { se.addItem("Valinta 2"); Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -60,6 +61,7 @@ public class TestForChildComponentRendering extends CustomComponent { main.addComponent(b); b = new Button("reorder view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { randomReorder(); } @@ -68,6 +70,7 @@ public class TestForChildComponentRendering extends CustomComponent { b = new Button("remove randomly one component", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeRandomComponent(); } diff --git a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java index 92b7ae4f62..f3bd5ab227 100644 --- a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java +++ b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java @@ -60,6 +60,7 @@ public class TestForContainerFilterable extends CustomComponent { // Handler filterButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ic.removeAllContainerFilters(); if (fooFilter.getValue().length() > 0) { @@ -77,6 +78,7 @@ public class TestForContainerFilterable extends CustomComponent { // Resetbutton lo.addComponent(new Button("Rebind table datasource", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.setContainerDataSource(ic); } diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index 6adcf49ec6..982c86781c 100644 --- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -54,6 +54,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { main.addComponent(se, 0, 1, 1, 1); Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -61,6 +62,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { main.addComponent(b); b = new Button("reorder view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { randomReorder(); } @@ -69,6 +71,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { b = new Button("remove randomly one component", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeRandomComponent(); } diff --git a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java index e192d2738d..17c118803b 100644 --- a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java +++ b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java @@ -65,6 +65,7 @@ public class TestForMultipleStyleNames extends CustomComponent implements } + @Override public void valueChange(ValueChangeEvent event) { final String currentStyle = l.getStyleName(); diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index 8e4ec17738..51db064af2 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -26,6 +26,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { main.addComponent(new Button("Add new subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("sw " + System.currentTimeMillis()); @@ -40,6 +41,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { final Button closebutton = new Button("Close " + w.getCaption(), new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.removeWindow(w); } @@ -78,6 +80,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { main.addComponent(new Button( "Open a currently uncreated application level window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { main.open( @@ -114,6 +117,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { ww.addComponent(new Button("Click me", new Button.ClickListener() { int state = 0; + @Override public void buttonClick(ClickEvent event) { ww.addComponent(new Label("Button clicked " + (++state) + " times")); diff --git a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java index 74fdb0c35f..9a41d719d4 100644 --- a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -91,6 +91,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements main.addComponent(test); final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -146,6 +147,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements final Panel status = new Panel("Events"); final Button clear = new Button("clear event log"); clear.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { status.removeAllComponents(); status.addComponent(ol2); @@ -162,6 +164,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements ol.addComponent(status); t.addListener(new Listener() { + @Override public void componentEvent(Event event) { status.addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() @@ -173,10 +176,12 @@ public class TestForPreconfiguredComponents extends CustomComponent implements return ol; } + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == actions[1]) { al.addComponent(new Label("Delete selected on " + target)); diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java index 992222cb9a..7185d2478c 100644 --- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java +++ b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java @@ -53,6 +53,7 @@ public class TestForRichTextEditor extends CustomComponent implements b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { rte.setEnabled(!rte.isEnabled()); } @@ -61,6 +62,7 @@ public class TestForRichTextEditor extends CustomComponent implements } + @Override public void valueChange(ValueChangeEvent event) { l.setValue(rte.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index 1fc20fe3e2..2a350b2fbb 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -70,6 +70,7 @@ public class TestForStyledUpload extends Application.LegacyApplication up.addListener(new Upload.ProgressListener() { + @Override public void updateProgress(long readBytes, long contentLenght) { pi.setValue(new Float(readBytes / (float) contentLenght)); @@ -83,6 +84,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button b = new Button("Update status", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { readState(); } @@ -90,6 +92,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button c = new Button("Update status with gc", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gc(); } @@ -112,6 +115,7 @@ public class TestForStyledUpload extends Application.LegacyApplication Button cancel = new Button("Cancel current upload"); cancel.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { buffer.cancel(); } @@ -122,6 +126,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button restart = new Button("Restart demo application"); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TestForStyledUpload.this.close(); } @@ -156,6 +161,7 @@ public class TestForStyledUpload extends Application.LegacyApplication refreshMemUsage(); } + @Override public void uploadFinished(FinishedEvent event) { status.removeAllComponents(); final InputStream stream = buffer.getStream(); @@ -208,6 +214,7 @@ public class TestForStyledUpload extends Application.LegacyApplication up.interruptUpload(); } + @Override public InputStream getStream() { if (file == null) { return null; @@ -225,6 +232,7 @@ public class TestForStyledUpload extends Application.LegacyApplication /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -242,6 +250,7 @@ public class TestForStyledUpload extends Application.LegacyApplication * * @return String */ + @Override public String getFileName() { return fileName; } @@ -257,11 +266,13 @@ public class TestForStyledUpload extends Application.LegacyApplication } + @Override public void uploadFailed(FailedEvent event) { pi.setVisible(false); l.setValue("Upload was interrupted"); } + @Override public void uploadSucceeded(SucceededEvent event) { pi.setVisible(false); l.setValue("Finished upload, idle"); @@ -280,6 +291,7 @@ public class TestForStyledUpload extends Application.LegacyApplication } + @Override public void uploadStarted(StartedEvent event) { pi.setVisible(true); l.setValue("Started uploading file " + event.getFilename()); diff --git a/tests/testbench/com/vaadin/tests/TestForTabSheet.java b/tests/testbench/com/vaadin/tests/TestForTabSheet.java index 938bf43115..d180bd4be3 100644 --- a/tests/testbench/com/vaadin/tests/TestForTabSheet.java +++ b/tests/testbench/com/vaadin/tests/TestForTabSheet.java @@ -32,6 +32,7 @@ public class TestForTabSheet extends CustomComponent implements tabsheet.addTab(tab3_root, "Third tab", null); } + @Override public void buttonClick(ClickEvent event) { System.out.println("tab2=" + tab2_root.isEnabled() + " tab3=" + tab3_root.isEnabled()); @@ -39,6 +40,7 @@ public class TestForTabSheet extends CustomComponent implements tab3_root.setEnabled(true); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { /* * Cast to a TabSheet. This isn't really necessary in this example, as diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index 48c056ff58..a8d42184a0 100644 --- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -103,6 +103,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -125,6 +126,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends } Button button = new Button("b", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("b click"); diff --git a/tests/testbench/com/vaadin/tests/TestForTrees.java b/tests/testbench/com/vaadin/tests/TestForTrees.java index 37030a25c2..24d6102f80 100644 --- a/tests/testbench/com/vaadin/tests/TestForTrees.java +++ b/tests/testbench/com/vaadin/tests/TestForTrees.java @@ -87,6 +87,7 @@ public class TestForTrees extends CustomComponent implements Handler { contextTree = t; final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -131,6 +132,7 @@ public class TestForTrees extends CustomComponent implements Handler { final Panel status = new Panel("Events"); final Button clear = new Button("c"); clear.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { status.removeAllComponents(); status.addComponent(clear); @@ -144,6 +146,7 @@ public class TestForTrees extends CustomComponent implements Handler { ol.addComponent(status); t.addListener(new Listener() { + @Override public void componentEvent(Event event) { status.addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() @@ -155,10 +158,12 @@ public class TestForTrees extends CustomComponent implements Handler { return ol; } + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == actions[1]) { al.addComponent(new Label("Delete selected on " + target)); diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java index c254198add..2f3e814b45 100644 --- a/tests/testbench/com/vaadin/tests/TestForUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForUpload.java @@ -95,6 +95,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Listener() { private static final long serialVersionUID = -8319074730512324303L; + @Override public void componentEvent(Event event) { // print out all events fired by upload for debug purposes System.out.println("Upload fired event | " + event); @@ -104,6 +105,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new StartedListener() { private static final long serialVersionUID = 5508883803861085154L; + @Override public void uploadStarted(StartedEvent event) { pi.setVisible(true); pi2.setVisible(true); @@ -117,6 +119,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Upload.FinishedListener() { private static final long serialVersionUID = -3773034195991947371L; + @Override public void uploadFinished(FinishedEvent event) { pi.setVisible(false); pi2.setVisible(false); @@ -156,6 +159,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Upload.ProgressListener() { + @Override public void updateProgress(long readBytes, long contentLenght) { pi2.setValue(new Float(readBytes / (float) contentLenght)); @@ -166,12 +170,14 @@ public class TestForUpload extends CustomComponent implements final Button b = new Button("Reed state from upload", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { readState(); } }); final Button c = new Button("Force GC", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gc(); } @@ -183,6 +189,7 @@ public class TestForUpload extends CustomComponent implements main.addComponent(throwExecption); main.addComponent(interrupt); interrupt.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { up.interruptUpload(); } @@ -195,6 +202,7 @@ public class TestForUpload extends CustomComponent implements uploadBufferSelector.addItem("tempfile"); uploadBufferSelector .addListener(new AbstractField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setBuffer(); } @@ -222,6 +230,7 @@ public class TestForUpload extends CustomComponent implements final Button restart = new Button("R"); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getApplication().close(); } @@ -280,6 +289,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public InputStream getStream() { if (outputBuffer == null) { return null; @@ -290,6 +300,7 @@ public class TestForUpload extends CustomComponent implements /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -310,6 +321,7 @@ public class TestForUpload extends CustomComponent implements * * @return String */ + @Override public String getFileName() { return fileName; } @@ -344,6 +356,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public InputStream getStream() { if (file == null) { return null; @@ -360,6 +373,7 @@ public class TestForUpload extends CustomComponent implements /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -387,6 +401,7 @@ public class TestForUpload extends CustomComponent implements * * @return String */ + @Override public String getFileName() { return fileName; } @@ -402,6 +417,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public void updateProgress(long readBytes, long contentLenght) { pi.setValue(new Float(readBytes / (float) contentLenght)); diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java index 75395f0d5c..761d9bc106 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java @@ -21,6 +21,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in this window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); @@ -33,6 +34,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in target \"mytarget\"", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); @@ -45,6 +47,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in target \"secondtarget\"", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/tests/testbench/com/vaadin/tests/TestForWindowing.java index b9e14608f5..bbd523c0fd 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowing.java @@ -37,6 +37,7 @@ public class TestForWindowing extends CustomComponent { final Button create = new Button("Create a new window", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("Testing Window"); @@ -59,6 +60,7 @@ public class TestForWindowing extends CustomComponent { s1.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String v = (String) event.getProperty() .getValue(); diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java index a46253598f..064a04847a 100644 --- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -50,6 +50,7 @@ public class TestSetVisibleAndCaching extends selectPanel(selectedPanel); buttonNextPanel.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectedPanel++; if (selectedPanel > 2) { diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index a9005e7fd3..50028137df 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -56,6 +56,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { prev = new Button("<<-|"); prev.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object cur = select.getValue(); Testable prev = (Testable) cont.prevItemId(cur); @@ -71,6 +72,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { }); next = new Button("|->>"); next.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object cur = select.getValue(); Testable next = (Testable) cont.nextItemId(cur); @@ -93,6 +95,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { select.setContainerDataSource(cont); select.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Testable t = (Testable) select.getValue(); if (t != null) { diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java index e451d2ced7..736f2cf5af 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java @@ -60,6 +60,7 @@ public class TreeFilesystem extends com.vaadin.Application.LegacyApplication * Handle tree expand event, populate expanded node's childs with new files * and directories. */ + @Override public void nodeExpand(ExpandEvent event) { final Item i = tree.getItem(event.getItemId()); if (!tree.hasChildren(i)) { diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java index 1b32a35a38..2458f2dfa1 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java @@ -80,6 +80,7 @@ public class TreeFilesystemContainer extends * Listener for any component events. This class has been registered as an * listener for component fsTree. */ + @Override public void componentEvent(Event event) { // Check if event occured at fsTree component if (event.getSource() == filesystem) { diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java index 0db63ca789..3090962b71 100644 --- a/tests/testbench/com/vaadin/tests/UpgradingSample.java +++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java @@ -94,6 +94,7 @@ public class UpgradingSample extends Application.LegacyApplication implements } // Handle menu selection and update visible page + @Override public void valueChange(Property.ValueChangeEvent event) { layout.removeComponent(1, 0); final String title = (String) menu.getValue(); @@ -116,6 +117,7 @@ public class UpgradingSample extends Application.LegacyApplication implements private final Button loginButton = new Button("Enter", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { login(); } @@ -127,6 +129,7 @@ public class UpgradingSample extends Application.LegacyApplication implements private final Button logoutButton = new Button("Logout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { close(); } @@ -163,6 +166,7 @@ public class UpgradingSample extends Application.LegacyApplication implements } // Update login status on application user change events + @Override public void applicationUserChanged(Application.UserChangeEvent event) { updateStatus(); } diff --git a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java index 54a7d3d080..94635d17c4 100644 --- a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java @@ -51,6 +51,7 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent { } public class MyNewItemHandler implements AbstractSelect.NewItemHandler { + @Override public void addNewItem(String newItemCaption) { // here could be db insert or other backend operation Integer id = new Integer(sequence++); diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java index 13918ace90..f72229ace1 100644 --- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java @@ -60,6 +60,7 @@ public class UsingObjectsInSelect extends } } + @Override public void valueChange(ValueChangeEvent event) { final Task task = (Task) select.getValue(); selectedTask.setValue("<b>Type:</b> " + task.getType() diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java index 58faec35f0..fbf9e7b46e 100644 --- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java @@ -59,6 +59,7 @@ public class GAESyncTest extends Application.LegacyApplication { tf = new TextField("Echo thingie"); tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { IntrWindow.this.showNotification((String) event .getProperty().getValue()); @@ -73,6 +74,7 @@ public class GAESyncTest extends Application.LegacyApplication { { Button b = new Button("Slow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { Thread.sleep(15000); @@ -89,6 +91,7 @@ public class GAESyncTest extends Application.LegacyApplication { { Button b = new Button("Add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (getRoot() == getMainWindow()) { getRoot().getPage().showNotification( diff --git a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java index ce41a895c4..a59764bf45 100644 --- a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java @@ -27,6 +27,7 @@ public class ApplicationCloseTest extends TestBase { Label thisApp = new Label("This applications: " + this); Button close = new Button("Close this", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton().getApplication().close(); } diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java index fcc4e26b55..690df3f360 100644 --- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java +++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java @@ -50,6 +50,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { mainWindow.setContent(formLayout); login.addListener(new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { String username = userField.getValue(); String password = passwordField.getValue(); @@ -81,6 +82,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { header.addComponent(title); Button logout = new Button("Logout"); logout.addListener(new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { setUser(null); showLoginWindow(); diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index f2ae7a3891..4a029e3373 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -16,6 +16,7 @@ public class TerminalErrorNotification extends TestBase { Button button = new Button("Throw exception", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("You asked for it"); } diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java index eeb866138b..def68a7357 100644 --- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java @@ -61,6 +61,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { mainWindow.addComponent(log); mainWindow.addComponent(new Embedded("Icon", resource)); mainWindow.addComponent(new Button("Sync", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reportCurrentStatus("button listener"); } diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java index a3f11f2cd3..817acf20b5 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java @@ -18,6 +18,7 @@ public class WebBrowserSizeTest extends TestBase { final Button update = new Button("Refresh", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x " + getBrowser().getScreenHeight()); diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java index 35235bbe1f..004c8f1c91 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java @@ -38,6 +38,7 @@ public class WebBrowserTest extends TestBase { final Button update = new Button("Get TimeZone from browser", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TimeZone hkiTZ = TimeZone .getTimeZone("Europe/Helsinki"); diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java index 17ac74e5a3..abcdf232cd 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -22,6 +22,7 @@ public class ChangeSessionId extends AbstractTestCase { mainWindow.addComponent(new Button("Show session id", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { logSessionId(); } @@ -29,6 +30,7 @@ public class ChangeSessionId extends AbstractTestCase { setMainWindow(mainWindow); loginButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { WebApplicationContext context = ((WebApplicationContext) getContext()); diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java index 8723e23a2a..f1730ed5f5 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java @@ -15,10 +15,12 @@ public class RemoveTransactionListener extends TestBase { // Add one listener that will remove itself from within transactionEnd getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { } + @Override public void transactionEnd(Application application, Object transactionData) { removeListener(this); @@ -29,12 +31,14 @@ public class RemoveTransactionListener extends TestBase { // Add one listener that will remove itself from within transactionStart getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { removeListener(this); log.log("Listener removed in transactionStart"); } + @Override public void transactionEnd(Application application, Object transactionData) { } @@ -45,11 +49,13 @@ public class RemoveTransactionListener extends TestBase { // ignored getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { log.log("transactionStart from last listener"); } + @Override public void transactionEnd(Application application, Object transactionData) { log.log("transactionEnd from last listener"); diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java index 6e9e4e8930..be3b7760f2 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java @@ -29,6 +29,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private String CATEGORY_COMPONENT_CONTAINER_FEATURES = "Component container features"; private Command<T, ComponentSize> addButtonCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { Button b = new Button("A button"); c.addComponent(b); @@ -38,6 +39,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addNativeButtonCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { NativeButton b = new NativeButton("Native button"); c.addComponent(b); @@ -46,6 +48,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTextAreaCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TextArea ta = new TextArea(); c.addComponent(ta); @@ -54,6 +57,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addRichTextAreaCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { RichTextArea ta = new RichTextArea(); c.addComponent(ta); @@ -62,6 +66,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTextFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TextField tf = new TextField(); c.addComponent(tf); @@ -70,6 +75,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addInlineDateFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { InlineDateField tf = new InlineDateField(); c.addComponent(tf); @@ -77,6 +83,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } }; private Command<T, ComponentSize> addPopupDateFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { PopupDateField tf = new PopupDateField(); c.addComponent(tf); @@ -85,6 +92,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addVerticalSplitPanelCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { VerticalSplitPanel vsp = new VerticalSplitPanel(); c.addComponent(vsp); @@ -93,6 +101,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addHorizontalSplitPanelCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { HorizontalSplitPanel vsp = new HorizontalSplitPanel(); c.addComponent(vsp); @@ -101,6 +110,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTabSheetCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TabSheet ts = createTabSheet(); c.addComponent(ts); @@ -110,6 +120,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addTableCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { Table t = createTable(); c.addComponent(t); @@ -117,12 +128,14 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } }; private Command<T, Object> removeAllComponentsCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.removeAllComponents(); } }; private Command<T, Integer> removeComponentByIndexCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); c.removeComponent(child); @@ -131,6 +144,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, Boolean> componentAttachListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ComponentAttachListener) AbstractComponentContainerTest.this); @@ -142,6 +156,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Boolean> componentDetachListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ComponentDetachListener) AbstractComponentContainerTest.this); @@ -153,6 +168,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Integer> setComponentHeight = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); child.setHeight((String) data); @@ -162,6 +178,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Integer> setComponentWidth = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); child.setWidth((String) data); @@ -348,6 +365,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } + @Override public void componentDetachedFromContainer(ComponentDetachEvent event) { log(event.getClass().getSimpleName() + ": " + event.getDetachedComponent().getClass().getSimpleName() @@ -355,6 +373,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent + event.getContainer().getClass().getSimpleName()); } + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { log(event.getClass().getSimpleName() + ": " + event.getAttachedComponent().getClass().getSimpleName() diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java index 60ce941565..38bba7721c 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java @@ -120,6 +120,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> MenuItem showEventLog = settingsMenu.addItem("Show event log", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { boolean selected = !isSelected(selectedItem); setLogVisible(selected); @@ -131,6 +132,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> settingsMenu.addItem("Clear log", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { log.clear(); } @@ -140,6 +142,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> MenuItem layoutHeight = layoutSize.addItem("Height", null); for (final String name : sizeOptions.keySet()) { layoutWidth.addItem(name, new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { getTestComponents().get(0).getParent() .setWidth(sizeOptions.get(name)); @@ -147,6 +150,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } }); layoutHeight.addItem(name, new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { getTestComponents().get(0).getParent() .setHeight(sizeOptions.get(name)); @@ -243,6 +247,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> protected Command<T, Boolean> focusListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((FocusNotifier) c).addListener(AbstractComponentTest.this); @@ -253,6 +258,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> }; protected Command<T, Boolean> blurListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((BlurNotifier) c).addListener(AbstractComponentTest.this); @@ -469,6 +475,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { boolean selected = !isSelected(selectedItem); doCommand(getText(selectedItem), booleanCommand, selected, data); @@ -483,6 +490,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final DATATYPE value, final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { doCommand(getText(selectedItem), command, value, data); } @@ -506,6 +514,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final com.vaadin.tests.components.ComponentTestCase.Command<T, VALUETYPE> cmd, final VALUETYPE object, final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { doCommand(getText(selectedItem), cmd, object, data); @@ -722,10 +731,12 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } + @Override public void focus(FocusEvent event) { log(event.getClass().getSimpleName()); } + @Override public void blur(BlurEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java index 57a32aafc4..d8ae43fd6d 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java @@ -71,12 +71,14 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, String> widthCommand = new Command<T, String>() { + @Override public void execute(T t, String value, Object data) { t.setWidth(value); } }; protected Command<T, String> heightCommand = new Command<T, String>() { + @Override public void execute(T t, String value, Object data) { t.setHeight(value); } @@ -84,6 +86,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> enabledCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setEnabled(enabled); } @@ -91,6 +94,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> immediateCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean immediate, Object data) { c.setImmediate(immediate); } @@ -98,6 +102,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> errorIndicatorCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { if (enabled) { c.setComponentError(new UserError(errorMessage)); @@ -111,6 +116,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, String> errorMessageCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { errorMessage = value; if (c.getComponentError() != null) { @@ -124,6 +130,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> // TODO Move to AbstractFieldTestCase protected Command<T, Boolean> requiredCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { if (c instanceof Field) { ((Field<?>) c).setRequired(enabled); @@ -135,6 +142,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> requiredErrorMessageCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { ((Field<?>) c).setRequiredError(value); } @@ -142,6 +150,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> descriptionCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setDescription(value); } @@ -149,6 +158,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> readonlyCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setReadOnly(enabled); } @@ -156,6 +166,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> visibleCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setVisible(enabled); } @@ -163,6 +174,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Resource> iconCommand = new Command<T, Resource>() { + @Override public void execute(T c, Resource value, Object data) { c.setIcon(value); } @@ -170,6 +182,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> captionCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setCaption(value); } @@ -178,6 +191,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Locale> localeCommand = new Command<T, Locale>() { + @Override public void execute(T c, Locale value, Object data) { c.setLocale(value); } @@ -206,6 +220,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> } protected Command<T, String> styleNameCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setStyleName(value); } diff --git a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java index 5c25359e28..af62e5e4a4 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java @@ -15,6 +15,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends protected static final String CATEGORY_LAYOUT_FEATURES = "Layout features"; private Command<T, MarginInfo> marginCommand = new Command<T, MarginInfo>() { + @Override public void execute(T c, MarginInfo value, Object data) { c.setMargin(value); @@ -22,6 +23,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends }; protected Command<T, Boolean> spacingCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { ((SpacingHandler) c).setSpacing(value); } @@ -29,6 +31,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends private Command<T, Integer> setComponentAlignment = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object alignment) { Component child = getComponentAtIndex(c, value); ((AlignmentHandler) c).setComponentAlignment(child, diff --git a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java index fd323d2156..1d18cba952 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java @@ -12,6 +12,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> private Command<T, Boolean> layoutClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((LayoutClickListener) AbstractOrderedLayoutTest.this); @@ -24,6 +25,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> private Command<T, Integer> setComponentExpandRatio = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object ratio) { Component child = getComponentAtIndex(c, value); c.setExpandRatio(child, (Float) ratio); @@ -74,6 +76,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> } + @Override public void layoutClick(LayoutClickEvent event) { log(event.getClass().getSimpleName() + ": button=" + event.getButtonName() + ", childComponent=" diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java index b458c12188..926af72a2f 100644 --- a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java +++ b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java @@ -26,6 +26,7 @@ public class AddRemoveSetStyleNamesTest extends TestBase { listener = new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String style = (String) event.getButton().getData(); setComponentsStyle(style, !popupDateField.getStyleName() @@ -43,6 +44,7 @@ public class AddRemoveSetStyleNamesTest extends TestBase { button3 = new Button("Set thestyle", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (popupDateField.getStyleName().contains(thestyle)) { popupDateField.removeStyleName(thestyle); diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java index a2c186df7e..e949d62f71 100644 --- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java @@ -114,6 +114,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends CheckBox checkBox = new CheckBox(caption); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); doCommand(command, enabled); @@ -136,6 +137,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends Button button = new Button(caption); button.setData(Boolean.FALSE); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); boolean state = (Boolean) b.getData(); @@ -163,6 +165,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends select.setNullSelectionAllowed(false); select.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object itemId = event.getProperty().getValue(); Item item = select.getItem(itemId); diff --git a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java index 57b81ddecc..9fe13c457a 100644 --- a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java +++ b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java @@ -57,6 +57,7 @@ public class CustomComponentwithUndefinedSize extends TestBase { Button button = new Button("Change panel size", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { switch (step++ % 4) { case 0: diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java b/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java index aa83ff7a42..cd284224a0 100644 --- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java +++ b/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java @@ -33,6 +33,7 @@ public class DisableEnableCascade extends TestBase { enableDisablePanelButton = new Button("Disable panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(outerPanel, enableDisablePanelButton); @@ -42,6 +43,7 @@ public class DisableEnableCascade extends TestBase { enableDisableTabSheetButton = new Button("Disable TabSheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(innerTabsheet, enableDisableTabSheetButton); @@ -52,6 +54,7 @@ public class DisableEnableCascade extends TestBase { enableDisableButtonButton = new Button("Disable Button", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(button, enableDisableButtonButton); diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java index f3391afd1f..0279a92437 100644 --- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java +++ b/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java @@ -55,6 +55,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisablePanelButton = new Button("Disable panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(outerPanel, enableDisablePanelButton); @@ -64,6 +65,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableTabSheetButton = new Button("Disable TabSheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(innerTabsheet, enableDisableTabSheetButton); @@ -74,6 +76,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableLayoutButton = new Button("Disable Tab content (Layout)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(layout, enableDisableLayoutButton); @@ -82,6 +85,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableComponentsButton = new Button("Disable Layout Components", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (Iterator<Component> i = layout .getComponentIterator(); i.hasNext();) { diff --git a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java index 267807b16b..7987c800f9 100644 --- a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java @@ -23,6 +23,7 @@ public class FocusAndBlurListeners extends TestBase { private FocusListener focusListener = new FocusListener() { + @Override public void focus(FocusEvent event) { Label msg = new Label(new Date() + " Focused " + event.getComponent().getCaption()); @@ -31,6 +32,7 @@ public class FocusAndBlurListeners extends TestBase { }; private BlurListener blurListener = new BlurListener() { + @Override public void blur(BlurEvent event) { Label msg = new Label(new Date() + " Blurred " + event.getComponent().getCaption()); @@ -74,6 +76,7 @@ public class FocusAndBlurListeners extends TestBase { private int i; + @Override public void buttonClick(ClickEvent event) { ogm.addItem("newItem" + i++); diff --git a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java index 124f2b9cdf..cffc8ca27b 100644 --- a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java +++ b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java @@ -20,6 +20,7 @@ public class FocusFromShortcutAction extends TestBase { addComponent(select); addComponent(text); Button focusText = new Button("Focus text", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { text.focus(); } @@ -29,6 +30,7 @@ public class FocusFromShortcutAction extends TestBase { addComponent(focusText); Button focusSelect = new Button("Focus select", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { select.focus(); } diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java index dc07c35f62..6e54c0d9f4 100644 --- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java +++ b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java @@ -27,6 +27,7 @@ public class LayoutAttachListenerInfo extends TestBase { layouts.select("AbsoluteLayout"); layouts.setImmediate(true); layouts.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (event.getProperty().getValue().equals("AbsoluteLayout")) { testAbsoluteLayout(); @@ -64,6 +65,7 @@ public class LayoutAttachListenerInfo extends TestBase { a.setWidth("300px"); a.setHeight("300px"); a.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { AbsoluteLayout layout = (AbsoluteLayout) event.getContainer(); AbsoluteLayout.ComponentPosition position = layout @@ -78,6 +80,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.addComponent(new Label("X"), "top:50px;left:50px"); } @@ -91,6 +94,7 @@ public class LayoutAttachListenerInfo extends TestBase { v.setWidth("300px"); v.setHeight("300px"); v.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { VerticalLayout layout = (VerticalLayout) event.getContainer(); getMainWindow().showNotification( @@ -104,6 +108,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.addComponent(new Label("X")); @@ -118,6 +123,7 @@ public class LayoutAttachListenerInfo extends TestBase { g.setWidth("300px"); g.setHeight("300px"); g.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { GridLayout layout = (GridLayout) event.getContainer(); GridLayout.Area area = layout.getComponentArea(event @@ -133,6 +139,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { g.addComponent(new Label("X"), 2, 3); } diff --git a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java b/tests/testbench/com/vaadin/tests/components/TouchScrollables.java index 8ad12da85f..0cef24f437 100644 --- a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java +++ b/tests/testbench/com/vaadin/tests/components/TouchScrollables.java @@ -79,12 +79,14 @@ public class TouchScrollables extends TestBase { final Label l = l50; Button button = new Button("Scroll to label 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getLayout().getRoot().scrollIntoView(l); } }); cssLayout.addComponent(button); button = new Button("Scroll to 100px", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setScrollTop(100); } @@ -117,6 +119,7 @@ public class TouchScrollables extends TestBase { Button button = new Button("Toggle lazyloading"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (table.getCacheRate() == 100) { table.setCacheRate(2); @@ -131,6 +134,7 @@ public class TouchScrollables extends TestBase { button = new Button("Toggle selectable"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setSelectable(!table.isSelectable()); } @@ -159,6 +163,7 @@ public class TouchScrollables extends TestBase { private Component getSubWindowTest() { Button b = new Button("Open subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("Subwindow"); w.center(); @@ -185,10 +190,12 @@ public class TouchScrollables extends TestBase { Action[] actions = new Action[] { new Action("FOO"), new Action("BAR"), new Action("CAR") }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show(action.getCaption()); @@ -206,10 +213,12 @@ public class TouchScrollables extends TestBase { // accept only drags from this table AcceptCriterion crit = new SourceIs(table); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java index 139ed5bb0b..826b7cee07 100644 --- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java +++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java @@ -22,6 +22,7 @@ public class MoveComponentsFromAbsoluteLayoutToInnerLayout extends TestBase { testButton = new Button("Click to move to inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.addComponent(testButton); } @@ -37,6 +38,7 @@ public class MoveComponentsFromAbsoluteLayoutToInnerLayout extends TestBase { Button b = new Button("Repaint inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java index 9261962b0d..f8931ecdea 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -20,6 +20,7 @@ public class EnableState extends AbstractTestCase { CheckBox enable = new CheckBox("Toggle button enabled", true); enable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); button.setEnabled(enabled); @@ -31,6 +32,7 @@ public class EnableState extends AbstractTestCase { CheckBox caption = new CheckBox("Toggle button caption", true); caption.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { button.setCaption(button.getCaption() + "+"); } @@ -40,6 +42,7 @@ public class EnableState extends AbstractTestCase { CheckBox visible = new CheckBox("Toggle panel visibility", true); visible.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean visible = (Boolean) event.getProperty().getValue(); @@ -51,6 +54,7 @@ public class EnableState extends AbstractTestCase { CheckBox panelEnable = new CheckBox("Toggle panel enabled", true); panelEnable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); panel.setEnabled(enabled); diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java index c009e1d7bc..300abe1851 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java @@ -57,6 +57,7 @@ public class TooltipTests extends TestBase { private final Property.ValueChangeListener panelListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean value = (Boolean) (event.getProperty().getValue()); if (value) { @@ -70,6 +71,7 @@ public class TooltipTests extends TestBase { private final Property.ValueChangeListener layoutListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean value = (Boolean) (event.getProperty().getValue()); if (value) { @@ -83,6 +85,7 @@ public class TooltipTests extends TestBase { private final Property.ValueChangeListener labelListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean value = (Boolean) (event.getProperty().getValue()); if (value) { diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java index 93ba858e37..9b29ae1bab 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java @@ -45,6 +45,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateLocale((Locale) localeSelect.getValue()); } @@ -91,6 +92,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase return null; } + @Override public void valueChange(ValueChangeEvent event) { AbstractField field = (AbstractField) event.getProperty(); // if (field == localeSelect) { diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java index 5d0e0fe488..aa630c79fd 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java @@ -33,6 +33,7 @@ public class AbstractFieldCommitWithInvalidValues extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { tf.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java index 780130847a..f1b96d24fd 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java @@ -34,6 +34,7 @@ public class AbstractFieldDataSourceReadOnly extends TestBase { // Button Button button = new Button("Make data source read-only"); button.addListener(new Listener() { + @Override public void componentEvent(Event event) { stateHolder.buttonClicked(); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java index 716f80e23f..66b5e23cda 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java @@ -65,6 +65,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends .addItem("AbstractField", null); abstractField.addItem("Show value", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { for (T a : getTestComponents()) { log(a.getClass().getSimpleName() + " value: " @@ -101,6 +102,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends protected Command<T, Boolean> valueChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ValueChangeListener) AbstractFieldTest.this); @@ -111,6 +113,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends }; protected Command<T, Boolean> readonlyStatusChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this); @@ -122,11 +125,13 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends protected Command<T, Object> setValueCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.setValue(value); } }; + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { log(event.getClass().getSimpleName() + ", new value: " + getValue(event.getProperty())); @@ -168,6 +173,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends } + @Override public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java index b68134f379..1f407c710f 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java @@ -14,12 +14,14 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setMaxLength(value); } }; private Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setNullSettingAllowed(value); @@ -27,18 +29,21 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> }; private Command<T, String> nullRepresentationCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setNullRepresentation(value); } }; private Command<T, String> inputPromptCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setInputPrompt(value); } }; private Command<T, Boolean> textChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((TextChangeListener) AbstractTextFieldTest.this); @@ -49,24 +54,28 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> }; private Command<T, Integer> colsCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setColumns(value); } }; private Command<T, TextChangeEventMode> textChangeEventModeCommand = new Command<T, TextChangeEventMode>() { + @Override public void execute(T c, TextChangeEventMode value, Object data) { c.setTextChangeEventMode(value); } }; private Command<T, Integer> textChangeTimeoutCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setTextChangeTimeout(value); } }; private Command<T, Range> selectionRangeCommand = new Command<T, Range>() { + @Override public void execute(T c, Range value, Object data) { c.setSelectionRange(value.getStart(), value.getEnd() - value.getStart()); @@ -74,6 +83,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> } }; private Command<T, Object> selectAllCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.selectAll(); } @@ -81,6 +91,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> private Command<T, Integer> setCursorPositionCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setCursorPosition(value); } @@ -230,6 +241,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> } + @Override public void textChange(TextChangeEvent event) { AbstractTextField tf = (AbstractTextField) event.getComponent(); log("TextChangeEvent: text='" + event.getText() + "', cursor position=" diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java index deea0fbe0a..aa8c7ff778 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java @@ -24,6 +24,7 @@ public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest { addComponent(new Button("Set property value to 10000L", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { property.setValue(10000L); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java index c13aadd895..01fcb02b77 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java @@ -34,6 +34,7 @@ public class IntegerDoubleFieldsWithDataSource extends TestBase { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { log.log("Value for " + tf.getCaption() + " changed to " diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java index b25dc9d953..929247fc80 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java @@ -29,6 +29,7 @@ public class IntegerFieldWithoutDataSource extends TestBase { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { log.log("Value for " + tf.getCaption() + " changed to " diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java index 26720d67f3..309e297374 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java @@ -20,6 +20,7 @@ public class ShortcutAddAndRemove extends TestBase { final Button logButton = new Button("Log a row (enter shortcut)"); logButton.setClickShortcut(KeyCode.ENTER); logButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Log button was clicked"); } @@ -27,6 +28,7 @@ public class ShortcutAddAndRemove extends TestBase { final Button removeShortcut = new Button("Remove shortcut"); removeShortcut.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { logButton.removeClickShortcut(); logButton.setCaption("Log a row (no shortcut)"); @@ -34,6 +36,7 @@ public class ShortcutAddAndRemove extends TestBase { }); final Button addShortcut = new Button("Add shortcut"); addShortcut.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { logButton.setClickShortcut(KeyCode.ENTER); logButton.setCaption("Log a row (enter shortcut)"); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java index 8ce214918d..fc08a4505c 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java @@ -31,6 +31,7 @@ public class TextFieldConversions extends AbstractComponentDataBindingTest { dataType.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setPropertyDataSource(new ObjectProperty<Object>(o, (Class<Object>) dataType.getValue())); @@ -42,6 +43,7 @@ public class TextFieldConversions extends AbstractComponentDataBindingTest { addComponent(tf); tf.setErrorHandler(new ComponentErrorHandler() { + @Override public boolean handleComponentError(ComponentErrorEvent event) { tf.setComponentError(new UserError("Invalid value")); return true; diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java index 0228a59f06..a9aa4d2a43 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java @@ -7,6 +7,7 @@ import com.vaadin.data.util.converter.Converter; public class Vaadin6ImplicitDoubleConverter implements Converter<String, Double> { + @Override public Double convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (null == value) { @@ -15,6 +16,7 @@ public class Vaadin6ImplicitDoubleConverter implements return new Double(value.toString()); } + @Override public String convertToPresentation(Double value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -24,10 +26,12 @@ public class Vaadin6ImplicitDoubleConverter implements } + @Override public Class<Double> getModelType() { return Double.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java index a048cf04a8..d24def22dd 100644 --- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java @@ -47,6 +47,7 @@ public class RemoveTabs extends TestBase { closeCurrent = new Button("Close current tab"); closeCurrent.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -55,6 +56,7 @@ public class RemoveTabs extends TestBase { closeFirst = new Button("close first tab"); closeFirst.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); @@ -63,6 +65,7 @@ public class RemoveTabs extends TestBase { closeLast = new Button("close last tab"); closeLast.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeLastTab(); @@ -71,6 +74,7 @@ public class RemoveTabs extends TestBase { reorderTabs = new Button("reorder"); reorderTabs.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reorder(); diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java index f613a8b14f..605ab676b6 100644 --- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java +++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java @@ -29,6 +29,7 @@ public class BeanItemContainerNullValues extends TestBase { Button b = new Button("Disable sorting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setSortEnabled(!table.isSortEnabled()); if (table.isSortEnabled()) { diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java index 7efd40ca5d..0d4981a441 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java @@ -17,10 +17,12 @@ public class ButtonEnterWithWindowShortcut extends TestBase { getMainWindow().addActionHandler(new Handler() { private static final long serialVersionUID = -4976129418325394913L; + @Override public void handleAction(Action action, Object sender, Object target) { log.log(action.getCaption() + " pressed in window"); } + @Override public Action[] getActions(Object target, Object sender) { ShortcutAction enter = new ShortcutAction("enter", ShortcutAction.KeyCode.ENTER, null); @@ -32,6 +34,7 @@ public class ButtonEnterWithWindowShortcut extends TestBase { Button button = new Button("Focus me and press enter", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("button click listener fired"); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java index aca85d4efe..b27f948669 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java @@ -11,6 +11,7 @@ public class ButtonErrorMessage extends TestBase { protected void setup() { Button b = new Button("Click for error"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new NullPointerException(); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java b/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java index 253de5b43c..5cdc34e8e8 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java @@ -19,6 +19,7 @@ public class ButtonHtml extends TestBase { final Button swapButton = new Button("<i>Swap button<i>"); swapButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { swapButton.setHtmlContentAllowed(!swapButton .isHtmlContentAllowed()); diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java index 8fe56b7619..2e60c7cfcc 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java @@ -14,6 +14,7 @@ public class ButtonMouseDetails extends TestBase { private Button.ClickListener clickListener = new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuilder str = new StringBuilder(out.getValue().toString()); str.append(clickCounter + ":\t"); diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java index e04d50bddb..7526e7dbc3 100644 --- a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java +++ b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java @@ -13,6 +13,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> private Command<T, Boolean> disableOnClickCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setDisableOnClick(value); } @@ -20,6 +21,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> private Command<T, Boolean> clickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((Button.ClickListener) Buttons2.this); @@ -62,6 +64,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> } + @Override public void buttonClick(ClickEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java index 295c04fc0c..4fb8df678e 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java +++ b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java @@ -60,6 +60,7 @@ public class ShortCutListenerModification extends TestBase implements } + @Override public void buttonClick(ClickEvent event) { Component c = event.getButton(); while (!(c instanceof Window)) { diff --git a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java index 4952b4bc50..c1f1846415 100644 --- a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java +++ b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java @@ -27,6 +27,7 @@ public class TooltipForDisabledButton extends TestBase { buttonDisabled.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Clicked Disabled"); } @@ -35,6 +36,7 @@ public class TooltipForDisabledButton extends TestBase { buttonEnabled.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Clicked Enabled"); } diff --git a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java index 3211a9c142..cbdde63df0 100644 --- a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java @@ -47,6 +47,7 @@ public class IconsInCaption extends TestBase { iconTypeSelect.setImmediate(true); iconTypeSelect.setNullSelectionAllowed(false); iconTypeSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateContainer(); } @@ -60,6 +61,7 @@ public class IconsInCaption extends TestBase { containerSelect.setImmediate(true); containerSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateContainer(); diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java index 2c981432c8..28abf5172d 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java @@ -29,6 +29,7 @@ public class CheckBoxNullValue extends TestBase { final Button button = new Button("Validate"); addComponent(button); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { checkbox.setComponentError(null); requiredCheckbox.setComponentError(null); diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java index 4f9cd10ecc..6734c752de 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java @@ -19,6 +19,7 @@ public class CheckBoxes2 extends AbstractFieldTest<CheckBox> implements } + @Override public void buttonClick(ClickEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java index 88a403b1b6..38bdf0c5fe 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java @@ -29,6 +29,7 @@ public class ComboBoxCombinedWithEnterShortcut extends TestBase { aButton.setClickShortcut(KeyCode.ENTER); aButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked. ComboBox value: " + l.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java index 9285983b99..a475c86ca0 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java @@ -57,6 +57,7 @@ public class ComboBoxDataSourceChange extends TestBase { Button b = new Button("Use ds1"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.setContainerDataSource(ds1); currentDS.setValue("ds1"); @@ -72,6 +73,7 @@ public class ComboBoxDataSourceChange extends TestBase { b = new Button("Use ds2"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.setContainerDataSource(ds2); currentDS.setValue("ds2"); @@ -82,6 +84,7 @@ public class ComboBoxDataSourceChange extends TestBase { addComponent(hl); cb2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentValue.setValue(event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java index d9739602f6..c5e411678d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java @@ -16,6 +16,7 @@ public class ComboBoxEnablesComboBox extends TestBase { populate(cb); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cb2.setEnabled(true); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java index fd434a7acd..5f33b96a73 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java @@ -27,6 +27,7 @@ public class ComboBoxIdenticalItems extends TestBase { select.addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = -7932700771673919620L; + @Override public void valueChange(ValueChangeEvent event) { log.log("Item " + select.getValue() + " selected"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java index 70aad31364..c0490c127d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java @@ -17,6 +17,7 @@ public class ComboBoxInPopup extends TestBase { w.addComponent(createComboBox()); Button close = new Button("Close window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java index e11b10f3e1..0afa1e887e 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java @@ -24,6 +24,7 @@ public class ComboBoxInvalidNullSelection extends TestBase { Button b = new Button("Swap data source"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (combo.getContainerDataSource() == ds1) { combo.setContainerDataSource(ds2); @@ -39,6 +40,7 @@ public class ComboBoxInvalidNullSelection extends TestBase { combo.setContainerDataSource(ds1); combo.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value is now: " + combo.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index c78ff7675f..5dc5a2efbd 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -58,6 +58,7 @@ public class ComboBoxReapperingOldValue extends Application.LegacyApplication return container; } + @Override public void valueChange(ValueChangeEvent event) { cbox2.removeAllItems(); if ("1".equals(event.getProperty().getValue().toString())) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java index 15742cc783..0336ff423b 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java @@ -45,6 +45,7 @@ public class ComboBoxSlow extends TestBase { } cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changed to " + cb.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java index 5c1dad4a30..d98997d28f 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java @@ -24,6 +24,7 @@ public class ComboBoxSlowInFF extends TestBase { Button fill = new Button("fill it"); fill.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.removeAllItems(); for (int i = 0; i < 200; i++) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java index 09354fdacf..24aea18314 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java @@ -16,6 +16,7 @@ public class ComboBoxSuggestionOnDetach extends TestBase { ComboBox comboBox = new ComboBox("Combo box", Arrays.asList("Option 1", "Option 2", "Option 3")); comboBox.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FocusEvent event) { popup.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java index 6f6e550ab4..d33a858dc8 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java @@ -17,6 +17,7 @@ public class ComboBoxTextFieldEventOrder extends TestBase { final Select select = new Select("select", Arrays.asList("1", "2", "3", "4")); textField.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { select.addItem(Long.valueOf(select.size() + 1).toString()); // or // just diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java index b8f7a9758d..76ee83384e 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java @@ -29,6 +29,7 @@ public class ComboBoxValueUpdate extends TestBase { select.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err .println("Selected " + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java index 8befbb4612..3071ab4c2d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java @@ -10,12 +10,14 @@ import com.vaadin.ui.Select; public class ComboBoxes2 extends SelectTest<ComboBox> { private Command<ComboBox, String> inputPromptCommand = new Command<ComboBox, String>() { + @Override public void execute(ComboBox c, String value, Object data) { c.setInputPrompt(value); } }; private Command<ComboBox, Integer> filteringModeCommand = new Command<ComboBox, Integer>() { + @Override public void execute(ComboBox c, Integer value, Object data) { c.setFilteringMode(value); } @@ -39,6 +41,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { private void createTextInputAlowedAction(String category) { createBooleanAction("Text input allowed", category, true, new Command<ComboBox, Boolean>() { + @Override public void execute(ComboBox c, Boolean value, Object data) { c.setTextInputAllowed(value.booleanValue()); } @@ -48,6 +51,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { private void createNewItemsAllowedAction(String category) { createBooleanAction("New items allowed", category, false, new Command<ComboBox, Boolean>() { + @Override public void execute(ComboBox c, Boolean value, Object data) { c.setNewItemsAllowed(value.booleanValue()); } @@ -80,6 +84,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { createSelectAction("Icon", category, createIconOptions(false), "-", new Command<ComboBox, Resource>() { + @Override public void execute(ComboBox c, Resource value, Object data) { for (Object id : c.getItemIds()) { if (value == null) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java index 44285f97c2..ef390007be 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java @@ -34,6 +34,7 @@ public class ComboFocusBlurEvents extends TestBase { final ObjectProperty<String> log = new ObjectProperty<String>(""); cb.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FocusEvent event) { log.setValue(log.getValue().toString() + "<br>" + counter + ": Focus event!"); @@ -42,6 +43,7 @@ public class ComboFocusBlurEvents extends TestBase { }); cb.addListener(new FieldEvents.BlurListener() { + @Override public void blur(BlurEvent event) { log.setValue(log.getValue().toString() + "<br>" + counter + ": Blur event!"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java index 94ab20df43..5b1af58421 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java @@ -136,6 +136,7 @@ public class Comboboxes extends ComponentTestCase<ComboBox> { return createSelectAction("Icon", options, "<None>", new Command<ComboBox, String>() { + @Override public void execute(ComboBox c, String value, Object data) { for (Object id : c.getItemIds()) { if (value == null) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java index d93db563e3..00e9242a7a 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java @@ -17,6 +17,7 @@ public class NewItemsESCPress extends TestBase { final ComboBox box = new ComboBox("New items are allowed"); box.setNewItemsAllowed(true); box.setNewItemHandler(new NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { String value = (String) addedItems.getValue(); addedItems.setValue(value + newItemCaption + "\n"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java index a79b85ece4..ce6a24d9bd 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java @@ -22,6 +22,7 @@ public class RemovalOfSelectedIcon extends TestBase { btClear.setImmediate(true); btClear.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.removeAllItems(); cb2.setContainerDataSource(null); diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java index 22fc381c72..9ca5a58487 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java @@ -24,6 +24,7 @@ public class ClipContent extends TestBase { final TextField w = new TextField("Width"); w.setValue("20px"); w.addListener(new TextField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cc.setWidth(w.getValue()); } @@ -32,6 +33,7 @@ public class ClipContent extends TestBase { final TextField h = new TextField("Height"); h.setValue("20px"); h.addListener(new TextField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cc.setHeight(h.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java index 9a559f7414..4311ad1f08 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java @@ -24,6 +24,7 @@ public class CustomComponentGrowingContent extends TestBase { }); addComponent(new Button("Set long content", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { label.setValue("Longer content that should be fully visible"); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java index 43d4c70eb8..2351b02e2a 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java @@ -20,6 +20,7 @@ public class CustomComponentSizeUpdate extends TestBase { nb.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setWidth((cc.getWidth() - 20) + "px"); cc.setHeight((cc.getHeight() - 20) + "px"); diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java index 2dc3063b0c..28e4dfb385 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java @@ -54,6 +54,7 @@ public class CustomLayoutUsingTemplate extends TestBase implements return null; } + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new TextField("A text field!"), "location2"); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java index 6ea1d0a0c5..06dd39ac38 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java @@ -28,6 +28,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { VerticalLayout menu = new VerticalLayout(); menu.addComponent(new Button("Set body to label", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new Label(LoremIpsum.get(200)), "body"); } @@ -35,6 +36,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { menu.addComponent(new Button("Set body to huge NativeButton", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new NativeButton( "This is it, the body!"), "body"); @@ -53,6 +55,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new TextField("A text field!"), "location2"); } diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java b/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java index c15ca1916a..07c740a96d 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java @@ -52,6 +52,7 @@ public abstract class AbstractNestedFormExample extends TestBase { private Property.ValueChangeListener getTableValueChangeListener() { return new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (personForm != null) { removeComponent(personForm); diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java b/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java index 02c080e8fd..693b1e11b1 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java @@ -21,6 +21,7 @@ public class AddressFormExample extends TestBase { addComponent(field); Button commitButton = new Button("Save", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { field.commit(); Address address = field.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java b/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java index dc60d7e517..409ecccca8 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java @@ -23,6 +23,7 @@ public class BooleanField extends CustomField { final Button button = new Button("Click me"); button.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object value = getValue(); boolean newValue = true; diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java index 88c6f7fc45..a52b168e84 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java @@ -61,6 +61,7 @@ public class BooleanFieldExample extends TestBase { layout.addComponent(form); Button submit = new Button("Submit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.commit(); Notification.show("The custom boolean field value is " diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java b/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java index e0a3b08bc7..0bc4f45545 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java @@ -48,6 +48,7 @@ public class NestedPersonForm extends Form { buttons.setSpacing(true); Button discardChanges = new Button("Discard changes", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { NestedPersonForm.this.discard(); } @@ -56,6 +57,7 @@ public class NestedPersonForm extends Form { buttons.setComponentAlignment(discardChanges, Alignment.MIDDLE_LEFT); Button apply = new Button("Apply", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { NestedPersonForm.this.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java index 1395b4d735..c4f001ac41 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java @@ -72,6 +72,7 @@ public class CommitInvalid extends TestBase { Button validate = new Button("Validate"); validate.setDebugId("_validate"); validate.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.validate(); @@ -88,6 +89,7 @@ public class CommitInvalid extends TestBase { Button commit = new Button("Commit"); commit.setDebugId("_commit"); commit.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); @@ -103,6 +105,7 @@ public class CommitInvalid extends TestBase { form.getFooter().addComponent(commit); Button printState = new Button("printState"); printState.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printState(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java index 48bf3622d1..acca47ee5e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java @@ -37,6 +37,7 @@ public class CustomDateFormats extends TestBase { s.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setDateFieldLocale((Locale) s.getValue()); } @@ -155,6 +156,7 @@ public class CustomDateFormats extends TestBase { df.setValue(cal.getTime()); df.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateServerSideLabel((DateField) event.getProperty()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index dac3169b18..1d5554ac3e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -48,6 +48,7 @@ public class DateFieldEmptyValid extends TestBase { df.setImmediate(true); df.setResolution(DateField.RESOLUTION_DAY); df.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changeEvent"); checkEmpty(); @@ -59,6 +60,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("clear"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Clearing date aka setValue(null)"); df.setValue(null); @@ -70,6 +72,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("set4.5.1990"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting new value to datefield (4.5.1990)"); @@ -81,6 +84,7 @@ public class DateFieldEmptyValid extends TestBase { b = new Button("Set date to 5.6.2000 using a property data source"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting new object property (5.6.2000) to datefield"); @@ -97,6 +101,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("set-via-ds"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting object property (with value null) to datefield and set value of property to 27.8.2005"); @@ -111,6 +116,7 @@ public class DateFieldEmptyValid extends TestBase { b = new Button("Check value"); b.setDebugId("check-value"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Checking state"); checkEmpty(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 298359068e..2a7807670b 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -106,6 +106,7 @@ public class DateFieldInSubWindow extends AbstractTestCase { Button b = new Button("Close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TestCaseWindow.this.close(); } @@ -122,6 +123,7 @@ public class DateFieldInSubWindow extends AbstractTestCase { LegacyWindow mainWindow = new LegacyWindow(); setMainWindow(mainWindow); Button open = new Button("Open window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addWindow(new TestCaseWindow()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java index dd61ccd60c..5d06895d11 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java @@ -21,6 +21,7 @@ public class DateFieldLocale extends TestBase { addComponent(new Button("Change locale", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (dateField.getLocale().getCountry().equalsIgnoreCase("fi")) { dateField.setLocale(new Locale("zh", "CN")); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java index e7c3442060..1a3b3858b8 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java @@ -39,6 +39,7 @@ public class DateFieldMinResolution extends TestBase { idf.setImmediate(true); idf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { lbl.setValue(dformat.format(event.getProperty().getValue())); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java index bf93d8c8b9..befdd65693 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java @@ -56,6 +56,7 @@ public class DateFieldRangeValidation extends TestBase { private Range range = new Range(); private ValueChangeListener refreshField = new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { actualDateField.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index 516d207a38..392dbaf9c6 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java @@ -43,6 +43,7 @@ public class DateFieldReadOnly extends TestBase { Button b = new Button("Switch read-only"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { timeField.setReadOnly(!timeField.isReadOnly()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java index e8c8b69f9f..c502b9597e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java @@ -21,6 +21,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { private Command<T, Date> setValue = new Command<T, Date>() { + @Override public void execute(T c, Date value, Object data) { c.setValue(value); } @@ -109,6 +110,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { private Command<T, Resolution> resolutionCommand = new Command<T, Resolution>() { + @Override public void execute(T c, Resolution value, Object data) { c.setResolution(value); @@ -116,6 +118,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; private Command<T, Boolean> lenientCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setLenient(false); @@ -123,6 +126,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; private Command<T, Boolean> weekNumberCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setShowISOWeekNumbers(value); @@ -130,6 +134,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; private Command<T, String> dateFormatCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setDateFormat(value); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java index 340b647931..6f31b4d80f 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java @@ -51,6 +51,7 @@ public class DateFieldTimezone extends TestBase { timezoneSelector.setNullSelectionItemId(nullValue); timezoneSelector.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); timezoneSelector.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); TimeZone timeZone; @@ -75,6 +76,7 @@ public class DateFieldTimezone extends TestBase { dateField.setTimeZone(cal.getTimeZone()); dateField.setLocale(EN); dateField.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Date date = dateField.getValue(); DateFormat format = DateFormat.getDateTimeInstance( diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java index 9b4a3c3383..bbe2423a3f 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java @@ -15,6 +15,7 @@ public class DateFieldUnparsableDate extends TestBase { public MyDateField(String caption) { super(caption); addListener(new Property.ValueChangeListener() { + @Override public void valueChange( com.vaadin.data.Property.ValueChangeEvent event) { oldDate = getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java index 060c7fcc0a..b5842694f0 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java @@ -15,6 +15,7 @@ public class DefaultHandleUnparsableDateField extends TestBase { date.setImmediate(true); addComponent(date); date.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (date.isValid()) { getMainWindow() diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java index 8f201e120d..4e256aa947 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java @@ -16,6 +16,7 @@ public class DisabledDateFieldWidth extends TestBase { Button button = new Button("Repaint datefield", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { dateField1.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java index b8c5be57bf..c642db1bc0 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java @@ -81,6 +81,7 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { return createSelectAction("Resolution", options, "Year", new Command<InlineDateField, Resolution>() { + @Override public void execute(InlineDateField c, Resolution value, Object data) { c.setResolution(value); @@ -97,6 +98,7 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { return createSelectAction("Locale", options, LOCALES[0].toString(), new Command<InlineDateField, Locale>() { + @Override public void execute(InlineDateField c, Locale value, Object data) { c.setCaption(c.getCaption().replaceAll( diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java index cbe9ac613f..585395d747 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java @@ -73,6 +73,7 @@ public class LenientMode extends TestBase implements ValueChangeListener { } + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "New value" + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java index 1c1994cbe5..9c2d3d7d51 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java @@ -16,6 +16,7 @@ public class LowResolution extends TestBase { dateField.setValue(new java.util.Date()); dateField.setResolution(PopupDateField.RESOLUTION_MONTH); dateField.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -28,6 +29,7 @@ public class LowResolution extends TestBase { // dateField.setValue(new java.util.Date()); dateField3.setResolution(PopupDateField.RESOLUTION_YEAR); dateField3.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -40,6 +42,7 @@ public class LowResolution extends TestBase { dateField2.setValue(new java.util.Date()); dateField2.setResolution(PopupDateField.RESOLUTION_MONTH); dateField2.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -52,6 +55,7 @@ public class LowResolution extends TestBase { "Immediate (use sync button to change fields) "); immediate.setValue(true); immediate.addListener(new CheckBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean immediate = !dateField.isImmediate(); dateField.setImmediate(immediate); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java index 357c61f4f6..a12bdfa44c 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java @@ -41,6 +41,7 @@ public class PopupDateFieldExtendedRange extends TestBase { } addComponent(new Button("Change date", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { date.set(2010, 1, 16); for (PopupDateField f : fields) { diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java index 3ab1f52891..3e8b0678a7 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java @@ -27,6 +27,7 @@ public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { createSelectAction("Input prompt", category, options, "<none>", new Command<PopupDateField, String>() { + @Override public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java index ad961ee7a6..bf2a679c63 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java @@ -77,6 +77,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { return createSelectAction("Resolution", options, "Year", new Command<PopupDateField, Resolution>() { + @Override public void execute(PopupDateField c, Resolution value, Object data) { c.setResolution(value); @@ -94,6 +95,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { return createSelectAction("Input prompt", options, "<none>", new Command<PopupDateField, String>() { + @Override public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java index 6686fa6fe0..da8f45690c 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java @@ -28,6 +28,7 @@ public class ShowSelectedDateAfterInvalid extends TestBase { Button button = new Button("Validate"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { form.setValidationVisible(true); if (form.isValid()) { diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java index 578c4df903..403590f609 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java @@ -44,6 +44,7 @@ public class ValueThroughProperty extends TestBase { cal.set(Calendar.DAY_OF_MONTH, 14); Button setDateButton1 = new Button( "Set value to 12/14/10 using property", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { dateProperty.setValue(cal.getTime()); } @@ -53,6 +54,7 @@ public class ValueThroughProperty extends TestBase { Button setDateButton2 = new Button( "Set value to 12/14/10 using setValue", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setValue(cal.getTime()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java index 88542751c3..b7b0f50947 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java @@ -20,12 +20,14 @@ public class WidthRecalculationOnEnableStateChange extends TestBase { addComponent(df); addComponent(new Button("Toggle disabled for date field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setEnabled(!df.isEnabled()); } })); addComponent(new Button("Toggle read only for date field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setReadOnly(!df.isReadOnly()); } diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java index 6b89d1392c..aeb0864707 100644 --- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java +++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java @@ -80,10 +80,12 @@ public class DragAndDropWrapperTooltips extends TestBase { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java index f8874810fc..9a412cee9d 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java @@ -38,6 +38,7 @@ public class EmbeddedAltText extends TestBase { Button changeAltTexts = new Button("Change alt texts", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { e.setAlternateText("New alt text of the image!"); player.setAlternateText("New alt text of the object!"); diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java index 96b1d36901..c9b6991d8f 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java @@ -14,6 +14,7 @@ public class EmbeddedClickListenerRelativeCoordinates extends TestBase { "../runo/icons/64/ok.png")); e.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { getMainWindow() .showNotification( diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java index 1a5327c8b9..e316fcc5ec 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java @@ -45,6 +45,7 @@ public class EmbeddedImageRefresh extends TestBase { // The button requests repainting the embedded. Button button = new Button("refr"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.requestRepaint(); } @@ -52,6 +53,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("refr name"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ((StreamResource) embedded.getSource()).setFilename(new Date() .getTime() + ".png"); @@ -61,6 +63,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("200x200"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.setWidth("200px"); embedded.setHeight("200px"); @@ -69,6 +72,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("undef"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.setSizeUndefined(); } @@ -85,6 +89,7 @@ public class EmbeddedImageRefresh extends TestBase { return (int) Math.round(pos * resolution / (cells * 1.0)); } + @Override public InputStream getStream() { // Create an image and draw some background on it. BufferedImage image = new BufferedImage(640, 480, diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java index d507cebebc..c3854d2420 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java @@ -29,6 +29,7 @@ public class EmbeddedPdf extends TestBase { addComponent(player); addComponent(new Button("Remove pdf", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeComponent(player); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java index 5255b97ffa..539263a363 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java @@ -42,6 +42,7 @@ public class FormClearDatasourceRepaint extends TestBase { addComponent(form); addComponent(new Button("Clear datasource", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(null); } @@ -49,6 +50,7 @@ public class FormClearDatasourceRepaint extends TestBase { addComponent(new Button("Change data source", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>( new MyBean())); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java index 6bc7cb5cca..907b8a27f3 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java @@ -34,6 +34,7 @@ public class FormCommitWithInvalidValues extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java index 63369413f6..76ea039756 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java @@ -17,6 +17,7 @@ public class FormDescription extends TestBase { addComponent(new Button("Toggle description", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (form.getDescription() == null) { form.setDescription("Form description"); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java index ecf3215005..41e1a91781 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java @@ -49,6 +49,7 @@ public class FormRenderingFlicker extends TestBase { table.setImmediate(true); table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { clicked(event.getItem()); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormTest.java b/tests/testbench/com/vaadin/tests/components/form/FormTest.java index 451a1b7fa3..ec7ba2e03c 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormTest.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormTest.java @@ -30,6 +30,7 @@ public class FormTest extends AbstractFieldTest<Form> { private Command<Form, String> footerWidthCommand = new Command<Form, String>() { + @Override public void execute(Form c, String value, Object data) { Layout footer = c.getFooter(); if (footer != null) { @@ -40,6 +41,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, String> footerHeightCommand = new Command<Form, String>() { + @Override public void execute(Form c, String value, Object data) { Layout footer = c.getFooter(); if (footer != null) { @@ -51,6 +53,7 @@ public class FormTest extends AbstractFieldTest<Form> { private Command<Form, Class<? extends Layout>> formLayoutCommand = new Command<Form, Class<? extends Layout>>() { + @Override public void execute(Form c, Class<? extends Layout> value, Object data) { if (value == null) { c.setLayout(null); @@ -73,6 +76,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, Class<? extends Layout>> formFooterCommand = new Command<Form, Class<? extends Layout>>() { + @Override public void execute(Form c, Class<? extends Layout> value, Object data) { if (value == null) { c.setFooter(null); @@ -92,6 +96,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, Item> formItemDataSourceCommand = new Command<Form, Item>() { + @Override public void execute(Form c, Item value, Object data) { c.setItemDataSource(value); } @@ -148,6 +153,7 @@ public class FormTest extends AbstractFieldTest<Form> { options.put("Default", DefaultFieldFactory.get()); options.put("Custom FieldFactory", new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { Class<?> type = item.getItemProperty(propertyId).getType(); @@ -186,6 +192,7 @@ public class FormTest extends AbstractFieldTest<Form> { Command<Form, FormFieldFactory> formFactoryCommand = new Command<Form, FormFieldFactory>() { + @Override public void execute(Form c, FormFieldFactory value, Object data) { c.setFormFieldFactory(value); c.setItemDataSource(c.getItemDataSource()); @@ -227,6 +234,7 @@ public class FormTest extends AbstractFieldTest<Form> { } Command<Form, Alignment> footerComponentAlignmentCommand = new Command<Form, Alignment>() { + @Override public void execute(Form c, Alignment value, Object data) { Layout l = c.getFooter(); if (l instanceof AlignmentHandler) { diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java index 689ba7ea83..ed1a3d9bd9 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java @@ -20,6 +20,7 @@ public class FormWithEnterShortCut extends TestBase { Button button = new Button("Go"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("search: " + tf.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java index b803f8667f..24d207739e 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java @@ -18,6 +18,7 @@ public class FormWithPropertyFormatterConnected extends TestBase { Form form2 = new Form(); form2.setFormFieldFactory(new FormFieldFactory() { + @Override public Field createField(Item item, Object propertyId, Component uiContext) { AbstractField f = (AbstractField) DefaultFieldFactory.get() diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java index e74969f637..0055c3782e 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java @@ -20,6 +20,7 @@ public class FormLayoutCaptionStyles extends TestBase { fl.addComponent(new Button("Toggle Text field 2 bold style", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if ("bold".equals(f2.getStyleName())) { f2.setStyleName(""); diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java index 648bbd2d52..165827eb6b 100644 --- a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java +++ b/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java @@ -45,6 +45,7 @@ public class GridLayoutInForm extends TestBase { addComponent(new Button("Use 15 first fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds .subList(0, 15)); @@ -52,6 +53,7 @@ public class GridLayoutInForm extends TestBase { })); addComponent(new Button("Use 15 last fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds.subList(35, 50)); @@ -59,6 +61,7 @@ public class GridLayoutInForm extends TestBase { })); addComponent(new Button("Use all fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds); } diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java index da0efe9464..1c10b1d9d7 100644 --- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java +++ b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java @@ -22,6 +22,7 @@ public class MoveComponentsFromGridLayoutToInnerLayout extends TestBase { testButton = new Button("Click to move to inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.addComponent(testButton); } @@ -37,6 +38,7 @@ public class MoveComponentsFromGridLayoutToInnerLayout extends TestBase { Button b = new Button("Repaint inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index a7430705f5..d2ab0787da 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -42,17 +42,20 @@ public class BasicJavaScriptComponent extends AbstractTestRoot { public class ExampleWidget extends AbstractJavaScriptComponent { public ExampleWidget() { registerRpc(new TestRpc() { + @Override public void sendRpc(String message) { log.log("Got RPC message: " + message); } }); registerCallback("messageToServer", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { log.log("Got callback message: " + arguments.getString(0)); } }); registerCallback("reportParentIds", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { JSONArray parentIds = arguments.getJSONArray(0); if (!parentIds.getString(0).equals(getConnectorId())) { diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java index a5bb291b67..61caf9a2f2 100644 --- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java +++ b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java @@ -27,6 +27,7 @@ public class HundredPercentWideLabelResize extends TestBase { getLayout().addComponent( new Button("toggle width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (getLayout().getWidth() == 500) { getLayout().setWidth("100px"); diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java index 6547e7a20f..17c3dc8402 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java @@ -14,12 +14,14 @@ public class LabelTest extends AbstractComponentTest<Label> implements private Command<Label, Object> setValueCommand = new Command<Label, Object>() { + @Override public void execute(Label c, Object value, Object data) { c.setValue(value); } }; private Command<Label, Boolean> valueChangeListenerCommand = new Command<Label, Boolean>() { + @Override public void execute(Label c, Boolean value, Object data) { if (value) { c.addListener(LabelTest.this); @@ -31,6 +33,7 @@ public class LabelTest extends AbstractComponentTest<Label> implements }; private Command<Label, ContentMode> contentModeCommand = new Command<Label, ContentMode>() { + @Override public void execute(Label c, ContentMode value, Object data) { c.setContentMode(value); } @@ -87,6 +90,7 @@ public class LabelTest extends AbstractComponentTest<Label> implements valueChangeListenerCommand); } + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { Object o = event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java index 166d0bda77..82969fdb08 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java @@ -28,6 +28,7 @@ public class LabelWrapping extends TestBase { Button changeLength = new Button("Change length"); changeLength.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (longLabel.getValue().equals(longString)) { longLabel.setValue(""); diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java index ce8626444c..f14e1afd8c 100644 --- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java +++ b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java @@ -15,6 +15,7 @@ public class LinkToPercentage extends TestBase { protected void setup() { String filename = "110% Vaadin"; ApplicationResource resource = new StreamResource(new StreamSource() { + @Override public InputStream getStream() { return new InputStream() { boolean first = true; diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java index 3bab03287c..a3fa973bc2 100644 --- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java +++ b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java @@ -8,12 +8,14 @@ import com.vaadin.ui.ListSelect; public class ListSelects extends AbstractSelectTestCase<ListSelect> { private Command<ListSelect, Integer> rowsCommand = new Command<ListSelect, Integer>() { + @Override public void execute(ListSelect c, Integer value, Object data) { c.setRows(value); } }; private Command<ListSelect, Integer> colsCommand = new Command<ListSelect, Integer>() { + @Override public void execute(ListSelect c, Integer value, Object data) { c.setColumns(value); } diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java index bbc7d2ca7e..629edc2130 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java @@ -31,6 +31,7 @@ public class LoginFormTest extends TestBase { */ private static final long serialVersionUID = 1L; + @Override public void onLogin(LoginEvent event) { login((LoginForm) event.getSource(), event.getLoginParameter("username"), @@ -43,6 +44,7 @@ public class LoginFormTest extends TestBase { Button changeWidth = new Button("Change width", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (loginForm.getWidth() < 0) { loginForm.setWidth("300px"); @@ -55,6 +57,7 @@ public class LoginFormTest extends TestBase { Button changeHeight = new Button("Change height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (loginForm.getHeight() < 0) { loginForm.setHeight("200px"); @@ -88,6 +91,7 @@ public class LoginFormTest extends TestBase { + "' logged in"); Button logoutButton = new Button("Log out", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); loginFormLayout.replaceComponent(b.getParent(), diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 1295cadf95..83f89f0214 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -27,6 +27,7 @@ public class LoginFormWithMultipleWindows extends Application { private static final long serialVersionUID = 1L; + @Override public void onLogin(LoginEvent event) { showNotification(event.getLoginParameter("username") + ":" + event.getLoginParameter("password")); diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/tests/testbench/com/vaadin/tests/components/media/Media.java index 84b6974293..a1977c6ba1 100644 --- a/tests/testbench/com/vaadin/tests/components/media/Media.java +++ b/tests/testbench/com/vaadin/tests/components/media/Media.java @@ -27,6 +27,7 @@ public class Media extends TestBase { addComponent(v); addComponent(new Button("Play video", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.play(); } @@ -34,6 +35,7 @@ public class Media extends TestBase { })); addComponent(new Button("Pause video", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.pause(); } @@ -50,6 +52,7 @@ public class Media extends TestBase { addComponent(new Button("Play audio", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.play(); } @@ -57,6 +60,7 @@ public class Media extends TestBase { })); addComponent(new Button("Pause audio", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.pause(); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java index ba22bcb7a4..d7585af8ac 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java @@ -44,6 +44,7 @@ public class MenuBarHtmlItems extends ComponentTestCase<MenuBar> { private Component createSwitchHtmlAction() { return createBooleanAction("Html content allowed", false, new Command<MenuBar, Boolean>() { + @Override public void execute(MenuBar c, Boolean value, Object data) { c.setHtmlContentAllowed(value.booleanValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java index ede0c0c5a5..3af07645d6 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java @@ -47,6 +47,7 @@ public class MenuBarNavigation extends TestBase implements Command { return 5174; } + @Override public void menuSelected(MenuItem selectedItem) { log.log("MenuItem " + getName(selectedItem) + " selected"); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java index f162386336..c093a61812 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java @@ -10,6 +10,7 @@ public class MenuBarRootItemSelectWithKeyboard extends TestBase { @Override protected void setup() { Command c = new Command() { + @Override public void menuSelected(MenuItem selectedItem) { getMainWindow().showNotification(selectedItem.getText()); diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java index 2dc119bf43..5ab2b2145f 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java @@ -141,6 +141,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { /* COMMANDS */ Command<MenuBar, Integer> createRootMenuItems = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { rootItems = value; createRootItems(c); @@ -149,6 +150,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { Command<MenuBar, Integer> createSubMenuItems = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subItems = value; createSubItems(c); @@ -157,6 +159,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { Command<MenuBar, Integer> setSubMenuLevels = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subLevels = value; createSubItems(c); @@ -164,6 +167,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { }; private Command<MenuBar, Integer> setMenuIcons = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { iconInterval = value; updateIcons(c); @@ -172,6 +176,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setSubMenuDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subMenuDensity = value; createSubItems(c); @@ -180,6 +185,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemDisabledDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { disabledDensity = value; createRootItems(c); @@ -188,6 +194,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemInvisibleDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { invisibleDensity = value; createRootItems(c); @@ -196,6 +203,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemCheckableDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { checkableDensity = value; createRootItems(c); @@ -204,6 +212,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setSubMenuSeparatorDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subMenuSeparatorDensity = value; createSubItems(c); @@ -212,6 +221,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Boolean> setOpenRootOnHover = new Command<MenuBar, Boolean>() { + @Override public void execute(MenuBar c, Boolean value, Object data) { openRootMenuOnHover = value; c.setAutoOpen(value); @@ -221,6 +231,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> selectIcon = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { iconSize = value; updateIcons(c); @@ -231,6 +242,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private MenuBar.Command menuCommand = new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { log("Menu item '" + selectedItem.getText() + "' selected"); diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java index 011439f810..94023db2d0 100644 --- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java +++ b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java @@ -20,6 +20,7 @@ public class NativeButtonHtml extends TestBase { final NativeButton swapButton = new NativeButton("<i>Swap button<i>"); swapButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { swapButton.setHtmlContentAllowed(!swapButton .isHtmlContentAllowed()); diff --git a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java index ec46757106..80b088f03a 100644 --- a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java +++ b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java @@ -35,6 +35,7 @@ public class NativeSelects extends AbstractSelectTestCase<NativeSelect> { private Command<NativeSelect, Integer> columnsAction = new Command<NativeSelect, Integer>() { + @Override public void execute(NativeSelect c, Integer value, Object data) { c.setColumns(value); } diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java index b0c597004e..ab632a2a57 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java +++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java @@ -50,6 +50,7 @@ public class Notifications extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { Notification n = new Notification(tf.getValue(), (Integer) type.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java index 547ef3077b..25bc05c771 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java @@ -17,6 +17,7 @@ public class NotificationsAndModalWindow extends TestBase { Button b = new Button("Button"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("This is a window"); w.setModal(true); diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java index 8e42db57f3..767d16b6da 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java @@ -44,6 +44,7 @@ public class NotificationsHtmlAllowed extends TestBase implements ClickListener return 6097; } + @Override public void buttonClick(ClickEvent event) { Notification n = makeNotification(); n.show(Page.getCurrent()); diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java index 4668ef5ab8..877f9aa675 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java @@ -52,6 +52,7 @@ public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Toggle selection mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { if (og.isMultiSelect()) { @@ -69,6 +70,7 @@ public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Invert disabled items", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { for (Object itemId : c.getItemIds()) { diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java index 0f6ae8917a..179d1aa5ff 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java @@ -54,6 +54,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { private Component createInvertHtmlItemsAction() { return createButtonAction("Toggle html mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { og.setHtmlContentAllowed(!og.isHtmlContentAllowed()); @@ -65,6 +66,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Toggle selection mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { if (og.isMultiSelect()) { @@ -82,6 +84,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Invert disabled items", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { for (Object itemId : c.getItemIds()) { diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java index ff860f3293..4c08a902ab 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java @@ -33,6 +33,7 @@ public class OptionGroupMultipleValueChange extends TestBase { og.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String s = "ValueChange: " + event.getProperty().getValue(); events.setValue(events.getValue() + "\n" + s); diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java index f8af6b07e4..c20de87ec7 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java @@ -21,6 +21,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { createDisabledItemsMultiToggle("Disabled items"); createBooleanAction("HTML content allowed", CATEGORY_STATE, false, new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { og.setHtmlContentAllowed(value.booleanValue()); @@ -39,6 +40,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { createSelectAction(string, CATEGORY_DECORATIONS, options, options .keySet().iterator().next(), new Command<OptionGroup, ThemeResource>() { + @Override public void execute(OptionGroup c, ThemeResource icon, Object data) { Collection<?> itemIds = c.getItemIds(); @@ -58,6 +60,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { private Command<OptionGroup, Boolean> enabledItemCommand = new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { c.setItemEnabled(data, value); diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java index 4f4faf15bb..821a5dbb93 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java @@ -59,6 +59,7 @@ public class LayoutClickListenerTest extends TestBase { // Listen for layout click events layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { // Get the deepest nested component which was clicked diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index 455c16c425..539cb482f0 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -38,6 +38,7 @@ public class LayoutResizeTest extends TestBase { Button resize = new Button("Resize to 700x400", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { JavaScript .getCurrent() @@ -48,6 +49,7 @@ public class LayoutResizeTest extends TestBase { left.addComponent(resize); resize = new Button("Resize to 900x600", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { JavaScript .getCurrent() diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index 172e808070..46fd6ee852 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -29,18 +29,21 @@ public class OrderedLayoutCases extends AbstractTestRoot { setStyleName("sampleChild"); addComponent(createSimpleSelector("Child width", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setWidth(event.getProperty().getValue().toString()); } }, dimensionValues)); addComponent(createSimpleSelector("Child height", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setHeight(event.getProperty().getValue().toString()); } }, dimensionValues)); addComponent(createSimpleSelector("Caption", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue() .toString(); @@ -56,6 +59,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { addComponent(createSimpleSelector("Expand ratio", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { AbstractOrderedLayout parent = (AbstractOrderedLayout) getParent(); if (parent == null) { @@ -79,6 +83,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { } addComponent(createSimpleSelector("Alignment", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue() .toString(); @@ -128,6 +133,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { sizeBar.addComponent(createSimpleSelector("Layout width", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setWidth(event.getProperty().getValue() .toString()); @@ -135,6 +141,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, dimensionValues)); sizeBar.addComponent(createSimpleSelector("Layout height", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setHeight(event.getProperty().getValue() .toString()); @@ -142,6 +149,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, dimensionValues)); sizeBar.addComponent(createSimpleSelector("Spacing", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setSpacing(Boolean.parseBoolean(event .getProperty().getValue().toString())); @@ -149,6 +157,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, "false", "true")); sizeBar.addComponent(createSimpleSelector("Margin", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setMargin(Boolean.parseBoolean(event .getProperty().getValue().toString())); @@ -156,6 +165,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, "false", "true")); sizeBar.addComponent(createSimpleSelector("Direction", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); @@ -189,6 +199,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { HorizontalLayout caseBar = new HorizontalLayout(); caseBar.addComponent(new Button("Undefined without relative", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); setState(sizeBar, 2, 1); @@ -202,6 +213,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Undefined with relative", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // width: 100% to middle child @@ -210,6 +222,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Fixed with overflow", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // layout width: 350px @@ -220,6 +233,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Fixed with extra space", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -237,6 +251,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Expand with alignment", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -254,6 +269,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Multiple expands", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -276,6 +292,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Fixed + relative height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout height: 100% @@ -293,6 +310,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Undefined + relative height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Height: 350px to left child diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java index 501c377ab7..a18400ce08 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java @@ -26,6 +26,7 @@ public class ReplaceComponentNPE extends TestBase { Button changer = new Button("ReplaceComponent"); changer.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getLayout().replaceComponent(button, outer); outer.addComponent(button); diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index f20f26153f..945ccf0e28 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -43,6 +43,7 @@ public class VerticalLayoutWidthCalculation extends AbstractTestCase { Button btn = new Button("Show/hide"); btn.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf2.setVisible(!tf2.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java b/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java index 671b2c3fca..b3eac5c82e 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java +++ b/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java @@ -37,6 +37,7 @@ public class BasicPanelTest extends TestBase { final CheckBox heightSelection = new CheckBox("Undefined height"); heightSelection.setImmediate(true); heightSelection.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (heightSelection.getValue() == Boolean.TRUE) { panel.setHeight(null); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java index 4859b22932..7722e182ff 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -48,6 +48,7 @@ public class PanelChangeContents extends AbstractTestRoot implements setContent(content); } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == statsButton) { panel.setContent(stats); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java index 65a185b160..40f6d5ea33 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java @@ -12,6 +12,7 @@ public class PanelClickListenerRelativeCoordinates extends TestBase { Panel panel = new Panel("Panel's caption"); panel.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { getMainWindow() .showNotification( diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java index 65754de0f3..c8d9690703 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java @@ -23,6 +23,7 @@ public class PanelShouldNotScroll extends TestBase { p.addComponent(foo()); addMore = new Button("Add"); addMore.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.removeComponent(addMore); p.addComponent(foo()); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java index eec39359aa..5ca5c5135f 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java @@ -34,6 +34,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button add = new Button("Add an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { add(); } @@ -42,6 +43,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button addAnother = new Button("Add another action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addAnother(); } @@ -50,6 +52,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button remove = new Button("Remove an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove(); } @@ -73,12 +76,14 @@ public class PanelShouldRemoveActionHandler extends TestBase { panel.setCaption(panel.getCaption() + " - Added handler"); Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Left", ShortcutAction.KeyCode.ARROW_LEFT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); @@ -92,12 +97,14 @@ public class PanelShouldRemoveActionHandler extends TestBase { public void addAnother() { Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Right", ShortcutAction.KeyCode.ARROW_RIGHT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java index 481c134ee6..75f95977bd 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java @@ -20,6 +20,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[0]); b[0] = new Button("Open popupview 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[0].setPopupVisible(true); } @@ -38,6 +39,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[1]); b[1] = new Button("Open popupview 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[1].setPopupVisible(true); } @@ -55,6 +57,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[2]); b[2] = new Button("Open popupview 3", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[2].setPopupVisible(true); } @@ -72,6 +75,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[3]); b[3] = new Button("Open popupview 4", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[3].setPopupVisible(true); } diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java index 72183e3570..a9a3a0b008 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java @@ -42,6 +42,7 @@ public class PopupViewOffScreen extends TestBase { Button showall = new Button("Popup all", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (PopupView pv : popupViews) { pv.setPopupVisible(true); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java index 7e917630c8..271a7eea2a 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java @@ -24,10 +24,12 @@ public class PopupViewShouldCloseOnTabOut extends TestBase { protected void setup() { PopupView pv = new PopupView(new Content() { + @Override public String getMinimizedValueAsHTML() { return "<b>click me</b>"; } + @Override public Component getPopupComponent() { VerticalLayout vl = new VerticalLayout(); TextField field1 = new TextField(); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java index 5ed0a375fe..069ccef2bb 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java @@ -27,6 +27,7 @@ public class PopupViewWithRTE extends TestBase { VerticalLayout vl = new VerticalLayout(); + @Override public String getMinimizedValueAsHTML() { String value = rte.getValue(); if (value == null || "".equals(value)) { @@ -40,6 +41,7 @@ public class PopupViewWithRTE extends TestBase { return value.toString(); } + @Override public Component getPopupComponent() { return vl; } diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java index 89f6d155f2..bef3cfced8 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -18,6 +18,7 @@ public class ReopenPopupView extends AbstractTestRoot { addComponent(log); addComponent(new PopupView("PopupView", new Button("Button", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked"); } diff --git a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java index 62dba61191..9f632ac806 100644 --- a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java +++ b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java @@ -22,6 +22,7 @@ public class ProgressIndicatorInvisible extends TestBase { addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { // If we skip hiding the layout, hiding the ProgressIndicator // will stop the polling diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java index cb7b991bda..4155dd8a07 100644 --- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java @@ -14,6 +14,7 @@ public class RichTextAreaTest extends AbstractFieldTest<RichTextArea> { private Command<RichTextArea, Boolean> nullSelectionAllowedCommand = new Command<RichTextArea, Boolean>() { + @Override public void execute(RichTextArea c, Boolean value, Object data) { c.setNullSettingAllowed(value); @@ -21,6 +22,7 @@ public class RichTextAreaTest extends AbstractFieldTest<RichTextArea> { }; private Command<RichTextArea, String> nullRepresentationCommand = new Command<RichTextArea, String>() { + @Override public void execute(RichTextArea c, String value, Object data) { c.setNullRepresentation(value); } diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java index 3b77de8b86..73d7a95e9f 100644 --- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java @@ -20,6 +20,7 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase { ShortcutAction save = new ShortcutAction("^Save"); private Action[] actions = new Action[] { save }; + @Override public void handleAction(Action action, Object sender, Object target) { String msg = "Action: " + action.getCaption(); msg += " From : " + sender.getClass().getSimpleName() + " '" @@ -38,6 +39,7 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase { } + @Override public Action[] getActions(Object target, Object sender) { return actions; } diff --git a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java index 251672fb9a..d34c7718ce 100644 --- a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java +++ b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java @@ -17,12 +17,14 @@ public class UriFragmentTest extends AbstractTestRoot { addComponent(fragmentLabel); updateLabel(); getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent event) { updateLabel(); } }); addComponent(new Button("Navigate to #test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getPage().setFragment("test"); } diff --git a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java index 0565811e15..7c2d8dd243 100644 --- a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -146,6 +146,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { (c).setNullSelectionAllowed(value); } @@ -153,6 +154,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> multiselectCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setMultiSelect(value); } @@ -160,6 +162,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Object> nullSelectItemIdCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.setNullSelectionItemId(value); } @@ -167,6 +170,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Integer> itemsInContainerCommand = new Command<T, Integer>() { + @Override public void execute(T t, Integer value, Object data) { items = value; updateContainer(); @@ -175,6 +179,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Integer> propertiesInContainerCommand = new Command<T, Integer>() { + @Override public void execute(T t, Integer value, Object data) { properties = value; updateContainer(); @@ -183,6 +188,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> itemClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((ItemClickNotifier) c) @@ -206,6 +212,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends /* COMMANDS END */ + @Override public void itemClick(ItemClickEvent event) { String type = event.getButtonName(); if (event.isDoubleClick()) { diff --git a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java index 931686003a..470c97442f 100644 --- a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java +++ b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java @@ -22,6 +22,7 @@ public class ComboBoxAddWhileFiltering extends TestBase { Button b = new Button("add item (^N)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addItem(comboBox); } diff --git a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java index dd2a8bb1a8..6f203bf8c9 100644 --- a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java +++ b/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java @@ -14,6 +14,7 @@ public class FocusListenerBreaksDropdownMenu extends TestBase { } comboBox.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FieldEvents.FocusEvent event) { comboBox.addItem(); } diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java index d5577e213c..75a3f1b751 100644 --- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java +++ b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java @@ -108,6 +108,7 @@ public class NativeSelects extends ComponentTestCase<NativeSelect> { actions.add(createBooleanAction("Null selection allowed", false, new Command<NativeSelect, Boolean>() { + @Override public void execute(NativeSelect c, Boolean value, Object data) { c.setNullSelectionAllowed(value); diff --git a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java index 74ebb08826..984bab5b34 100644 --- a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java +++ b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java @@ -36,6 +36,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { button = new Button( "Select null with select(NULL_ITEM_ID) (should make value null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mySelect.select(NULL_ITEM_ID); } @@ -46,6 +47,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { button = new Button( "Select null with setValue(null) (should make value null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mySelect.setValue(null); } @@ -55,6 +57,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { } + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( "mySelect.getValue() returns: " + mySelect.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java index 743dc071c9..b9ae958a03 100644 --- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java @@ -143,6 +143,7 @@ public class SelectDisplaysOldValue extends TestBase { private class ControllerUpdatedListener implements Property.ValueChangeListener { + @Override public void valueChange(Property.ValueChangeEvent valueChangeEvent) { refreshSlaveDropdown((Integer) valueChangeEvent.getProperty() .getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java b/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java index b3911f19c7..b97231ae8e 100644 --- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java +++ b/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java @@ -19,6 +19,7 @@ public class StylingPopupOpener extends TestBase { addComponent(select); addComponent(new Button("Update style", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { select.setStyleName("mystyle"); } diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java index cf33e2c7ff..789174260f 100644 --- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java +++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java @@ -20,6 +20,7 @@ public class TwinColSelectCaptionStyles extends TestBase { Button b = new Button("Set height and width to 500px", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { sel.setHeight("500px"); sel.setWidth("500px"); diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java index 031a7e9d3d..b27dfa0ec8 100644 --- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java +++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java @@ -7,12 +7,14 @@ import com.vaadin.ui.TwinColSelect; public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, Integer> rowsCommand = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setRows(value); } }; private Command<TwinColSelect, Integer> colsCommand = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setColumns(value); } @@ -20,6 +22,7 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, String> leftColumnCaptionCommand = new Command<TwinColSelect, String>() { + @Override public void execute(TwinColSelect c, String value, Object data) { c.setLeftColumnCaption(value); } @@ -27,6 +30,7 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, String> rightColumnCaptionCommand = new Command<TwinColSelect, String>() { + @Override public void execute(TwinColSelect c, String value, Object data) { c.setRightColumnCaption(value); } diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java index e34a294740..9be1fea987 100644 --- a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java +++ b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java @@ -8,23 +8,27 @@ import com.vaadin.ui.Slider; public class SliderTest extends AbstractFieldTest<Slider> { private Command<Slider, Double> minCommand = new Command<Slider, Double>() { + @Override public void execute(Slider c, Double value, Object data) { c.setMin(value); } }; private Command<Slider, Double> maxCommand = new Command<Slider, Double>() { + @Override public void execute(Slider c, Double value, Object data) { c.setMax(value); } }; private Command<Slider, Integer> orientationCommand = new Command<Slider, Integer>() { + @Override public void execute(Slider c, Integer value, Object data) { c.setOrientation(value); } }; private Command<Slider, Integer> resolutionCommand = new Command<Slider, Integer>() { + @Override public void execute(Slider c, Integer value, Object data) { c.setResolution(value); } diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java index 1f7b6b7cbe..dc361b1b27 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java @@ -13,6 +13,7 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> private Command<T, Boolean> splitterClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((SplitterClickListener) AbstractSplitPanelTest.this); @@ -23,12 +24,14 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> } }; private Command<T, SplitPosition> setSplitPositionCommand = new Command<T, AbstractSplitPanelTest.SplitPosition>() { + @Override public void execute(T c, SplitPosition value, Object data) { value.apply(c); } }; private Command<T, Boolean> splitterLockCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setLocked(value); } @@ -122,6 +125,7 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> } + @Override public void splitterClick(SplitterClickEvent event) { log(event.getClass().getSimpleName() + ": " + event.getButtonName() + " at " + event.getRelativeX() + "," + event.getRelativeY()); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index d4716433b7..05e10397ac 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -53,6 +53,7 @@ public class SplitPanelExtraScrollbars extends AbstractTestCase implements return 3458; } + @Override public void buttonClick(ClickEvent event) { if (b.getHeight() == 200) { b.setHeight("1200px"); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java index ef17a3c668..a86d209f65 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java @@ -26,6 +26,7 @@ public class SplitPanelReversePosition extends TestBase { hsplit.setImmediate(true); hsplit.setSplitPosition(100, Sizeable.UNITS_PIXELS, hsplitReversed); hsplit.addListener(new HorizontalSplitPanel.SplitterClickListener() { + @Override public void splitterClick(SplitterClickEvent event) { getMainWindow().showNotification("Horizontal Splitter Clicked"); } @@ -40,6 +41,7 @@ public class SplitPanelReversePosition extends TestBase { vsplit.setImmediate(true); vsplit.setSplitPosition(10, Sizeable.UNITS_PERCENTAGE, vsplitReversed); vsplit.addListener(new SplitterClickListener() { + @Override public void splitterClick(SplitterClickEvent event) { getMainWindow().showNotification("Vertical Splitter Clicked"); } @@ -61,6 +63,7 @@ public class SplitPanelReversePosition extends TestBase { buttons.addComponent(new Button("Swap horizontal positioning", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { hsplitReversed = !hsplitReversed; hsplit.setSplitPosition(100, Sizeable.UNITS_PIXELS, @@ -71,6 +74,7 @@ public class SplitPanelReversePosition extends TestBase { buttons.addComponent(new Button("Swap vertical positioning", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vsplitReversed = !vsplitReversed; vsplit.setSplitPosition(10, Sizeable.UNITS_PERCENTAGE, diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java index 5fad68fef5..08e602241f 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java @@ -47,6 +47,7 @@ public class SplitPanelSplitterWidth extends TestBase { getLayout().addComponent( new Button("Unlock", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { split.setLocked(false); split2.setLocked(false); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java index 470a47f160..26abd0a782 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java @@ -19,6 +19,7 @@ public class SplitPanelSwapComponents extends TestBase { getLayout().addComponent(hsplit); Button swap = new Button("Swap components", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Component first = hsplit.getFirstComponent(); hsplit.removeComponent(first); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index f7c3dd84e4..2a730da9be 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -276,6 +276,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { Button disableMinimum = new Button("Disable min limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMinSplitPosition(0, Sizeable.UNITS_PERCENTAGE); @@ -284,6 +285,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button enableMinimum = new Button("Enable min limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE); @@ -292,6 +294,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button disableMaximum = new Button("Disable max limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMaxSplitPosition(100, Sizeable.UNITS_PERCENTAGE); @@ -300,6 +303,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button enableMaximum = new Button("Enable max limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java index e8445f8422..bde50af013 100644 --- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java @@ -20,6 +20,7 @@ public class AddItemToEmptyTable extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { rightTable.setColumnWidth("name", 150); @@ -36,6 +37,7 @@ public class AddItemToEmptyTable extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { rightTable.setColumnWidth("info", 20); @@ -71,6 +73,7 @@ public class AddItemToEmptyTable extends TestBase { Button b = new Button("Add item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object id = rightTable.addItem(); Item item = rightTable.getItem(id); @@ -83,6 +86,7 @@ public class AddItemToEmptyTable extends TestBase { b = new Button("Clear", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { rightTable.removeAllItems(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java b/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java index 5486d6248d..80b136d2ab 100644 --- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java +++ b/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java @@ -22,6 +22,7 @@ public class AddNonRenderedRow extends TestBase { Button addrowButton = new Button("Add row"); addrowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent pEvent) { addRow(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java index 08bbd0790f..35f35c1407 100644 --- a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java @@ -16,6 +16,7 @@ public class CellStyleGeneratorTest extends TestBase { CellStyleGenerator g = new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null && propertyId.equals("red")) { return "red"; diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java index 95e94bcd47..08b65e2ef5 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java @@ -30,10 +30,12 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { final Action H = new Action("Toggle Col2"); final Action[] actions = new Action[] { H }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { table.setColumnCollapsed("Col2", !table.isColumnCollapsed("Col2")); @@ -55,6 +57,7 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { final TextField tf = new TextField("Column name (ColX)"); Button hide = new Button("Collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(tf.getValue(), true); } @@ -63,6 +66,7 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { Button show = new Button("Show", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(tf.getValue(), false); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java index d3dfa61ceb..2898750113 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java @@ -23,6 +23,7 @@ public class ColumnGeneratorAddingOrder extends TestBase { Table t = new Table(); t.addGeneratedColumn("col2", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("generated b c2"); @@ -39,6 +40,7 @@ public class ColumnGeneratorAddingOrder extends TestBase { t.setContainerDataSource(c); t.addGeneratedColumn("col1", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("generated b c1"); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java index fdcb458a6a..324d1a63cf 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java @@ -30,6 +30,7 @@ public class ColumnHeaderAlignments extends TestBase { theme.setNullSelectionAllowed(false); theme.setImmediate(true); theme.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setTheme(String.valueOf(event.getProperty().getValue())); } @@ -38,6 +39,7 @@ public class ColumnHeaderAlignments extends TestBase { CheckBox footers = new CheckBox("Show footers"); footers.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean visible = (Boolean) event.getProperty().getValue(); fooTable.setFooterVisible(visible); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java index 4c1fc70e5e..f32633eece 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java @@ -83,6 +83,7 @@ public class ColumnReorderEvent extends TestBase { table.setColumnHeader("lastname", "LastName"); table.addListener(new Table.ColumnReorderListener() { + @Override public void columnReorder( com.vaadin.ui.Table.ColumnReorderEvent event) { order.setValue(aToString(table.getVisibleColumns())); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java index 29131b8d7a..f092ba8bca 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java @@ -84,6 +84,7 @@ public class ColumnResizeEvent extends TestBase { column3Width.setValue(table.getColumnWidth("150pxfixedCol") + "px"); table.addListener(new ColumnResizeListener() { + @Override public void columnResize(com.vaadin.ui.Table.ColumnResizeEvent event) { if (event.getPropertyId().equals("firstname")) { diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java index b8e9226ad2..c76edca40d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java +++ b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java @@ -68,6 +68,7 @@ public class ContainerChangeWithPartlySamePropertyIds extends TestBase { Button switchContainerButton = new Button("switch container"); switchContainerButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (testTable.getContainerDataSource() == containerA) { testTable.setContainerDataSource(containerB); @@ -80,6 +81,7 @@ public class ContainerChangeWithPartlySamePropertyIds extends TestBase { Button clearButton = new Button("clear (click twice)"); clearButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { me.removeComponent(testTable); diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java index 84e98deffb..c24be6de96 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java @@ -32,6 +32,7 @@ public class ContainerSizeChange extends TestBase { Button b = new Button("Decrease size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ds.decreaseSize(); } @@ -42,6 +43,7 @@ public class ContainerSizeChange extends TestBase { b = new Button("Increase size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ds.increaseSize(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java index 86646f522f..c52f57358c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java +++ b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java @@ -16,6 +16,7 @@ public class DisabledTableShouldNotSendPageLengthUpdates extends TestBase { HorizontalSplitPanel split = new HorizontalSplitPanel(); table.addContainerProperty("name", Integer.class, 0); Button button = new Button("Add items", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < 5; i++) { Object id = table.addItem(); diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java index c048c770fa..920ccc2038 100644 --- a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java @@ -40,6 +40,7 @@ public class DoublesInTable extends TestBase { editMode.setImmediate(true); editMode.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setEditable(editMode.getValue()); @@ -50,6 +51,7 @@ public class DoublesInTable extends TestBase { useCustomConverters.setImmediate(true); useCustomConverters.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recreateTable(); } @@ -75,6 +77,7 @@ public class DoublesInTable extends TestBase { cb.setValue(Locale.US); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recreateTable(); } @@ -134,6 +137,7 @@ public class DoublesInTable extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value is now: " + event.getProperty().getValue()); @@ -145,12 +149,14 @@ public class DoublesInTable extends TestBase { private void addConverters(Table t) { t.setConverter("sex", new Converter<String, Sex>() { + @Override public Sex convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { // not used in this test - Table only converts to presentation return null; } + @Override public String convertToPresentation(Sex value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -159,22 +165,26 @@ public class DoublesInTable extends TestBase { return value.getStringRepresentation(); } + @Override public Class<Sex> getModelType() { return Sex.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("deceased", new Converter<String, Boolean>() { + @Override public Boolean convertToModel(String value, Locale locale) { // not used in this test - Table only converts from source to // target return null; } + @Override public String convertToPresentation(Boolean value, Locale locale) { if (value == null || value) { return "YES, DEAD!"; @@ -183,16 +193,19 @@ public class DoublesInTable extends TestBase { } } + @Override public Class<Boolean> getModelType() { return Boolean.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("age", new Converter<String, Integer>() { + @Override public Integer convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { // not used in this test - Table only converts from source to @@ -200,6 +213,7 @@ public class DoublesInTable extends TestBase { return null; } + @Override public String convertToPresentation(Integer value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -216,32 +230,38 @@ public class DoublesInTable extends TestBase { } } + @Override public Class<Integer> getModelType() { return Integer.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("address", new Converter<String, Address>() { + @Override public Address convertToModel(String value, Locale locale) throws ConversionException { // not used in this test - Table only converts to presentation return null; } + @Override public String convertToPresentation(Address value, Locale locale) throws ConversionException { return value.getStreetAddress() + ", " + value.getCity() + " (" + value.getCountry() + ")"; } + @Override public Class<Address> getModelType() { return Address.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java index acb866a1da..5db294088a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java @@ -44,6 +44,7 @@ public class EditableModeChange extends TestBase { items.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { if (event.isDoubleClick()) { selectionEvent = event; diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java index 8aa6d1277f..f7adc98103 100644 --- a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java +++ b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java @@ -88,6 +88,7 @@ public class EditableTableLeak extends TestBase { useFieldFactory.setImmediate(true); useFieldFactory.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (useFieldFactory.getValue()) { table.setTableFieldFactory(new CachingFieldFactory()); @@ -111,6 +112,7 @@ public class EditableTableLeak extends TestBase { addComponent(sizeLabel); addComponent(new Button("Show size of the table", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.requestRepaintAll(); updateSize(); @@ -119,6 +121,7 @@ public class EditableTableLeak extends TestBase { })); addComponent(new Button("Select the second row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.select("AL"); updateSize(); diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.java b/tests/testbench/com/vaadin/tests/components/table/Footer.java index c962ce8468..7fd8d3563f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Footer.java +++ b/tests/testbench/com/vaadin/tests/components/table/Footer.java @@ -50,6 +50,7 @@ public class Footer extends TestBase { final CheckBox visible = new CheckBox("Footers Visible", true); visible.setImmediate(true); visible.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setFooterVisible((Boolean) visible.getValue()); @@ -61,6 +62,7 @@ public class Footer extends TestBase { final TextField footer1Value = new TextField(null, "Footer1"); footer1Value.setImmediate(true); Button footer1Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col1", footer1Value.getValue() == null ? "" : footer1Value @@ -75,6 +77,7 @@ public class Footer extends TestBase { final TextField footer2Value = new TextField(null, "Footer2"); footer2Value.setImmediate(true); Button footer2Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col2", footer2Value.getValue() == null ? "" : footer2Value @@ -89,6 +92,7 @@ public class Footer extends TestBase { final TextField footer3Value = new TextField(null, "Footer3"); footer3Value.setImmediate(true); Button footer3Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col3", footer3Value.getValue() == null ? "" : footer3Value diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java index 2ae663986b..08dc47908a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java +++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java @@ -42,6 +42,7 @@ public class FooterClick extends TestBase { // Add a footer click listener table.addListener(new Table.FooterClickListener() { + @Override public void footerClick(FooterClickEvent event) { columnField.setValue(String.valueOf(event.getPropertyId())); log.log("Clicked on footer: " + event.getPropertyId()); @@ -53,6 +54,7 @@ public class FooterClick extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -65,6 +67,7 @@ public class FooterClick extends TestBase { columnReorderingCheckbox .addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java index d5debcfe16..b335e34d84 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java @@ -28,6 +28,7 @@ public class HeaderClick extends TestBase { // Add a header click listener table.addListener(new Table.HeaderClickListener() { + @Override public void headerClick(HeaderClickEvent event) { columnField.setValue(String.valueOf(event.getPropertyId())); } @@ -38,6 +39,7 @@ public class HeaderClick extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -48,6 +50,7 @@ public class HeaderClick extends TestBase { sortEnabledCheckbox.setValue(table.isSortEnabled()); sortEnabledCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSortDisabled(!(Boolean) event.getProperty().getValue()); } @@ -60,6 +63,7 @@ public class HeaderClick extends TestBase { columnReorderingCheckbox .addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java index cd54e21395..ec82b36575 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java @@ -33,6 +33,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -45,6 +46,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { private HeaderClickListener headerClickListener = new HeaderClickListener() { + @Override public void headerClick(HeaderClickEvent event) { String type = event.isDoubleClick() ? "Double click" : "Click"; @@ -55,6 +57,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { }; + @Override public void valueChange(ValueChangeEvent event) { if (table.getListeners(HeaderClickEvent.class).isEmpty()) { table.addListener(headerClickListener); @@ -72,6 +75,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { private FooterClickListener footerClickListener = new FooterClickListener() { + @Override public void footerClick(FooterClickEvent event) { String type = event.isDoubleClick() ? "Double click" : "Click"; @@ -81,6 +85,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { } }; + @Override public void valueChange(ValueChangeEvent event) { if (table.getListeners(FooterClickEvent.class).isEmpty()) { table.addListener(footerClickListener); @@ -95,6 +100,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { sortEnabledCheckbox.setImmediate(true); sortEnabledCheckbox.setValue(table.isSortEnabled()); sortEnabledCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSortEnabled((Boolean) event.getProperty().getValue()); } @@ -106,6 +112,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed()); columnReorderingCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event.getProperty() .getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java index f1e4e09d57..6dafdd3dd5 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java @@ -20,6 +20,7 @@ public class HeaderUpdateWhenNoRows extends TestBase { final CheckBox showHeaders = new CheckBox("Show headers"); showHeaders.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (showHeaders.getValue()) { table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); diff --git a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java index 007c93573f..4a729d221f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java +++ b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java @@ -35,12 +35,14 @@ public class HiddenColumnsExpandRatios extends TestBase { } addComponent(new Button("All", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisibleColumns(table.getContainerPropertyIds() .toArray()); } })); addComponent(new Button("Some", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setWidth("100px"); table.setWidth("800px"); diff --git a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java index 3478750622..434d650d6d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java +++ b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java @@ -22,6 +22,7 @@ public class HugeRowCount extends TestBase { final TextField tf = new TextField("Rows"); tf.setValue(String.valueOf(100000)); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.setSize(Integer.parseInt(tf.getValue().toString())); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java index 537461ce0f..4bdb20adea 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java +++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java @@ -27,6 +27,7 @@ public class ItemClickEvents extends TestBase { HorizontalLayout ol = createHorizontalLayout(tree); Button b = new Button("icon", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (tree.getItemIconPropertyId() == null) { tree.setItemIconPropertyId("icon"); @@ -55,6 +56,7 @@ public class ItemClickEvents extends TestBase { "http://www.itmill.com/res/images/itmill_logo.gif")); tree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { logEvent(event, "tree"); } @@ -73,6 +75,7 @@ public class ItemClickEvents extends TestBase { } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { logEvent(event, "table"); } @@ -82,6 +85,7 @@ public class ItemClickEvents extends TestBase { addComponent(log); addComponent(new Button("Clear log", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.clear(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java index e662db338c..2998940db1 100644 --- a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java +++ b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java @@ -41,6 +41,7 @@ public class KeyControl extends TestBase { layout1.addComponent(table1); table1.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { @SuppressWarnings("unchecked") Set<String> value = (Set<String>) table1.getValue(); @@ -63,6 +64,7 @@ public class KeyControl extends TestBase { layout2.addComponent(table2); table2.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = table2.getValue() == null ? "No selected items" : table2.getValue().toString(); @@ -86,6 +88,7 @@ public class KeyControl extends TestBase { layout3.addComponent(table3); table3.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { @SuppressWarnings("unchecked") Set<String> value = (Set<String>) table3.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java index 44a2dcd9a9..bc0601684f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java +++ b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java @@ -35,6 +35,7 @@ public class KeyboardNavigationWithChangingContent extends TestBase { new Button("Change elements and selection", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { bic.removeAllItems(); diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index de0d2b8d56..895e05c111 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -56,6 +56,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { System.out.println("Clickevent on item " + event.getItemId() + ", column: " + event.getPropertyId()); diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java b/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java index 2100d3852e..b7379b4f2c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java +++ b/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java @@ -16,6 +16,7 @@ public class LastColumnNegative extends TestBase { Button addButton = new Button("Add a table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.addComponent(table); } @@ -24,6 +25,7 @@ public class LastColumnNegative extends TestBase { Button removeButton = new Button("Remove a table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.removeComponent(table); } @@ -31,6 +33,7 @@ public class LastColumnNegative extends TestBase { Button shrinkWrapper = new Button("Shrink wrapper", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.setWidth("400px"); } diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java index 0196395bf4..43a89e4211 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java @@ -41,6 +41,7 @@ public class LongMultiselect extends TestBase { // Add action button layout.addComponent(new Button("Do It", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { // Set ItemProperty.COLUMN2 for all selected values of table Collection selectedIds = (Collection) table.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java index 5f65b40f2f..e51cec2a6d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java +++ b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java @@ -43,6 +43,7 @@ public class MissingScrollbar extends TestBase { Button b = new Button("Set items to 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setContainerDataSource(container2); } @@ -51,6 +52,7 @@ public class MissingScrollbar extends TestBase { b = new Button("Set items to 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setContainerDataSource(container50); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java index a472b43ce7..00965220db 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java +++ b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java @@ -26,12 +26,14 @@ public class ModifyContainerProperty extends TestBase { table.setContainerDataSource(ic); addComponent(new Button("Remove container property", new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { ic.removeContainerProperty("one"); } })); addComponent(new Button("Add container property", new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { boolean added = ic.addContainerProperty("three", String.class, "three"); diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java index d437ab7a04..0e440a95d0 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java @@ -21,6 +21,7 @@ public class MultiClickingItemThatDetachesTable extends TestBase { item.getItemProperty("p1").setValue(i + ""); } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { if (event.isDoubleClick()) { try { diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java index 6773f0a96c..06deb98f7f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java +++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java @@ -20,6 +20,7 @@ public class MultiSelectWithNotIdentityEqualIds extends TestBase { t.setSelectable(true); t.setImmediate(true); t.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Notification.show("Selected: " + event.getProperty()); diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java index 758fa4bf1a..0b5b1d139c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java +++ b/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java @@ -29,6 +29,7 @@ public class ProgrammaticUnselectInRange extends TestBase { table.addItem(new Object[] { value }, value); } table.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateSelectionLabel(); } @@ -37,6 +38,7 @@ public class ProgrammaticUnselectInRange extends TestBase { addComponent(table); addComponent(selectionLabel); addComponent(new Button("Deselect item 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.unselect(Integer.valueOf(2)); } diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java index 311c3cf3c1..1bc9cf525d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java @@ -44,6 +44,7 @@ public class PropertyValueChange extends TestBase { return i * 3; } + @Override public Component generateCell(Table source, Object itemId, Object columnId) { final Label l = new Label(); @@ -57,6 +58,7 @@ public class PropertyValueChange extends TestBase { if (integer instanceof Property.ValueChangeNotifier) { Property.ValueChangeNotifier notifier = (Property.ValueChangeNotifier) integer; notifier.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { l.setValue(String.valueOf(getMultipliedValue(integer))); } @@ -144,6 +146,7 @@ class MyFieldFactory extends DefaultFieldFactory { cb.setContainerDataSource(texts); cb.setNewItemsAllowed(true); cb.setNewItemHandler(new NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { texts.addItem(newItemCaption); cb.setValue(newItemCaption); diff --git a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java index 82d5508c72..c6d071f34c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java @@ -33,6 +33,7 @@ public class RowAdditionTest extends TestBase { HorizontalLayout hl = new HorizontalLayout(); hl.addComponent(new Button("Add first", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(0, new Object()); item.getItemProperty("column1").setValue("0"); @@ -40,6 +41,7 @@ public class RowAdditionTest extends TestBase { })); hl.addComponent(new Button("Add at position 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(50, new Object()); item.getItemProperty("column1").setValue("50"); @@ -47,6 +49,7 @@ public class RowAdditionTest extends TestBase { })); hl.addComponent(new Button("Add at position 100", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(100, new Object()); item.getItemProperty("column1").setValue("100"); diff --git a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java index 1ddb03c316..c3bf46c12d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java @@ -34,6 +34,7 @@ public class RowGenerators extends TestBase implements RowGenerator { return c; } + @Override public GeneratedRow generateRow(Table table, Object itemId) { if ((Integer) itemId % 5 == 0) { if ((Integer) itemId % 10 == 0) { diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java index d3ba232f79..a9d5869e5f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java @@ -18,6 +18,7 @@ public class RowUpdateShouldRetainContextMenu extends TestBase { protected void setup() { indicator.setWidth("200px"); indicator.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // Do some changes to the table table.setColumnHeader("Column", "Column " + ctr); @@ -49,9 +50,11 @@ public class RowUpdateShouldRetainContextMenu extends TestBase { table.setHeight("200px"); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new Action("Action 1"), new Action("Action 2"), }; diff --git a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java index 133a5e83a5..dffab6dbad 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java +++ b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java @@ -33,6 +33,7 @@ public class SafariRenderingBugWhiteSpace extends TestBase { table.setSizeFull(); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (table.getValue() == null) { split.setSplitPosition(100, Sizeable.UNITS_PERCENTAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java index 44367d0fe1..5cc77f23d9 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java +++ b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java @@ -47,6 +47,7 @@ public class ScrollDetachSynchronization extends TestBase { first.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (mainLayout.getComponent(1).equals(secondLayout)) { mainLayout.replaceComponent(secondLayout, firstLayout); @@ -56,6 +57,7 @@ public class ScrollDetachSynchronization extends TestBase { }); second.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (mainLayout.getComponent(1).equals(firstLayout)) { mainLayout.replaceComponent(firstLayout, secondLayout); diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java index cfe0301775..d9401c21b4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java +++ b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java @@ -14,6 +14,7 @@ public class SelectingItemScrollsRight extends TestBase { table.setWidth("300px"); table.setColumnWidth("Column", 500); table.addGeneratedColumn("Column", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Label( diff --git a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java index 536348a393..aebb494247 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java +++ b/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java @@ -30,6 +30,7 @@ public class SetCurrentPageFirstItemId extends TestBase { Button addrowButton = new Button("Add row"); addrowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent pEvent) { Object id = addRow(); table.setCurrentPageFirstItemId(id); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java index a616d4dfb3..18eec814bc 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java @@ -25,6 +25,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (((Boolean) event.getProperty().getValue())) { table.addListener(TableAndBrowserContextMenu.this); @@ -40,6 +41,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cbActionHandler.setImmediate(true); cbActionHandler.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (((Boolean) event.getProperty().getValue())) { table.addActionHandler(TableAndBrowserContextMenu.this); @@ -55,6 +57,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cbActionHasActions.setImmediate(true); cbActionHasActions.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { actionHandlerHasActions = ((Boolean) event.getProperty() .getValue()); @@ -80,6 +83,7 @@ public class TableAndBrowserContextMenu extends TestBase implements // Add a generated column with a link to Google table.addGeneratedColumn("Search", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -131,11 +135,13 @@ public class TableAndBrowserContextMenu extends TestBase implements return 5924; } + @Override public void itemClick(ItemClickEvent event) { getMainWindow() .showNotification("Click using " + event.getButtonName()); } + @Override public Action[] getActions(Object target, Object sender) { if (!actionHandlerHasActions) { return null; @@ -144,6 +150,7 @@ public class TableAndBrowserContextMenu extends TestBase implements return new Action[] { new Action("test") }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification("Action: " + action.getCaption()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java index 3c6445349a..75f2679234 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java @@ -45,6 +45,7 @@ public class TableCacheBuildEfficiency extends TestBase { Button b = new Button("Click to add row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.addItem(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index ee04813ce6..1a8fc37634 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -43,6 +43,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -53,6 +54,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -66,6 +68,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -80,6 +83,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Embedded embedded = new Embedded(null, new ThemeResource( @@ -91,10 +95,12 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { table.setDragMode(TableDragMode.ROW); table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { DataBoundTransferable t = (DataBoundTransferable) event .getTransferable(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java index 79a7eca852..00df9fa3c3 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java @@ -61,6 +61,7 @@ public class TableClickValueChangeInteraction extends TestBase { if (listenClicks) { table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { table.requestRepaint(); clickLabel.setValue("Click " + event.getItemId()); @@ -70,6 +71,7 @@ public class TableClickValueChangeInteraction extends TestBase { if (listenValueChanges) { table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { valueChangeLabel.setValue("Value " + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java index fbe7ed88ef..1895191cc4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java @@ -15,6 +15,7 @@ public class TableColumnResizeContentsWidth extends TestBase { protected void setup() { final Table table = new Table(); table.addGeneratedColumn(COL1, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { TextField textField = new TextField(); @@ -30,12 +31,14 @@ public class TableColumnResizeContentsWidth extends TestBase { addComponent(table); addComponent(new Button("Increase width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnWidth(COL1, table.getColumnWidth(COL1) + 20); table.requestRepaint(); } })); addComponent(new Button("Decrease width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnWidth(COL1, table.getColumnWidth(COL1) - 40); table.requestRepaint(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java index 06afd406ef..9416ffe70c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java @@ -16,10 +16,12 @@ public class TableContextMenu extends TestBase { table.setMultiSelect(true); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show("Done that :-)"); } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { ACTION_MYACTION }; } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java index 4c6f658a24..3b639be21f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java @@ -22,11 +22,13 @@ public class TableContextMenuOnField extends TestBase { table.setMultiSelect(true); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { // TODO Auto-generated method stub } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { ACTION_MYACTION }; } @@ -34,6 +36,7 @@ public class TableContextMenuOnField extends TestBase { table.addGeneratedColumn("layout", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { @@ -42,6 +45,7 @@ public class TableContextMenuOnField extends TestBase { layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { getMainWindow().showNotification("HELLO"); @@ -53,6 +57,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("textfield", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new TextField(); @@ -60,6 +65,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("link", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Link("Link", null); @@ -67,6 +73,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("button", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("Button"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 27b962cddd..0173f928dd 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -34,6 +34,7 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase { CheckBox showHeaders = new CheckBox("Show headers"); showHeaders.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { // table body height is now 77px, which together diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java index 1f15b224dc..0d5d6802d7 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java @@ -23,6 +23,7 @@ public class TableItemDescriptionGeneratorTest extends TestBase { addComponent(table); table.setItemDescriptionGenerator(new ItemDescriptionGenerator() { + @Override public String generateDescription(Component source, Object itemId, Object propertyId) { if (propertyId == null) { @@ -37,6 +38,7 @@ public class TableItemDescriptionGeneratorTest extends TestBase { table.addGeneratedColumn(COLUMN3_PROPERTY_ID, new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { TextField lbl = new TextField(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java index 91ca8256c8..74a5089a84 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java @@ -28,6 +28,7 @@ public class TableModifcationsWhenScrolledRight extends TestBase { btn.addListener(new ClickListener() { Integer row = 2; + @Override public void buttonClick(ClickEvent event) { t.addItem(row).getItemProperty("name").setValue("Row" + row); row++; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java index c33ba30193..88d20b9eb0 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java @@ -28,6 +28,7 @@ public class TableMultiSelectSimple extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TreeSet<?> sorted = new TreeSet<Object>((Set<?>) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java index c7f138ea8f..75b672a277 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java @@ -47,6 +47,7 @@ public class TablePageLengthUpdate extends TestBase { Button updateButton = new Button("Update pageLength", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { updatePageLengthLabel(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java index 5354525f1e..2b02e89c80 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java @@ -17,6 +17,7 @@ public class TableRepaintWhenMadeVisibile extends TestBase { Button show = new Button("show", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisible(true); } @@ -24,6 +25,7 @@ public class TableRepaintWhenMadeVisibile extends TestBase { addComponent(show); Button hide = new Button("hide", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisible(false); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java index b3864ae0e4..eb5efbc4f3 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java @@ -89,6 +89,7 @@ public class TableRowHeight extends TestBase { public class LabelColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -104,6 +105,7 @@ public class TableRowHeight extends TestBase { public class LayoutColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java index 4053665898..4782ca94f7 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java @@ -14,6 +14,7 @@ public class TableScrollOnFocus extends TestBase { chkSelectable.setImmediate(true); chkSelectable.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSelectable((Boolean) chkSelectable.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java index d64bc0035d..030a4ee259 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java @@ -26,6 +26,7 @@ public class TableShouldNotEatValueChanges extends TestBase { tf.setTabIndex(1); ItemClickListener l = new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { Notification.show("TF Value on the server:" + tf.getValue(), Notification.TYPE_WARNING_MESSAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java index 62d0cce9df..827593cd91 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java @@ -22,6 +22,7 @@ public class TableSingleSelect extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Selected value: " + event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java index a0d9b8e69d..6417e8e853 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java @@ -32,6 +32,7 @@ public class TableSorting extends TestBase { // Handle selection change. testTable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.out.println("ValueChanged: " + testTable.getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java index 0cc125acaa..0465d2f886 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -140,6 +140,7 @@ public class TableToggleVisibility extends AbstractTestCase { addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean wasVisible = ToggleButton.this.table.isVisible(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java index 73b80f62f4..544fe9bb67 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java @@ -39,6 +39,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Fixed size (200x200)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setWidth("200px"); tbl.setHeight("200px"); @@ -48,6 +49,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Fixed size (600x200)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setWidth("600px"); tbl.setHeight("200px"); @@ -57,6 +59,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Undefined size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setSizeUndefined(); log.log("Size undefined"); @@ -68,6 +71,7 @@ public class TableUndefinedSize extends TestBase { pageLength.setImmediate(true); pageLength.setNullSelectionAllowed(false); pageLength.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { int pageLength = Integer.valueOf(event.getProperty().getValue() .toString()); @@ -81,6 +85,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); tbl.setColumnCollapsed("Column 1", !value); @@ -98,6 +103,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); tbl.setColumnCollapsed("Column 2", !value); @@ -116,6 +122,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java index 6fd4a9db52..11f450baf2 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java @@ -76,12 +76,14 @@ public class TableUnregisterComponent extends TestBase { addComponent(table); addComponent(new Button("Switch column collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(COL_A, !table.isColumnCollapsed(COL_A)); } })); addComponent(new Button("Switch editable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setEditable(!table.isEditable()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java index ad8eacb4b7..98cd4e0aaa 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java @@ -46,6 +46,7 @@ public class TableVisibleColumnsUpdate extends TestBase { Button updateButton = new Button("Change columns", new ClickListener() { private boolean one = true; + @Override public void buttonClick(ClickEvent event) { table.setVisibleColumns((one ? cols2 : cols1)); one = !one; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java index 1d1c162cae..7eb9c3239c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java @@ -27,6 +27,7 @@ public class TableWithChildComponents extends TestBase implements ClickListener table.addGeneratedColumn(COL2, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { return new Button( @@ -58,6 +59,7 @@ public class TableWithChildComponents extends TestBase implements ClickListener return null; } + @Override public void buttonClick(ClickEvent event) { log.log("Click on " + event.getButton().getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java index 1b0335b673..733f46959a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java @@ -23,6 +23,7 @@ public class TableWithContainerRequiringEqualsForItemId extends TestBase { super(MyEntity.class); setBeanIdResolver(new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() { + @Override public Long getIdForBean(MyEntity bean) { // Return a new instance every time to ensure Table can // handle it @@ -46,10 +47,12 @@ public class TableWithContainerRequiringEqualsForItemId extends TestBase { protected void setup() { Table t = new Table("Table with 1000 item"); t.addGeneratedColumn("Actions", new Table.ColumnGenerator() { + @Override public Component generateCell(final Table source, final Object itemId, final Object columnId) { Button tripFolderLink = new Button("Button" + itemId); tripFolderLink.addListener(new Button.ClickListener() { + @Override public void buttonClick(final ClickEvent event) { log.log("Button " + event.getButton().getCaption() + " clicked"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java index 404ba5d779..226fde3b29 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java @@ -30,6 +30,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button1 = new Button("Column 1: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 1 - noncollapsible", @@ -38,6 +39,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { }); final Button button2 = new Button("Column 2: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 2 - collapsible", @@ -47,6 +49,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button3 = new Button("Column 3: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 3 - toggle collapsing", @@ -56,6 +59,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button4 = new Button( "Column 3: make noncollapsible/collapsible", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsible( "Column 3 - toggle collapsing", diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/tests/testbench/com/vaadin/tests/components/table/Tables.java index 11ffff0655..c96625e3e4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Tables.java +++ b/tests/testbench/com/vaadin/tests/components/table/Tables.java @@ -47,6 +47,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> /* COMMANDS */ private Command<T, Align> columnAlignmentCommand = new Command<T, Align>() { + @Override public void execute(T c, Align alignment, Object propertyId) { c.setColumnAlignment(propertyId, alignment); } @@ -54,6 +55,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Boolean> columnVisibleCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean visible, Object propertyId) { List<Object> visibleColumns = new ArrayList<Object>(Arrays.asList(c .getVisibleColumns())); @@ -72,6 +74,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> columnCollapsed = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean collapsed, Object propertyId) { c.setColumnCollapsed(propertyId, collapsed); @@ -80,6 +83,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> columnCollapsibleCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean collapsible, Object propertyId) { c.setColumnCollapsible(propertyId, collapsible); @@ -88,6 +92,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> columnResizeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { if (value) { c.addListener((ColumnResizeListener) Tables.this); @@ -99,6 +104,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> headerClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((HeaderClickListener) Tables.this); @@ -110,6 +116,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> footerClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { if (value) { c.addListener((FooterClickListener) Tables.this); @@ -121,6 +128,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, RowHeaderMode> rowHeaderModeCommand = new Command<T, RowHeaderMode>() { + @Override public void execute(Table c, RowHeaderMode value, Object data) { if (value == RowHeaderMode.PROPERTY) { c.setItemCaptionPropertyId("Property 3"); @@ -131,6 +139,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, String> footerTextCommand = new Command<T, String>() { + @Override public void execute(Table c, String value, Object data) { for (Object propertyId : c.getContainerPropertyIds()) { if (value != null) { @@ -145,6 +154,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Object> alignColumnLeftCommand = new Command<T, Object>() { + @Override public void execute(T c, Object propertyId, Object data) { c.setColumnAlignment(propertyId, (Align) data); } @@ -152,17 +162,20 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, ContextMenu> contextMenuCommand = new Command<T, ContextMenu>() { + @Override public void execute(T c, final ContextMenu value, Object data) { c.removeAllActionHandlers(); if (value != null) { c.addActionHandler(new Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { log("Action " + action.getCaption() + " performed on " + target); } + @Override public Action[] getActions(Object target, Object sender) { return value.getActions(target, sender); } @@ -172,6 +185,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Integer> columnWidthCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer width, Object propertyId) { c.setColumnWidth(propertyId, width); @@ -180,6 +194,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Resource> columnIconCommand = new Command<T, Resource>() { + @Override public void execute(T c, Resource icon, Object propertyId) { c.setColumnIcon(propertyId, icon); @@ -187,6 +202,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, ColumnHeaderMode> columnHeaderModeCommand = new Command<T, ColumnHeaderMode>() { + @Override public void execute(T c, ColumnHeaderMode columnHeaderMode, Object data) { c.setColumnHeaderMode(columnHeaderMode); @@ -194,6 +210,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, String> columnHeaderCommand = new Command<T, String>() { + @Override public void execute(T c, String header, Object propertyId) { c.setColumnHeader(propertyId, header); @@ -201,6 +218,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Float> columnExpandRatioCommand = new Command<T, Float>() { + @Override public void execute(T c, Float expandRatio, Object propertyId) { c.setColumnExpandRatio(propertyId, expandRatio); } @@ -224,6 +242,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, GeneratedColumn> addGeneratedColumnCommand = new Command<T, GeneratedColumn>() { + @Override public void execute(T c, final GeneratedColumn col, Object data) { while (c.getColumnGenerator(generatedColumnId + generatedColumnNextNr) != null) { @@ -233,6 +252,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> c.addGeneratedColumn(generatedColumnId + generatedColumnNextNr, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { String value = ""; @@ -273,6 +293,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Object> removeGeneratedColumnsCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { for (int i = 0; i < generatedColumnNextNr; i++) { String columnId = generatedColumnId + i; @@ -306,12 +327,14 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, CellStyleInfo> cellStyleCommand = new Command<T, CellStyleInfo>() { + @Override public void execute(T c, final CellStyleInfo cellStyleInfo, Object data) { if (cellStyleInfo == null) { c.setCellStyleGenerator(null); } else { c.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (cellStyleInfo.appliesTo(itemId, propertyId)) { return cellStyleInfo.styleName; @@ -349,6 +372,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, GeneratedRowInfo> rowGeneratorCommand = new Command<T, GeneratedRowInfo>() { + @Override public void execute(T c, final GeneratedRowInfo generatedRowInfo, Object data) { if (generatedRowInfo == null) { @@ -356,6 +380,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> } else { c.setRowGenerator(new RowGenerator() { + @Override public GeneratedRow generateRow(Table table, Object itemId) { if (generatedRowInfo.appliesTo(itemId)) { GeneratedRow generatedRow = new GeneratedRow( @@ -373,6 +398,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> setSortEnabledCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setSortDisabled(!value); @@ -546,6 +572,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private void createColumnReorderingAllowedCheckbox(String category) { createBooleanAction("Column reordering allowed", category, true, new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { c.setColumnReorderingAllowed(value); } @@ -555,6 +582,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private void createColumnCollapsingAllowedCheckbox(String category) { createBooleanAction("Column collapsing allowed", category, true, new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setColumnCollapsingAllowed(value); } @@ -697,6 +725,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Texts in header", category, options, "None", new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { int nr = 0; for (Object propertyId : c.getContainerPropertyIds()) { @@ -746,6 +775,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createBooleanAction("Footer visible", category, true, new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setFooterVisible(value); } @@ -763,6 +793,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Header mode", category, options, "Explicit defaults id", new Command<T, ColumnHeaderMode>() { + @Override public void execute(T c, ColumnHeaderMode value, Object data) { c.setColumnHeaderMode(value); @@ -781,6 +812,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("PageLength", category, options, "10", new Command<T, Integer>() { + @Override public void execute(Table t, Integer value, Object data) { t.setPageLength(value); } @@ -801,6 +833,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Selection Mode", category, options, "Multi - ctrl/shift", new Command<T, SelectMode>() { + @Override public void execute(Table t, SelectMode value, Object data) { switch (value) { case NONE: @@ -825,16 +858,19 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }); } + @Override public void columnResize(ColumnResizeEvent event) { log("ColumnResize on " + event.getPropertyId() + " from " + event.getPreviousWidth() + " to " + event.getCurrentWidth()); } + @Override public void footerClick(FooterClickEvent event) { log("FooterClick on " + event.getPropertyId() + " using " + event.getButtonName()); } + @Override public void headerClick(HeaderClickEvent event) { log("HeaderClick on " + event.getPropertyId() + " using " + event.getButtonName()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index 7fb096739a..d629c9a917 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -50,6 +50,7 @@ public class TestCurrentPageFirstItem extends TestBase implements ClickListener baseLayout.addComponent(buttonItem); } + @Override public void buttonClick(ClickEvent event) { Item item = container.addItem(++counter); item.getItemProperty("row").setValue(counter + ""); diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index 865a50c5f7..ae3f4c42a4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -55,6 +55,7 @@ public class TextFieldRelativeWidth extends TestBase { addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = 448896474865195605L; + @Override public void valueChange( com.vaadin.data.Property.ValueChangeEvent event) { // IndexedContainer idc = (IndexedContainer) @@ -99,6 +100,7 @@ public class TextFieldRelativeWidth extends TestBase { addButton.setCaption(caption); } + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); if (b == addButton) { diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java index f3ff5e983e..9ffad7f1e4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java +++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java @@ -20,6 +20,7 @@ public class TextFieldValueGoesMissing extends TestBase { Button button = new Button("Replace label"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (verticalLayout.getComponentIndex(label1) > -1) { verticalLayout.replaceComponent(label1, label2); diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java index 99b954fa63..8e623499cf 100644 --- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java @@ -23,6 +23,7 @@ public class UncollapsedCollumnWidth extends TestBase { addComponent(table); addComponent(new Button("Uncollapse col2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed("Col2", false); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java index 3b5166a21e..4b5d216906 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java @@ -20,6 +20,7 @@ public class AddAndRemoveTabs extends TestBase { Button addTabBtn = new Button("Add new tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addTab(); } @@ -34,6 +35,7 @@ public class AddAndRemoveTabs extends TestBase { Button closeTab = new Button("Close tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.removeComponent(layout); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java index f1faecb711..434c73f778 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java @@ -46,6 +46,7 @@ public class PreventTabChange extends TestBase implements addComponent(tabSheet); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { TabSheet tabsheet = event.getTabSheet(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java index 1cd96c5c4c..2b37c4358e 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java @@ -49,6 +49,7 @@ public class RemoveTabs extends TestBase { closeCurrent = new Button("Close current tab"); closeCurrent.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -57,6 +58,7 @@ public class RemoveTabs extends TestBase { closeCurrentWithTab = new Button("Close current tab with Tab"); closeCurrentWithTab.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTabWithTab(); @@ -65,6 +67,7 @@ public class RemoveTabs extends TestBase { closeFirst = new Button("close first tab"); closeFirst.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); @@ -73,6 +76,7 @@ public class RemoveTabs extends TestBase { closeLast = new Button("close last tab"); closeLast.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeLastTab(); @@ -81,6 +85,7 @@ public class RemoveTabs extends TestBase { reorderTabs = new Button("reorder"); reorderTabs.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reorder(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java index c49133dd7c..0d4f1fe562 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java @@ -25,6 +25,7 @@ public class TabGetAndReplaceComponent extends TestBase { Button replace2 = new Button("Replace Content 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Iterator<Component> iter = tabs.getComponentIterator(); iter.next(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index a3886853ff..ba737f1df8 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -32,12 +32,14 @@ public class TabKeyboardNavigation extends TestBase { ts.setHeight("500px"); ts.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { focusblur.log("Tabsheet focused!"); } }); ts.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { focusblur.log("Tabsheet blurred!"); } @@ -48,11 +50,13 @@ public class TabKeyboardNavigation extends TestBase { } Button addTab = new Button("Add a tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addTab(); } }); Button focus = new Button("Focus tabsheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { ts.focus(); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java index 3d8d02b8b6..e3867cff9f 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java @@ -42,6 +42,7 @@ public class TabSheetCaptions extends TestBase { Button button = new Button("Update tab caption"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.getTab(panel1).setCaption( "This is a new tab caption " @@ -51,6 +52,7 @@ public class TabSheetCaptions extends TestBase { Button button2 = new Button("Update panel caption"); button2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { panel1.setCaption("This is a new panel caption " + dateFormatter.format(date)); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java index bdce3e83d0..dfe37f2e27 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java @@ -20,6 +20,7 @@ public class TabSheetDisabling extends TestBase { buttons[i] = new Button("Disable this tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); tabSheet.getTab(b).setEnabled(false); @@ -30,6 +31,7 @@ public class TabSheetDisabling extends TestBase { } else { buttons[i] = new Button("Hide this tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); tabSheet.getTab(b).setVisible(false); @@ -41,6 +43,7 @@ public class TabSheetDisabling extends TestBase { } Button button = new Button("Enable/disable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.setEnabled(!tabSheet.isEnabled()); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java index 410172ddb0..8d312f0cd8 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java @@ -32,6 +32,7 @@ public class TabSheetDiscardsMovedComponents extends TestBase { private void addTestComponent(final Component component) { grid.addComponent(component); grid.addComponent(new Button("Move to tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.addTab(component); grid.removeComponent(event.getButton()); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java index 5ae9e69975..de637bbed7 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java @@ -24,6 +24,7 @@ public class TabSheetIndexOperations extends TestBase { Button addTab = new Button("Add tab at index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabs.addTab(new Label("Content " + tabCounter), "Added Tab " + tabCounter, null, 2); @@ -34,6 +35,7 @@ public class TabSheetIndexOperations extends TestBase { Button setCaption = new Button("Invert tab caption at index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Tab tab = tabs.getTab(2); tab.setCaption(new StringBuffer(tab.getCaption()) @@ -44,6 +46,7 @@ public class TabSheetIndexOperations extends TestBase { Button move = new Button("Move selected tab to index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabs.setTabPosition(tabs.getTab(tabs.getSelectedTab()), 2); @@ -53,6 +56,7 @@ public class TabSheetIndexOperations extends TestBase { Button getIndex = new Button("Get selected tab index", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( "Index: " diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java index 105b4149a1..b6cf27f6bb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java @@ -16,6 +16,7 @@ public class TabSheetMinimal extends TestBase { ts.setStyleName("minimal"); Button b = new Button("Add a tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ts.addTab(new Label("" + index), "Tab " + index, null); index++; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java index 3c3dec478c..54a5ed4857 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java @@ -25,6 +25,7 @@ public class TabSheetTabStyleNames extends TestBase { new Button.ClickListener() { int counter = 0; + @Override public void buttonClick(ClickEvent event) { if (tab1.getStyleName() == null) { tab1.setStyleName(STYLE_NAME); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java index 3077c1a97b..fea255a98d 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java @@ -16,6 +16,7 @@ public class TabSheetTest<T extends TabSheet> extends private Command<T, Integer> setTabCaption = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setCaption((String) data); @@ -23,6 +24,7 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> setTabIcon = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setIcon((Resource) data); @@ -30,15 +32,18 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> setTabClosable = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setClosable((Boolean) data); } }; private Command<T, Boolean> setCloseHandlerListener = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.setCloseHandler(new CloseHandler() { + @Override public void onTabClose(TabSheet tabsheet, Component c) { tabClosed(tabsheet, tabsheet.getTab(c)); tabsheet.removeComponent(c); @@ -47,6 +52,7 @@ public class TabSheetTest<T extends TabSheet> extends }); } else { c.setCloseHandler(new CloseHandler() { + @Override public void onTabClose(TabSheet tabsheet, Component c) { tabsheet.removeComponent(c); } @@ -57,6 +63,7 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Boolean> setSelectedTabListener = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((SelectedTabChangeListener) TabSheetTest.this); @@ -68,12 +75,14 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> selectTab = new Command<T, Integer>() { + @Override public void execute(T c, Integer index, Object data) { c.setSelectedTab(c.getTab(index).getComponent()); } }; private Command<T, Boolean> hideTabs = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.hideTabs(value); @@ -194,6 +203,7 @@ public class TabSheetTest<T extends TabSheet> extends log("Tab " + tabSheet.getTabPosition(tab) + " closed"); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { TabSheet ts = event.getTabSheet(); log("Tab " + ts.getTabPosition(ts.getTab(ts.getSelectedTab())) diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index 24077b972c..8e4c4d40fb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -49,6 +49,7 @@ public class TabsheetNPE extends AbstractTestCase implements ClickListener { return layout; } + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < TABS_COUNT; i++) { tab[i].setEnabled(true); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java index 5321b51f9c..da449a2461 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java @@ -22,6 +22,7 @@ public class TabsheetScrolling extends TestBase { Button b = new Button("Hide this tab (" + i + ")", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { fixedSizeTabSheet.getTab(event.getButton()) .setVisible(false); @@ -44,6 +45,7 @@ public class TabsheetScrolling extends TestBase { Button b = new Button("Hide this tab (" + i + ")", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { autoWideTabSheet.getTab(event.getButton()) .setVisible(false); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java index 3872f7a8dd..7a676c63fb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java @@ -17,6 +17,7 @@ public class WrapTabSheetInTabSheet extends TestBase { Button b = new Button("Wrap main layout in a TabSheet"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TabSheet tabsheet = new TabSheet(); ComponentContainer mainParent = (ComponentContainer) mainLayout diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java index 0fc63860e1..992f20843b 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java @@ -33,6 +33,7 @@ public class TextAreaCursorPosition extends TestBase { newTextField.setTextChangeEventMode(TextChangeEventMode.EAGER); newTextField.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { AbstractTextField component = (AbstractTextField) event .getComponent(); diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java index 278d14e43d..e071bdd8fb 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java @@ -8,12 +8,14 @@ import com.vaadin.ui.TextArea; public class TextAreaTest extends AbstractTextFieldTest<TextArea> { private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() { + @Override public void execute(TextArea c, Boolean value, Object data) { c.setWordwrap(value); } }; private Command<TextArea, Integer> rowsCommand = new Command<TextArea, Integer>() { + @Override public void execute(TextArea c, Integer value, Object data) { c.setRows(value); } diff --git a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java index b33a1a4765..8672d4019e 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java @@ -31,6 +31,7 @@ public class Wordwrap extends TestBase { CheckBox onoff = new CheckBox("Wrap state for the right field"); onoff.setValue(false); onoff.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean wrap = (Boolean) event.getProperty().getValue(); area2.setWordwrap(wrap); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java index bf9924cdbb..938ecf60ce 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java @@ -31,10 +31,12 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase { final Action enter = new ShortcutAction("enter", ShortcutAction.KeyCode.ENTER, null); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { enter }; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == enter) { @@ -43,6 +45,7 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase { }); testField.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue().toString(); addComponent(new Label("TextField sent value: " + value)); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java index 62d3a1679a..58bc4c5383 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java @@ -20,6 +20,7 @@ public class MultipleTextChangeEvents extends TestBase { tf.setTextChangeEventMode(TextChangeEventMode.TIMEOUT); tf.setTextChangeTimeout(500); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { log.log("TextChangeEvent: " + event.getText()); } @@ -35,10 +36,12 @@ public class MultipleTextChangeEvents extends TestBase { Action actionenter = new ShortcutAction("Enter", ShortcutAction.KeyCode.ENTER, null); + @Override public Action[] getActions(Object theTarget, Object theSender) { return new Action[] { actionenter }; } + @Override public void handleAction(Action theAction, Object theSender, Object theTarget) { log.log("Enter"); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java index cf59a9d7f4..89f9ffda40 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java @@ -82,6 +82,7 @@ public class OutOfSyncIssueWithKeyboardShortcut extends TestBase { saveButton.setClickShortcut(KeyCode.ENTER); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); if (value != null) { @@ -96,6 +97,7 @@ public class OutOfSyncIssueWithKeyboardShortcut extends TestBase { }); saveButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.commit(); Topping entity = getEntityForItem(form.getItemDataSource()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java index 962a85ffcb..f6368f0c78 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java @@ -28,6 +28,7 @@ public class SelectionAndCursorPosition extends TestBase { CheckBox ml = new CheckBox("Multiline"); ml.setImmediate(true); ml.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (textField.getApplication() == null) { replaceComponent(textArea, textField); @@ -42,6 +43,7 @@ public class SelectionAndCursorPosition extends TestBase { Button b = new Button("Select all ( selectAll() )"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { activeComponent.selectAll(); } @@ -55,6 +57,7 @@ public class SelectionAndCursorPosition extends TestBase { final TextField length = new TextField("Selection length:"); b = new Button("select"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { int startPos = Integer.parseInt(start.getValue()); int lenght = Integer.parseInt(length.getValue()); @@ -72,6 +75,7 @@ public class SelectionAndCursorPosition extends TestBase { final TextField pos = new TextField("Position:"); b = new Button("set"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { int startPos = Integer.parseInt(pos.getValue()); activeComponent.setCursorPosition(startPos); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java index d81d26591a..da4ea9de0b 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java @@ -28,6 +28,7 @@ public class SetTabIndex extends TestBase { final CheckBox readonly = new CheckBox("Readonly"); readonly.setImmediate(true); readonly.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean readonly = Boolean.valueOf(event.getProperty() .getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java index b3ea5b8186..a12a5a8836 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java @@ -19,6 +19,7 @@ public class TextChangeEvents extends TestBase { TextChangeListener inputEventListener = new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.log("Text change event for " + event.getComponent().getCaption() @@ -91,6 +92,7 @@ public class TextChangeEvents extends TestBase { + ".nomatch {background:red;}"); } + @Override public void textChange(TextChangeEvent event) { boolean atTheEndOfText = event.getText().length() == getCursorPosition(); String match = findMatch(event.getText()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java index b40ebb2434..363e9d448d 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java @@ -23,12 +23,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(tf); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { System.err.println(tf.getCaption() + " textChange"); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -36,12 +38,14 @@ public class TextChangeEvents2 extends TestBase { tf.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { System.err.println(tf.getCaption() + " blur"); } }); tf.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { System.err.println(tf.getCaption() + " focus"); } @@ -55,12 +59,14 @@ public class TextChangeEvents2 extends TestBase { final Label l = new Label(); getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.setValue(event.getText()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -77,12 +83,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.setValue(event.getText()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -98,12 +106,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf.setValue(event.getText().toUpperCase()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -124,6 +134,7 @@ public class TextChangeEvents2 extends TestBase { tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String txt = event.getText(); int len = txt.length(); @@ -149,6 +160,7 @@ public class TextChangeEvents2 extends TestBase { }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TextField tf = (TextField) event.getProperty(); String val = (String) tf.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java index 22348bb5b5..1a49729b6f 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java @@ -13,6 +13,7 @@ public class TextChangeEventsEternalLoop extends TestBase { getLayout().addComponent(tf); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf.setValue(event.getText()); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java index ab3fd49cd6..ebb8b88411 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java @@ -18,6 +18,7 @@ public class TextChangeEventsWithNonImmediateValueChange extends TestBase { TextChangeListener inputEventListener = new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.log("Text change event, text content currently:'" + event.getText() + "' Cursor at index:" @@ -31,6 +32,7 @@ public class TextChangeEventsWithNonImmediateValueChange extends TestBase { tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { l.log("Value change: '" + event.getProperty().getValue() + "'"); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java index 8a3678ab62..5b84ff20f2 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java @@ -31,6 +31,7 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase { }; tf2.setTextChangeEventMode(TextChangeEventMode.EAGER); tf2.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf2.setStyleName(getNextStyle()); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java index 2f0c54ee39..00783e0106 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java @@ -18,6 +18,7 @@ public class TextChangeTimeoutAfterDetach extends TestBase { field.setTextChangeTimeout(2000); field.setTextChangeEventMode(TextChangeEventMode.TIMEOUT); field.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { // Need to add a listener for events to occur } @@ -26,6 +27,7 @@ public class TextChangeTimeoutAfterDetach extends TestBase { Button detachBtn = new Button("detach field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeComponent(field); getLayout().addComponentAsFirst( diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java index 08751a59fd..e103afbe62 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java @@ -14,6 +14,7 @@ public class TextFieldEagerRepaint extends TestBase { final TextField tf1 = new TextField("Updates value"); tf1.setTextChangeEventMode(TextChangeEventMode.EAGER); tf1.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String text = event.getText(); if (!text.matches("[a-z]*")) { @@ -26,6 +27,7 @@ public class TextFieldEagerRepaint extends TestBase { final TextField tf2 = new TextField("Updates width"); tf2.setTextChangeEventMode(TextChangeEventMode.EAGER); tf2.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String text = event.getText(); if (!text.matches("[a-z]*")) { diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java index e2f5c45b72..21dba6a196 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java @@ -40,12 +40,14 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements tf2.setWidth("300px"); tf2.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TextFieldFocusAndBlurListeners.this.valueChange(event); } }); tf2.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { TextFieldFocusAndBlurListeners.this.focus(event); } @@ -53,6 +55,7 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements }); tf2.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { TextFieldFocusAndBlurListeners.this.blur(event); } @@ -76,11 +79,13 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements addComponent(tf4); } + @Override public void focus(FocusEvent event) { log.log(event.getComponent().getCaption() + ": Focus"); } + @Override public void blur(BlurEvent event) { TextField tf = (TextField) event.getComponent(); log.log(tf.getCaption() + ": Blur. Value is: " @@ -88,6 +93,7 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements } + @Override public void valueChange(ValueChangeEvent event) { TextField tf = (TextField) event.getProperty(); log.log(tf.getCaption() + ": ValueChange: " + tf.getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java index c04c9d6c13..d52efa0572 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java @@ -19,6 +19,7 @@ public class TextFieldInputPromptAndClickShortcut extends TestBase { final TextField textField = new TextField(); Button button = new Button("Show Text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Field value: " + textField.getValue()); } @@ -28,6 +29,7 @@ public class TextFieldInputPromptAndClickShortcut extends TestBase { final CheckBox inputPromptSelection = new CheckBox("Input prompt"); inputPromptSelection.setImmediate(true); inputPromptSelection.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (event.getProperty().getValue() == Boolean.TRUE) { textField.setInputPrompt("Input prompt"); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java index b753978666..747301f4e4 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java @@ -24,6 +24,7 @@ public class TextFieldWithProperty extends TestBase { Button b = new Button( "Set BAR to underlaying property (should propagate to UI)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { op.setValue("BAR"); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java index ea4b572604..4184892545 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java @@ -28,10 +28,12 @@ public class TextFieldWithPropertyFormatter extends TestBase { property = new Property<BigDecimal>() { private BigDecimal value; + @Override public BigDecimal getValue() { return value; } + @Override public void setValue(Object newValue) throws ReadOnlyException { if (newValue == null) { value = null; @@ -43,14 +45,17 @@ public class TextFieldWithPropertyFormatter extends TestBase { } } + @Override public Class<BigDecimal> getType() { return BigDecimal.class; } + @Override public boolean isReadOnly() { return false; } + @Override public void setReadOnly(boolean newStatus) { // ignore } @@ -98,12 +103,14 @@ public class TextFieldWithPropertyFormatter extends TestBase { Button b = new Button( "Sync (typing 12345.6789 and clicking this should format field)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { } }); addComponent(b); b = new Button("Set '12345.6789' to textfield on the server side"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf1.setValue("12345.6789"); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java index 69956e4d2c..03645557f2 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java @@ -30,6 +30,7 @@ public class CtrlShiftMultiselect extends TestBase { tree.expandItemsRecursively("Item 4"); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getValue() instanceof Set) { @SuppressWarnings("unchecked") diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java index e23213fafc..d5c3654b4e 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java +++ b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java @@ -30,6 +30,7 @@ public class ExpandCollapseTree extends TestBase { tree.expandItemsRecursively("Item 4"); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getValue() instanceof Set) { @SuppressWarnings("unchecked") diff --git a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java index f2ca2a85bd..33bd4cef65 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java +++ b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java @@ -32,6 +32,7 @@ public class ItemStyleGenerator extends TestBase { Tree tree = new Tree(); tree.setItemStyleGenerator(new Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { // simple return itemId as css style name return itemId.toString(); diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java index b37d371b17..4072610996 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java @@ -27,6 +27,7 @@ public class TreeConnectors extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { tree.addStyleName(BaseTheme.TREE_CONNECTORS); @@ -50,11 +51,13 @@ public class TreeConnectors extends TestBase { tree.setDragMode(TreeDragMode.NODE); tree.setDropHandler(new DropHandler() { + @Override public void drop(DragAndDropEvent event) { // TODO Auto-generated method stub } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java index df2682a14c..f4374ca2ee 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java @@ -57,6 +57,7 @@ public class TreeContainerChange extends TestBase { Button b = new Button("Use ds1"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tree.setContainerDataSource(ds1); currentDS.setValue("ds1"); @@ -72,6 +73,7 @@ public class TreeContainerChange extends TestBase { b = new Button("Use ds2"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tree.setContainerDataSource(ds2); currentDS.setValue("ds2"); @@ -82,6 +84,7 @@ public class TreeContainerChange extends TestBase { addComponent(hl); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentValue.setValue(event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java index dca2d96628..7aa3933752 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java @@ -38,10 +38,12 @@ public class TreeDragAndDropFromTable extends TestBase { final Tree tree = new Tree(); tree.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return TargetItemAllowsChildren.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { // criteria verify that this is safe DataBoundTransferable t = (DataBoundTransferable) dropEvent diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java index 20d1eacb97..bd7984cdeb 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java @@ -47,6 +47,7 @@ public class TreeFiltering extends TestBase { filterType.setImmediate(true); filterType.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cont.setIncludeParentsWhenFiltering((Boolean) ((CheckBox) event .getProperty()).getValue()); @@ -56,6 +57,7 @@ public class TreeFiltering extends TestBase { addComponent(filterType); final Button b = new Button("Add filter 'foo'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "foo", true, false); @@ -63,6 +65,7 @@ public class TreeFiltering extends TestBase { }); addComponent(b); final Button b2 = new Button("Add filter 'Num'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "Num", true, false); @@ -71,6 +74,7 @@ public class TreeFiltering extends TestBase { addComponent(b2); final Button num = new Button("Add filter '0'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "0", true, false); @@ -79,6 +83,7 @@ public class TreeFiltering extends TestBase { addComponent(num); final Button num2 = new Button("Add filter '0-'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "0-", true, false); @@ -88,6 +93,7 @@ public class TreeFiltering extends TestBase { addComponent(num2); final Button num3 = new Button("Add filter 'Number 4'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "Number 4", true, false); @@ -98,6 +104,7 @@ public class TreeFiltering extends TestBase { addComponent(num3); final Button p1 = new Button("Set Number 3 parent to Number 0", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.setParent(3, 0); @@ -105,6 +112,7 @@ public class TreeFiltering extends TestBase { }); addComponent(p1); final Button r = new Button("Remove filters", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.removeAllContainerFilters(); diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java index 87170214ca..dd407fd62a 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java @@ -20,6 +20,7 @@ public class TreeFocusGaining extends TestBase { addComponent(textField); textField.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("TF value now:" + event.getProperty().getValue()); } @@ -30,6 +31,7 @@ public class TreeFocusGaining extends TestBase { addComponent(tree); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Tree value now:" + event.getProperty().getValue()); } @@ -39,6 +41,7 @@ public class TreeFocusGaining extends TestBase { tree = new Tree("Simple tree with itemm click listener"); tree.addItem("Item1"); tree.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { log.log("Item click event"); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java index e772be7cde..182bc97c44 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java @@ -28,6 +28,7 @@ public class TreeItemClickListening extends TestBase { tree.setItemCaptionPropertyId("caption"); tree.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { clickCounter++; switch (event.getButton()) { diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java index a6079160ab..b3ab5c2b01 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java @@ -29,6 +29,7 @@ public class TreeScrollingOnSelection extends TestBase { private static final long serialVersionUID = 5955518276555388126L; + @Override public void itemClick(ItemClickEvent event) { charLabel.setValue(event.getItemId().toString()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java index c6e29bc3b8..4b892c2150 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java @@ -13,6 +13,7 @@ public class TreeToolTips extends TestBase { protected void setup() { final Tree tree = new Tree(null, createContainer()); tree.setItemDescriptionGenerator(new AbstractSelect.ItemDescriptionGenerator() { + @Override public String generateDescription(Component source, Object itemId, Object propertyId) { return "This is a tooltip for item id '" + itemId + "'"; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java index 92c82a6ccf..8da6759b20 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java @@ -11,6 +11,7 @@ public class TreeWithPreselectedItemNotShown extends TestBase { protected void setup() { Button open = new Button("Open modal window with tree", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { getMainWindow().addWindow(new SubwindowWithTree()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/Trees.java b/tests/testbench/com/vaadin/tests/components/tree/Trees.java index 79de4de412..3ee1d7b0de 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/Trees.java +++ b/tests/testbench/com/vaadin/tests/components/tree/Trees.java @@ -26,6 +26,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private ItemStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Hierarchical c = (Container.Hierarchical) getComponent() .getContainerDataSource(); @@ -50,6 +51,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private ItemStyleGenerator evenItemsBold = new com.vaadin.ui.Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Hierarchical c = (Container.Hierarchical) getComponent() .getContainerDataSource(); @@ -80,17 +82,20 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, ContextMenu> contextMenuCommand = new Command<Tree, ContextMenu>() { + @Override public void execute(Tree c, final ContextMenu value, Object data) { c.removeAllActionHandlers(); if (value != null) { c.addActionHandler(new Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { log("Action " + action.getCaption() + " performed on " + target); } + @Override public Action[] getActions(Object target, Object sender) { return value.getActions(target, sender); } @@ -176,6 +181,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements createSelectAction("Selection Mode", category, options, "Multi - ctrl/shift", new Command<Tree, SelectMode>() { + @Override public void execute(Tree t, SelectMode value, Object data) { switch (value) { case NONE: @@ -318,6 +324,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements */ private Command<Tree, Integer> rootItemIdsCommand = new Command<Tree, Integer>() { + @Override public void execute(Tree c, Integer value, Object data) { rootItemIds = value; updateContainer(); @@ -326,12 +333,14 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Object> expandItemCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.expandItem(itemId); } }; private Command<Tree, Object> expandItemRecursivelyCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.expandItemsRecursively(itemId); } @@ -339,6 +348,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Object> collapseItemCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.collapseItem(itemId); } @@ -346,12 +356,14 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Boolean> setChildrenAllowedCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean areChildrenAllowed, Object itemId) { c.setChildrenAllowed(itemId, areChildrenAllowed); } }; private Command<Tree, Boolean> expandListenerCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean value, Object data) { if (value) { c.addListener((ExpandListener) Trees.this); @@ -362,6 +374,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements }; private Command<Tree, Boolean> collapseListenerCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean value, Object data) { if (value) { c.addListener((CollapseListener) Trees.this); @@ -373,6 +386,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator>() { + @Override public void execute(Tree c, com.vaadin.ui.Tree.ItemStyleGenerator value, Object data) { c.setItemStyleGenerator(value); @@ -380,10 +394,12 @@ public class Trees extends AbstractSelectTestCase<Tree> implements } }; + @Override public void nodeCollapse(CollapseEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } + @Override public void nodeExpand(ExpandEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java index 5bf0370bab..ae12d46988 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java @@ -18,6 +18,7 @@ public class AddNodesOnExpand extends TestBase { treetable.setPageLength(0); treetable.addContainerProperty("foo", String.class, ""); treetable.addListener(new Tree.ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { Object openedItemId = event.getItemId(); if (!treetable.hasChildren(openedItemId)) { @@ -30,6 +31,7 @@ public class AddNodesOnExpand extends TestBase { } }); treetable.addListener(new Tree.CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { /* Uncomment this to "fix" the TreeTable */ // orgTree.refreshRowCache(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java index 9cb60efd74..0fe8a3d1b9 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java @@ -21,12 +21,14 @@ public class ChangeDataSourcePageLengthZero extends TestBase { addComponent(tt); Button page1 = new Button("Set new data source (20 items)"); page1.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setupContainer(tt, 20); } }); Button page2 = new Button("Set new data source (10 items)"); page2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setupContainer(tt, 10); } @@ -35,6 +37,7 @@ public class ChangeDataSourcePageLengthZero extends TestBase { addButton.addListener(new Button.ClickListener() { private int i = 1; + @Override public void buttonClick(ClickEvent event) { HierarchicalContainer container = (HierarchicalContainer) tt .getContainerDataSource(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java b/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java index 89211dbecc..6dc5417d28 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java @@ -87,6 +87,7 @@ public class DynamicallyModified extends TestBase implements private int newChild = 1; + @Override public void nodeExpand(ExpandEvent event) { Object expandedItemId = event.getItemId(); // 7 == "Customer Project 1" @@ -100,6 +101,7 @@ public class DynamicallyModified extends TestBase implements treetable.setChildrenAllowed(newChildId, false); } + @Override public void nodeCollapse(CollapseEvent event) { Object collapsedItemId = event.getItemId(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java index ad0255a2da..799537f923 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java @@ -37,6 +37,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, tt.addListener((CollapseListener) this); tt.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recalculatePageLength(tt); tt.requestRepaint(); @@ -49,6 +50,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, Button b = new Button("Set pagelength to 10", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(10); } @@ -56,6 +58,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, addComponent(b); b = new Button("Set pagelength to 20", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(20); } @@ -63,6 +66,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, addComponent(b); b = new Button("Set pagelength to 0", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(0); } @@ -121,11 +125,13 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, return 7292; } + @Override public void nodeCollapse(CollapseEvent event) { recalculatePageLength((TreeTable) event.getSource()); } + @Override public void nodeExpand(ExpandEvent event) { recalculatePageLength((TreeTable) event.getSource()); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java index 447ce6c465..ea76a9639a 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java @@ -30,6 +30,7 @@ public class ProgrammaticCollapse extends TestBase { layout.addComponent(table); layout.addComponent(new Button("Expand / Collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(1); Notification.show("set collapsed: " + collapsed); @@ -38,6 +39,7 @@ public class ProgrammaticCollapse extends TestBase { })); layout.addComponent(new Button("Expand / Collapse last", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(100); Notification.show("set collapsed: " + collapsed); @@ -48,6 +50,7 @@ public class ProgrammaticCollapse extends TestBase { new ClickListener() { private boolean collapsed = true; + @Override public void buttonClick(ClickEvent event) { collapsed = !collapsed; Notification.show("set collapsed: " + collapsed); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java index fc68d0be15..7088497b4e 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java @@ -23,6 +23,7 @@ public class ProgrammaticSelect extends TestBase { Button selectItem = new Button("Select first row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object id = tt.getItemIds().iterator().next(); tt.select(id); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java index 69198ca006..a92a9e045e 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java @@ -39,6 +39,7 @@ public class RemoveAllItemsRefresh extends TestBase { Button cleanUp = new Button("clear"); cleanUp.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { treeContainer.removeAllItems(); } @@ -47,6 +48,7 @@ public class RemoveAllItemsRefresh extends TestBase { Button refresh = new Button("fill"); refresh.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { fill(); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java index ae6a9d0c0b..c2bd3da860 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java @@ -68,6 +68,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { } public class Col3ColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(final com.vaadin.ui.Table source, final Object itemId, Object columnId) { TestBean tb = (TestBean) itemId; @@ -78,6 +79,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { System.out.println("Generating new Button for " + identifier); Button btnCol3 = new NativeButton(identifier); btnCol3.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button " + event.getButton().getCaption() + " clicked. Row index: " @@ -117,6 +119,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { addComponent(b); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("First visible item id is: " + treeTable.getCurrentPageFirstItemId()); @@ -131,6 +134,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { cacheRateSelect.setValue(2); cacheRateSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { treeTable .setCacheRate((Integer) event.getProperty().getValue()); @@ -154,6 +158,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { treeTable.addGeneratedColumn("col3", new Col3ColumnGenerator()); treeTable.addListener(new ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { logExpandCollapse(event.getItemId(), "expanded"); @@ -161,6 +166,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { }); treeTable.addListener(new CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { logExpandCollapse(event.getItemId(), "collapsed"); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java index 336ffb5a52..02ce397a05 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java @@ -26,6 +26,7 @@ public class TreeTableModifyAndSetCollapsed extends TestBase { addComponent(tt); Button repopulate = new Button("Repopulate", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { // repopulate the container and expand root item container.removeAllItems(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java index 0c1fcdbfd8..e688e039eb 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java @@ -16,6 +16,7 @@ public class TreeTableOutOfSync extends TestBase { TreeTable tt = new TreeTable(); tt.addContainerProperty("i", Integer.class, null); tt.addGeneratedColumn("text", new Table.ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { if ("text".equals(columnId)) { @@ -23,6 +24,7 @@ public class TreeTableOutOfSync extends TestBase { + source.getContainerDataSource().getItem(itemId) .getItemProperty("i").getValue()); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("click"); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java index 2a14c946f3..7159addb5b 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java @@ -12,6 +12,7 @@ public class TreeTableSetCollapsed extends TestBase { createTreeTableAndPopulate(); addComponent(new Button("Create another TreeTable", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createTreeTableAndPopulate(); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java index d7d9c18d7e..f27a47f12b 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java @@ -27,6 +27,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private int rootItemIds = 3; private CellStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Table.CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null) { return null; @@ -54,6 +55,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private CellStyleGenerator evenItemsBold = new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null) { return null; @@ -235,6 +237,7 @@ public class TreeTableTest extends Tables<TreeTable> implements */ private Command<TreeTable, Integer> rootItemIdsCommand = new Command<TreeTable, Integer>() { + @Override public void execute(TreeTable c, Integer value, Object data) { rootItemIds = value; updateContainer(); @@ -243,6 +246,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Object> expandItemCommand = new Command<TreeTable, Object>() { + @Override public void execute(TreeTable c, Object itemId, Object data) { c.setCollapsed(itemId, false); } @@ -250,6 +254,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Object> collapseItemCommand = new Command<TreeTable, Object>() { + @Override public void execute(TreeTable c, Object itemId, Object data) { c.setCollapsed(itemId, true); } @@ -257,6 +262,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Boolean> setChildrenAllowedCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean areChildrenAllowed, Object itemId) { c.setChildrenAllowed(itemId, areChildrenAllowed); @@ -264,6 +270,7 @@ public class TreeTableTest extends Tables<TreeTable> implements }; private Command<TreeTable, Boolean> expandListenerCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean value, Object data) { if (value) { c.addListener((ExpandListener) TreeTableTest.this); @@ -274,6 +281,7 @@ public class TreeTableTest extends Tables<TreeTable> implements }; private Command<TreeTable, Boolean> collapseListenerCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean value, Object data) { if (value) { c.addListener((CollapseListener) TreeTableTest.this); @@ -285,15 +293,18 @@ public class TreeTableTest extends Tables<TreeTable> implements protected Command<TreeTable, Boolean> animationCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean enabled, Object data) { c.setAnimationsEnabled(enabled); } }; + @Override public void nodeCollapse(CollapseEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } + @Override public void nodeExpand(ExpandEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java index ddb418dab3..fc1b11bb94 100644 --- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java +++ b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java @@ -51,12 +51,14 @@ public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, Integer> columnsAction = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setColumns(value); } }; private Command<TwinColSelect, Integer> rowsAction = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setRows(value); } diff --git a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java index 84e266dea2..47aad46348 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java +++ b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java @@ -21,6 +21,7 @@ public class ForceSubmit extends TestBase implements Receiver { return 6630; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { return new ByteArrayOutputStream(); } @@ -40,6 +41,7 @@ public class ForceSubmit extends TestBase implements Receiver { addComponent(u); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { String filename = event.getFilename(); long length = event.getLength(); @@ -49,12 +51,14 @@ public class ForceSubmit extends TestBase implements Receiver { }); u.addListener(new Upload.FailedListener() { + @Override public void uploadFailed(FailedEvent event) { getMainWindow().showNotification("Failed. No file selected?"); } }); u.addListener(new Upload.StartedListener() { + @Override public void uploadStarted(StartedEvent event) { getMainWindow().showNotification( "Started upload. TF value :" + textField.getValue()); @@ -64,6 +68,7 @@ public class ForceSubmit extends TestBase implements Receiver { Button button = new Button( "I'm an external button (not the uploads builtin), hit me to start upload."); button.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { u.submitUpload(); } diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java index 4f1e8358f4..529a977ede 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java @@ -21,6 +21,7 @@ public class TestFileUpload extends TestBase implements Receiver { protected void setup() { Upload u = new Upload("Upload", new Upload.Receiver() { + @Override public OutputStream receiveUpload(String filename, String mimeType) { return baos; } @@ -28,6 +29,7 @@ public class TestFileUpload extends TestBase implements Receiver { u.setDebugId("UPL"); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { String hash = DigestUtils.md5Hex(baos.toByteArray()); log.log("Upload finished. Name: " + event.getFilename() @@ -40,6 +42,7 @@ public class TestFileUpload extends TestBase implements Receiver { addComponent(u); } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java index b6126f41da..7607536357 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java @@ -46,6 +46,7 @@ public class TestImmediateUploadInFormLayout extends return Collections.emptyList(); } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java index 535372f710..9ca0cb9c38 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java @@ -32,6 +32,7 @@ public class TestUpload extends ComponentTestCase<Upload> implements Receiver { addTestComponent(u); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { getMainWindow().showNotification("Done"); } @@ -51,6 +52,7 @@ public class TestUpload extends ComponentTestCase<Upload> implements Receiver { return actions; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java index 0aa8e809c4..516ca2d7c9 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java @@ -51,6 +51,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> u.addListener(new Upload.StartedListener() { + @Override public void uploadStarted(StartedEvent event) { /* * Remove component before upload from the same vertical layout. @@ -63,6 +64,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> }); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { getMainWindow().showNotification("Done"); l.setValue(getUploadcount()); @@ -81,6 +83,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> actions.add(createButtonAction("Toggle Enabled", new Command<Upload, Boolean>() { + @Override public void execute(Upload c, Boolean value, Object data) { c.setEnabled(!c.isEnabled()); } @@ -89,6 +92,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> return actions; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { // sleep to ensure change before upload is complete try { diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java index 12006412f2..de0cca5009 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java @@ -23,6 +23,7 @@ public class TestUploadFilename extends TestBase { addComponent(result); upload.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { result.setValue("Got file (should not contain path): " + receiver.getFilename()); @@ -35,6 +36,7 @@ public class TestUploadFilename extends TestBase { private String filename; + @Override public OutputStream receiveUpload(String filename, String MIMEType) { this.filename = filename; return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index ae3d4bc053..52a94daec7 100644 --- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -84,6 +84,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase }; okButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked"); @@ -114,6 +115,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase return 8170; } + @Override public void onRequestStart(HttpServletRequest request, HttpServletResponse response) { if (request.getParameter("attachMainFirst") != null) { @@ -122,6 +124,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase } + @Override public void onRequestEnd(HttpServletRequest request, HttpServletResponse response) { // TODO Auto-generated method stub diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java index bcfbc7f55a..e618cd38b5 100644 --- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java @@ -18,6 +18,7 @@ public class CloseSubWindow extends TestBase { Button openWindowButton = new Button("Open sub-window"); openWindowButton.setDebugId("opensub"); openWindowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window sub = createClosableSubWindow("Sub-window"); getMainWindow().addWindow(sub); @@ -36,6 +37,7 @@ public class CloseSubWindow extends TestBase { Button closeButton = new Button("Close"); closeButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton().findAncestor(Window.class).close(); } @@ -44,6 +46,7 @@ public class CloseSubWindow extends TestBase { Button removeButton = new Button("Remove from parent"); removeButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.close(); } @@ -51,6 +54,7 @@ public class CloseSubWindow extends TestBase { window.addComponent(closeButton); window.addListener(new CloseListener() { + @Override public void windowClose(CloseEvent e) { log.log("Window '" + title + "' closed"); } diff --git a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java index ca9c31513f..76b93cae56 100644 --- a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java @@ -12,6 +12,7 @@ public class DownloadAndUpdate extends TestBase { protected void setup() { addComponent(new Button("Download and update", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { downloadAndUpdate(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java index bf979b1aa3..a9744b2c06 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -26,6 +26,7 @@ public class ExecuteJavaScript extends AbstractTestCase { Button b = new Button(script); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().executeJavaScript(script); } diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java index e81e02b22b..fc8d7474af 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java @@ -13,12 +13,14 @@ public class ExtraWindowShown extends TestBase { protected void setup() { Button b = new Button("Open window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("Sub window"); w.center(); w.addComponent(new Button("Close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java index 9eaabf7340..e44b1e4518 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java @@ -25,12 +25,14 @@ public class LazyWindowResize extends AbstractTestCase { protected ResizeListener resizeListener = new ResizeListener() { + @Override public void windowResized(ResizeEvent e) { log.log("Sub window resized"); } }; protected BrowserWindowResizeListener browserWindowResizeListener = new BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { log.log("Main window resized"); } @@ -63,6 +65,7 @@ public class LazyWindowResize extends AbstractTestCase { lazyMode.setImmediate(true); lazyMode.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setLazy(lazyMode.getValue()); } @@ -72,6 +75,7 @@ public class LazyWindowResize extends AbstractTestCase { resizeListenerCheckBox.setImmediate(true); resizeListenerCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (resizeListenerCheckBox.getValue()) { subWindow.addListener(resizeListener); @@ -88,6 +92,7 @@ public class LazyWindowResize extends AbstractTestCase { immediateCheckBox.setImmediate(true); immediateCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { mainWindow.setImmediate(immediateCheckBox.getValue()); subWindow.setImmediate(immediateCheckBox.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java index c916973713..be67cfe9a0 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java +++ b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java @@ -25,6 +25,7 @@ public class LongNotifications extends TestBase { Button b = new Button("Show loooong notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( @@ -38,6 +39,7 @@ public class LongNotifications extends TestBase { b = new Button("Show notifications", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Example failed", @@ -51,6 +53,7 @@ public class LongNotifications extends TestBase { b = new Button("Show loooong notification (error)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow() @@ -65,6 +68,7 @@ public class LongNotifications extends TestBase { b = new Button("Show notification (error)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Example failed", diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java index 353eb535ca..59cd35c2cb 100644 --- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java +++ b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java @@ -30,6 +30,7 @@ public class RepaintWindowContents extends AbstractTestRoot { button1.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.setContent(layout2); } @@ -37,6 +38,7 @@ public class RepaintWindowContents extends AbstractTestRoot { button2.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.setContent(layout1); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java index f0dccda66c..389c926986 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java @@ -41,6 +41,7 @@ public class SubWindowFocus extends TestBase { addComponent(tf); Button b = new Button("new", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window win = new Window("Subwin"); win.getContent().setWidth(null); @@ -56,10 +57,12 @@ public class SubWindowFocus extends TestBase { ShortcutAction spc = new ShortcutAction("Space", ShortcutAction.KeyCode.SPACEBAR, null); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { esc, spc }; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == esc) { diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java index 1e342abe01..061ee7900f 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java @@ -36,12 +36,14 @@ public class SubWindowFocusAndBlurListeners extends TestBase { window.addComponent(new TextField()); window.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { Notification.show("Focused window"); } }); window.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { Notification.show("Blurred window"); } @@ -51,10 +53,12 @@ public class SubWindowFocusAndBlurListeners extends TestBase { private Action[] s = new Action[] { new ShortcutAction("^Save") }; + @Override public Action[] getActions(Object target, Object sender) { return s; } + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show("Action!"); } @@ -68,6 +72,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase { Button button = new Button("Bring to front (should focus too)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.bringToFront(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java index 9b4fcea22b..02241476d5 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java @@ -64,6 +64,7 @@ public class SubWindowOrder extends TestBase { toggleModality.addListener(this); } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == bf) { getCurWindow().bringToFront(); diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java index fc99309b50..5bda762d3f 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java @@ -38,6 +38,7 @@ public class SubWindowWithUndefinedHeight extends TestBase { tabsheet.addComponent(tabButton); tabsheet.addComponent(table); tabsheet.addListener(new TabSheet.SelectedTabChangeListener() { + @Override public void selectedTabChange(TabSheet.SelectedTabChangeEvent event) { if (tabsheet.getSelectedTab() == tabButton) { tabsheet.setSizeUndefined(); @@ -54,6 +55,7 @@ public class SubWindowWithUndefinedHeight extends TestBase { subwindow.addComponent(tabsheet); Button button = new Button("click me", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { getMainWindow().addWindow(subwindow); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java index e939f0b9a4..c39bfdb713 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java @@ -32,6 +32,7 @@ public class SubWindows extends TestBase { Button b = new Button("Remove"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); ComponentContainer cc = (ComponentContainer) b.getParent(); @@ -51,6 +52,7 @@ public class SubWindows extends TestBase { autoWideWindow.addComponent(new TextField("Field 2")); autoWideWindow.addComponent(new Button("Add", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { autoWideWindow.addComponent(createRemoveButton()); diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java index e1927982cd..45fb343b45 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java @@ -21,6 +21,7 @@ public class SubwindowDraggability extends TestBase { Button b = new Button("Swap", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean b = draggableSubWindow.isDraggable(); diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java index ed259b2f4c..715d089f57 100644 --- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java +++ b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java @@ -28,6 +28,7 @@ public class UndefinedHeightSubWindowAndContent extends TestBase { field1.setImmediate(true); field1.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (!isValid(value)) { throw new InvalidValueException("FAIL!"); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java index 041ccaaf30..a4120b7d42 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java @@ -29,6 +29,7 @@ public class WindowClickEvents extends TestBase { protected void setup() { VerticalLayout layout = new VerticalLayout(); layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { WindowClickEvents.this.click("Sub window layout", event); } @@ -36,6 +37,7 @@ public class WindowClickEvents extends TestBase { ((VerticalLayout) getMainWindow().getContent()) .addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { WindowClickEvents.this.click("Main window layout", event); @@ -45,6 +47,7 @@ public class WindowClickEvents extends TestBase { Window centered = new Window("A window with a click listener", layout); centered.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { WindowClickEvents.this.click("Sub window", event); } @@ -60,6 +63,7 @@ public class WindowClickEvents extends TestBase { "Clicking here should not produce a layout click event"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent event) { log.log("Click on button"); } @@ -73,6 +77,7 @@ public class WindowClickEvents extends TestBase { addComponent(log); getMainWindow().addListener(new ClickListener() { + @Override public void click(ClickEvent event) { WindowClickEvents.this.click("Main window", event); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java index ac6c313d29..74d7b564db 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java @@ -34,6 +34,7 @@ public class WindowResizeListener extends TestBase { getLayout().addComponent(l); getMainWindow().addListener(new Page.BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { l.setValue("Current browser window size: " + getMainWindow().getBrowserWindowWidth() + " x " @@ -45,6 +46,7 @@ public class WindowResizeListener extends TestBase { subwindow.setImmediate(true); subwindow.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { getMainWindow().addWindow(subwin); @@ -58,6 +60,7 @@ public class WindowResizeListener extends TestBase { CheckBox immediate = new CheckBox("immediate"); immediate.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean booleanValue = (Boolean) event.getProperty().getValue(); getMainWindow().setImmediate(booleanValue); @@ -87,6 +90,7 @@ class ResizeListenerWindow extends Window { hl.addComponent(sizeLabel); addListener(new ResizeListener() { + @Override public void windowResized(ResizeEvent e) { updateLabel(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index 9f3f27cf6a..fdeb21d29c 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -60,6 +60,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { window.addComponent(new Button("Scroll mainwin to X9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(x9); @@ -67,6 +68,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { })); window.addComponent(new Button("Scroll mainwin to Y9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(y9); @@ -100,6 +102,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { ((VerticalLayout) getMainWindow().getContent()).addComponent( new Button("Scroll win to X9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("Currently not implemented"); // window.scrollIntoView(x29); @@ -107,6 +110,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { }), 0); ((VerticalLayout) getMainWindow().getContent()).addComponent( new Button("Scroll win to Y9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("Currently not implemented"); // window.scrollIntoView(y29); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java index 2054b751ef..43f8297a5d 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -26,6 +26,7 @@ public class WindowScrollingUp extends AbstractTestCase { final Button up = new Button("up"); up.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { up.getRoot().setScrollTop(0); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index 88fb014690..fa01706c56 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -30,6 +30,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button add = new Button("Add an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { add(); } @@ -38,6 +39,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button addAnother = new Button("Add another action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addAnother(); } @@ -46,6 +48,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button remove = new Button("Remove an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove(); } @@ -71,12 +74,14 @@ public class WindowShouldRemoveActionHandler extends TestBase { getMainWindow().getCaption() + " - Added handler"); Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Left", ShortcutAction.KeyCode.ARROW_LEFT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); @@ -90,12 +95,14 @@ public class WindowShouldRemoveActionHandler extends TestBase { public void addAnother() { Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Right", ShortcutAction.KeyCode.ARROW_RIGHT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java index 3a36926b42..615f391613 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java @@ -22,6 +22,7 @@ public class WindowStyleNames extends TestBase { setWindowStyle("old"); addComponent(new Button("Set style to 'new'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { setWindowStyle("new"); } @@ -30,6 +31,7 @@ public class WindowStyleNames extends TestBase { addComponent(new Button("Set style to 'custom'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { setWindowStyle("custom"); } @@ -38,6 +40,7 @@ public class WindowStyleNames extends TestBase { addComponent(new Button("Add 'foo' style", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addStyleName("foo"); } diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index 77a3efa6ad..4f41410ba3 100644 --- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -89,6 +89,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final CheckBox cb = new CheckBox("Filter on value"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.removeAllContainerFilters(); if (((CheckBox) event.getProperty()).getValue()) { @@ -108,6 +109,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemButton = new Button("addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.addItem(new TestBean("addItem() " + nextToAdd, "value " + nextToAdd)); @@ -120,6 +122,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemAfterButton = new Button("addItemAfter()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object selection = table.getValue(); if (selection == null) { @@ -145,6 +148,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemAtButton = new Button("addItemAt()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int index = Integer.parseInt(position.getValue() .toString()); diff --git a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java index f60e0c74e7..eba8ded705 100644 --- a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java +++ b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java @@ -94,6 +94,7 @@ public class HierarchicalWrapperOrdering extends TestBase { new ClickListener() { private static final long serialVersionUID = 1L; + @Override public void buttonClick(ClickEvent event) { // Get first item Object itemId = indexedContainer.getIdByIndex(0); diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index 2ed5de3bfa..b30ef3e616 100644 --- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -56,6 +56,7 @@ public class IndexedContainerFilteringTest extends TestBase { final CheckBox cb = new CheckBox("Filter"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.removeAllContainerFilters(); if (((CheckBox) event.getProperty()).getValue()) { @@ -75,6 +76,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemButton = new Button("addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItem("addItem() " + nextToAdd); if (item != null) { @@ -90,6 +92,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemAfterButton = new Button("addItemAfter()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object selection = table.getValue(); if (selection == null) { @@ -117,6 +120,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemAtButton = new Button("addItemAt()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int index = Integer.parseInt(position.getValue() .toString()); diff --git a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java index 0a1c592876..46c4e004c1 100644 --- a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java +++ b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java @@ -27,6 +27,7 @@ public class TestItemSorter extends TestBase { populateContainer(container); container.setItemSorter(new DefaultItemSorter(new Comparator<Object>() { + @Override public int compare(Object o1, Object o2) { if (o1 instanceof CheckBox && o2 instanceof CheckBox) { Boolean b1 = (Boolean) ((CheckBox) o1).getValue(); diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java index 91403f54d6..0afaf2c15f 100644 --- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java +++ b/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java @@ -51,6 +51,7 @@ public class FileSystemContainerInTreeTable extends TestBase { treeTable.setColumnWidth("Name", 400); treeTable.addListener(new ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { logExpandCollapse(event.getItemId(), "expanded"); @@ -58,6 +59,7 @@ public class FileSystemContainerInTreeTable extends TestBase { }); treeTable.addListener(new CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { logExpandCollapse(event.getItemId(), "collapsed"); @@ -71,6 +73,7 @@ public class FileSystemContainerInTreeTable extends TestBase { buttonLayout.setSpacing(true); buttonLayout.addComponent(new Button("Create dir11", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").mkdir(); log.log("Row dir11 created"); @@ -78,6 +81,7 @@ public class FileSystemContainerInTreeTable extends TestBase { })); buttonLayout.addComponent(new Button("Delete dir11", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").delete(); log.log("Row dir11 deleted"); @@ -86,6 +90,7 @@ public class FileSystemContainerInTreeTable extends TestBase { // to clean up explicitly before ending an automated test buttonLayout.addComponent(new Button("Clean all files", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { folder.delete(); } diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index 674f610ed7..a5a8f7d24b 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -45,6 +45,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication databaseHelper.getTestContainer().addListener( new ItemSetChangeListener() { + @Override public void containerItemSetChange(ItemSetChangeEvent event) { Object selected = testList.getValue(); if (selected != null) { @@ -62,6 +63,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication getMainWindow().setContent(horizontalSplit); } + @Override public void valueChange(ValueChangeEvent event) { Property<?> property = event.getProperty(); @@ -89,6 +91,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication getFooter().setVisible(false); } + @Override public void buttonClick(ClickEvent event) { if (event.getSource() == save) { super.commit(); diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index 2b76612c35..dc919fdb12 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -35,6 +35,7 @@ public class MassInsertMemoryLeakTestApp extends Application.LegacyApplication { setMainWindow(new LegacyWindow("SQLContainer Test", buildLayout())); process.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { MassInsert mi = new MassInsert(); mi.start(); diff --git a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java index 8b17cb3f48..59aa45dc36 100644 --- a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java +++ b/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java @@ -16,6 +16,7 @@ public class ConverterThatEnforcesAFormat extends TestBase { "This field should always be formatted with 3 digits"); tf.setConverter(new StringToDoubleConverterWithThreeFractionDigits()); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changed to " + event.getProperty().getValue() diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java index 308f002e4f..e98c0e0606 100644 --- a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -28,10 +28,12 @@ public class AcceptAnythingWindow extends Window { final DragAndDropWrapper wrapper = new DragAndDropWrapper(layout); wrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java index 43bdce2ad4..5243f6b993 100644 --- a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java @@ -37,6 +37,7 @@ public class AcceptFromComponent extends Window { final ServerSideCriterion serverSideCriterion = new ServerSideCriterion() { + @Override public boolean accept(DragAndDropEvent dragEvent) { Transferable transferable = dragEvent.getTransferable(); if (transferable instanceof TransferableImpl) { @@ -51,10 +52,12 @@ public class AcceptFromComponent extends Window { wrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return serverSideCriterion; } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event diff --git a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java index 93e99274bb..9ef1b4029b 100644 --- a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java +++ b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java @@ -23,6 +23,7 @@ public class ActiveDragSourceClassName extends TestBase { private static final String GREENBOXES = ".greenblock {float:left; width:60px;height:60px;background: green !important; padding:0; margin:2px;-webkit-transition: width 0.3s ease-in-out;}"; private static final String HIDEDRAGSOURCE = ".v-active-drag-source { overflow:hidden; width:0px !important;}"; + @Override protected void setup() { TestUtils.injectCSS(getMainWindow(), GREENBOXES + HIDEDRAGSOURCE); @@ -69,10 +70,12 @@ public class ActiveDragSourceClassName extends TestBase { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java index 2b38a3438e..f6e196761e 100644 --- a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java +++ b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java @@ -38,14 +38,17 @@ public class CustomDDImplementation extends CustomComponent { * */ class MyDropTarget extends AbstractComponent implements DropTarget { + @Override public DropHandler getDropHandler() { return new DropHandler() { + @Override public void drop(DragAndDropEvent event) { // Do something with data return; } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } @@ -53,6 +56,7 @@ public class CustomDDImplementation extends CustomComponent { }; } + @Override public TargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { // If component has some special drop details that it needs to diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/tests/testbench/com/vaadin/tests/dd/DDTest1.java index 0d709844e9..5d1af94ee7 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest1.java @@ -62,6 +62,7 @@ public class DDTest1 extends TestBase { */ private static final long serialVersionUID = 1L; + @Override public boolean accept(DragAndDropEvent dragEvent) { Transferable transferable = dragEvent.getTransferable(); // System.out.println("Simulating 500ms processing..."); @@ -188,6 +189,7 @@ public class DDTest1 extends TestBase { } + @Override public void drop(DragAndDropEvent event) { TreeTargetDetails details = (TreeTargetDetails) event .getTargetDetails(); @@ -224,6 +226,7 @@ public class DDTest1 extends TestBase { return; } + @Override public AcceptCriterion getAcceptCriterion() { // TODO should actually check that source is same as target return AcceptItem.ALL; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/tests/testbench/com/vaadin/tests/dd/DDTest2.java index 0dda0d693c..272be53034 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest2.java @@ -88,6 +88,7 @@ public class DDTest2 extends TestBase { }; tree3.setDropHandler(new DropHandler() { + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); @@ -110,6 +111,7 @@ public class DDTest2 extends TestBase { } + @Override public AcceptCriterion getAcceptCriterion() { return crit; } @@ -136,6 +138,7 @@ public class DDTest2 extends TestBase { DropHandler dropHandler = new DropHandler() { + @Override public void drop(DragAndDropEvent event) { /* * We know transferrable is from table, so it is of type @@ -177,6 +180,7 @@ public class DDTest2 extends TestBase { } + @Override public AcceptCriterion getAcceptCriterion() { return and; } @@ -194,6 +198,7 @@ public class DDTest2 extends TestBase { */ dropHandler = new DropHandler() { + @Override public void drop(DragAndDropEvent event) { AbstractSelectTargetDetails details = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -233,6 +238,7 @@ public class DDTest2 extends TestBase { } } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptItem.ALL; } diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest4.java b/tests/testbench/com/vaadin/tests/dd/DDTest4.java index 654a30486a..53309fabcc 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest4.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest4.java @@ -64,10 +64,12 @@ public class DDTest4 extends TestBase { // accept only drags from this table AcceptCriterion crit = new SourceIs(table); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest5.java b/tests/testbench/com/vaadin/tests/dd/DDTest5.java index a5d97f4473..63d1e9e3c2 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest5.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest5.java @@ -86,10 +86,12 @@ public class DDTest5 extends TestBase { dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { /* diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest6.java b/tests/testbench/com/vaadin/tests/dd/DDTest6.java index c6c6689bcb..debe26ba39 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest6.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest6.java @@ -97,10 +97,12 @@ public class DDTest6 extends TestBase { tree1.setDragMode(TreeDragMode.NODE); DropHandler dropHandler = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { File file = null; Folder folder = null; @@ -127,12 +129,14 @@ public class DDTest6 extends TestBase { private Action[] actions = new Action[] { new Action("Remove") }; + @Override public void handleAction(Action action, Object sender, Object target) { ContainerHierarchicalWrapper containerDataSource = (ContainerHierarchicalWrapper) tree1 .getContainerDataSource(); containerDataSource.removeItemRecursively(target); } + @Override public Action[] getActions(Object target, Object sender) { return actions; } @@ -140,6 +144,7 @@ public class DDTest6 extends TestBase { tree1.addActionHandler(actionHandler); tree1.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); if (value != null && !(value instanceof Folder)) { @@ -215,6 +220,7 @@ public class DDTest6 extends TestBase { public Resource getResource() { StreamSource streamSource = new StreamSource() { + @Override public InputStream getStream() { if (bas != null) { byte[] byteArray = bas.toByteArray(); @@ -355,6 +361,7 @@ public class DDTest6 extends TestBase { } + @Override @SuppressWarnings("static-access") public void drop(DragAndDropEvent dropEvent) { @@ -402,29 +409,36 @@ public class DDTest6 extends TestBase { StreamVariable streamVariable = new StreamVariable() { + @Override public OutputStream getOutputStream() { return bas; } + @Override public boolean listenProgress() { return false; } + @Override public void onProgress(StreamingProgressEvent event) { } + @Override public void streamingStarted( StreamingStartEvent event) { } + @Override public void streamingFinished( StreamingEndEvent event) { } + @Override public void streamingFailed( StreamingErrorEvent event) { } + @Override public boolean isInterrupted() { return false; } @@ -448,6 +462,7 @@ public class DDTest6 extends TestBase { } } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } @@ -473,6 +488,7 @@ public class DDTest6 extends TestBase { l.addComponent(new Label(name)); l.addListener(new LayoutClickListener() { + @Override @SuppressWarnings("static-access") public void layoutClick(LayoutClickEvent event) { if (event.isDoubleClick()) { @@ -506,10 +522,12 @@ public class DDTest6 extends TestBase { setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new Not(SourceIsTarget.get()); } + @Override public void drop(DragAndDropEvent dropEvent) { File f = null; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest7.java b/tests/testbench/com/vaadin/tests/dd/DDTest7.java index 26521f5a57..f9be935b23 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest7.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest7.java @@ -95,10 +95,12 @@ public class DDTest7 extends TestBase { } }; + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest8.java b/tests/testbench/com/vaadin/tests/dd/DDTest8.java index fed889b5c1..f797670f3e 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest8.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest8.java @@ -113,6 +113,7 @@ public class DDTest8 extends TestBase { } + @Override public void drop(DragAndDropEvent event) { TreeTargetDetails details = (TreeTargetDetails) event .getTargetDetails(); @@ -149,6 +150,7 @@ public class DDTest8 extends TestBase { return; } + @Override public AcceptCriterion getAcceptCriterion() { return new Or(new AbstractSelect.TargetItemIs(t, "Foo", "Bar"), new AbstractSelect.AcceptItem(t, "Foo"), diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java index 4b4ec75f0e..bea00ae0ad 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java +++ b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java @@ -35,10 +35,12 @@ public class DragAndDropFiles extends TestBase { dragAndDropWrapper.setSizeUndefined(); dragAndDropWrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { WrapperTransferable transferable = (WrapperTransferable) event .getTransferable(); @@ -59,19 +61,23 @@ public class DragAndDropFiles extends TestBase { StreamVariable streamVariable = new StreamVariable() { + @Override public OutputStream getOutputStream() { return new NullOutputStream(); } + @Override public boolean listenProgress() { return true; } + @Override public void onProgress(StreamingProgressEvent event) { System.err.println("Progress" + event.getBytesReceived()); } + @Override public void streamingStarted( StreamingStartEvent event) { getMainWindow().showNotification( @@ -79,6 +85,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public void streamingFinished( StreamingEndEvent event) { getMainWindow().showNotification( @@ -86,6 +93,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public void streamingFailed( StreamingErrorEvent event) { getMainWindow().showNotification( @@ -93,6 +101,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public boolean isInterrupted() { return false; } diff --git a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java index 1b7b7b997b..3c37b5a065 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java @@ -51,6 +51,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { this.crit = crit; } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event @@ -135,28 +136,35 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { html5File.setStreamVariable(new StreamVariable() { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + @Override public OutputStream getOutputStream() { return byteArrayOutputStream; } + @Override public boolean listenProgress() { return false; } + @Override public void onProgress(StreamingProgressEvent event) { } + @Override public void streamingStarted(StreamingStartEvent event) { } + @Override public void streamingFinished(StreamingEndEvent event) { l.setValue((new String(byteArrayOutputStream .toByteArray()).substring(0, 80) + "...")); } + @Override public void streamingFailed(StreamingErrorEvent event) { } + @Override public boolean isInterrupted() { return false; } @@ -172,6 +180,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { return; } + @Override public AcceptCriterion getAcceptCriterion() { return crit != null ? crit : AcceptAll.get(); } diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index aa51dd539d..fe33bce76b 100644 --- a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -54,10 +54,12 @@ public class HorizontalLayoutSortableWithWrappers extends Window { AcceptCriterion crit = new And(new TargetDetailIs("horizontalLocation", "LEFT"), new Not(SourceIsTarget.get())); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java index a77faffd2e..4e9e89add5 100644 --- a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java +++ b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java @@ -48,10 +48,12 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java index 2b01bad2cf..79dc90280f 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java @@ -14,6 +14,7 @@ import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource; public class MyDragSourceConnector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java index 5671efa236..9934cffd75 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -14,6 +14,7 @@ import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget; public class MyDropTargetConnector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java index 74774f09ab..abe8553267 100644 --- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java +++ b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java @@ -26,10 +26,12 @@ public class NotPaintedAcceptSource extends TestBase { source2.setDragMode(TableDragMode.ROW); target.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new SourceIs(source1, source2); } + @Override public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); @@ -55,6 +57,7 @@ public class NotPaintedAcceptSource extends TestBase { addComponent(horizontalLayout); addComponent(new Button("Swap sources", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (source1.getParent() != null) { horizontalLayout.replaceComponent(source1, source2); diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java index ac92193764..e19bbaf2c5 100644 --- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java +++ b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java @@ -24,10 +24,12 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase { source2.setDragMode(TableDragMode.ROW); target.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new SourceIs(source1, source2); } + @Override public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java b/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java index 093e12f84a..b2a0a00be0 100644 --- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java +++ b/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java @@ -28,10 +28,12 @@ public class ScrolledDropTarget extends TestBase { table.setDragMode(TableDragMode.ROW); table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return VerticalLocationIs.MIDDLE; } + @Override public void drop(DragAndDropEvent event) { AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -44,6 +46,7 @@ public class ScrolledDropTarget extends TestBase { addComponent(table); addComponent(new Button("Scroll body", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().executeJavaScript( "document.body.style.overflow = 'auto';" diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java index 2cdef65d31..1a01564220 100644 --- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java +++ b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java @@ -27,10 +27,12 @@ public class StartHtml5Drag extends TestBase { "over here")); dropTarget.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { getWindows() .iterator() diff --git a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java index 4ef7023aa6..7b3b49ae75 100644 --- a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java +++ b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java @@ -38,6 +38,7 @@ public class TreeDragStart extends TestBase { checkBox.setImmediate(true); checkBox.setValue(true); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tree.setEnabled(!tree.isEnabled()); } @@ -47,6 +48,7 @@ public class TreeDragStart extends TestBase { checkBox.setImmediate(true); checkBox.setValue(true); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) ((CheckBox) event.getProperty()).getValue()) { tree.setDragMode(TreeDragMode.NODE); @@ -75,6 +77,7 @@ public class TreeDragStart extends TestBase { // Allow the tree to receive drag drops and handle them tree.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { // Accept drops in the middle of container items // and below and above all items. @@ -82,6 +85,7 @@ public class TreeDragStart extends TestBase { VerticalLocationIs.MIDDLE)); } + @Override public void drop(DragAndDropEvent event) { // Wrapper for the object that is dragged DataBoundTransferable t = (DataBoundTransferable) event @@ -152,10 +156,12 @@ public class TreeDragStart extends TestBase { // Allow the table to receive drops and handle them table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new Not(VerticalLocationIs.MIDDLE); } + @Override public void drop(DragAndDropEvent event) { // Wrapper for the object that is dragged DataBoundTransferable t = (DataBoundTransferable) event diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java index 7e91d2b9aa..e6c7078e8e 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java @@ -43,6 +43,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, * mouse is moved 5 pixels with left mouse key down. */ + @Override public void onMouseDown(MouseDownEvent event) { if (event.getNativeButton() == NativeEvent.BUTTON_LEFT) { mouseDown = true; @@ -50,6 +51,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, } } + @Override public void onMouseMove(MouseMoveEvent event) { if (mouseDown) { int deltaX = Math.abs(mDownEvent.getClientX() - event.getClientX()); @@ -74,6 +76,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, } + @Override public void onMouseOut(MouseOutEvent event) { mouseDown = false; mDownEvent = null; diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java index 582c951251..627f0554f6 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java @@ -12,33 +12,40 @@ public class VMyDropTarget extends Composite implements VHasDropHandler, ApplicationConnection client; + @Override public void dragEnter(VDragEvent drag) { } + @Override public void dragLeave(VDragEvent drag) { // TODO Auto-generated method stub } + @Override public void dragOver(VDragEvent currentDrag) { // TODO Auto-generated method stub } + @Override public boolean drop(VDragEvent drag) { // TODO Auto-generated method stub // return true to tell DDManager do server visit return false; } + @Override public VDropHandler getDropHandler() { // Drophandler implemented by widget itself return this; } + @Override public ComponentConnector getConnector() { // TODO Auto-generated method stub return null; } + @Override public ApplicationConnection getApplicationConnection() { return client; } diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java index 23b892be66..cb26cd7a83 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -13,6 +13,7 @@ public class HelloWorldExtension extends AbstractExtension { public HelloWorldExtension() { registerRpc(new HelloWorldRpc() { + @Override public void onMessageSent(String message) { Notification.show(message); } diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index 8625ffd955..001e913734 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -19,6 +19,7 @@ public class HelloWorldExtensionTest extends AbstractTestRoot { addExtension(extension); addComponent(new Button("Greet again", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { extension.greetAgain(); } diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java index 65f0735ab5..a16f131475 100644 --- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -22,6 +22,7 @@ public class JavascriptManagerTest extends AbstractTestRoot { addComponent(log); final JavaScript js = JavaScript.getCurrent(); js.addCallback("testing.doTest", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { log.log("Got " + arguments.length() + " arguments"); log.log("Argument 1 as a number: " + arguments.getInt(0)); diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index 72168c08df..7db5c8846e 100644 --- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -51,11 +51,13 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { public SimpleJavascriptExtension() { registerRpc(new SimpleJavaScriptExtensionServerRpc() { + @Override public void greet(String message) { Notification.show(getState().getPrefix() + message); } }); registerCallback("greetToServer", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { Notification.show(getState().getPrefix() + arguments.getString(0)); @@ -90,12 +92,14 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { addExtension(simpleJavascriptExtension); addComponent(new Button("Send rpc greeting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { simpleJavascriptExtension.greetRpc("Rpc greeting"); } })); addComponent(new Button("Send callback greeting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { simpleJavascriptExtension .greetCallback("Callback greeting"); diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java index b73a29efea..894944d186 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java @@ -27,6 +27,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { if (discardButton == null) { discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getFieldBinder().discard(); log.log("Discarded changes"); @@ -42,6 +43,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { showBeanButton = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getFieldBinder().getItemDataSource() .getBean().toString()); @@ -57,6 +59,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { commitButton = new Button("Commit"); commitButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java index c86cb6f5e8..b399857b3b 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java @@ -84,6 +84,7 @@ public class BasicPersonForm extends TestBase { final FieldGroup fieldGroup = new BeanFieldGroup<Person>(Person.class); fieldGroup.addCommitHandler(new CommitHandler() { + @Override public void preCommit(CommitEvent commitEvent) throws CommitException { if (configuration.preCommitFails) { @@ -95,6 +96,7 @@ public class BasicPersonForm extends TestBase { } + @Override public void postCommit(CommitEvent commitEvent) throws CommitException { if (configuration.postCommitFails) { @@ -118,6 +120,7 @@ public class BasicPersonForm extends TestBase { Button commitButton = new Button("Commit", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { @@ -133,6 +136,7 @@ public class BasicPersonForm extends TestBase { Button discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { fieldGroup.discard(); log.log("Discarded changes"); @@ -142,6 +146,7 @@ public class BasicPersonForm extends TestBase { Button showBean = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getPerson(fieldGroup).toString()); diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java index 6c6cd8024b..4f83f5d0fd 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java @@ -45,6 +45,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button commitButton = new Button("Commit", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { @@ -60,6 +61,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { fieldGroup.discard(); log.log("Discarded changes"); @@ -69,6 +71,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button showBean = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getPerson(fieldGroup).toString()); diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java index 1b6d384e70..f1345bca13 100644 --- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java +++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java @@ -22,6 +22,7 @@ public class EmbedSizeTest extends TestBase { CheckBox lazyCheckBox = new CheckBox("Lazy resize"); lazyCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { CheckBox cb = (CheckBox) event.getProperty(); Boolean resizeLazy = cb.getValue(); @@ -35,6 +36,7 @@ public class EmbedSizeTest extends TestBase { addComponent(log); mainWindow.addListener(new Page.BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { log.log("Resize event: " + event.getWidth() + " x " + event.getHeight()); diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java index b2001bdd7e..c464409153 100644 --- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -37,6 +37,7 @@ public class IntegrationTestApplication extends Application.LegacyApplication { final Label selectedLabel = new Label(); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { selectedLabel.setValue(table.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java index b4de4fd3da..db8d18938e 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java @@ -75,6 +75,7 @@ public class JSR286PortletRoot extends Root { Upload upload = new Upload("Upload a file", new Receiver() { + @Override public OutputStream receiveUpload(String filename, String mimeType) { return new ByteArrayOutputStream(); } @@ -94,11 +95,13 @@ public class JSR286PortletRoot extends Root { private class DemoPortletListener implements PortletListener { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response, Root window) { getContent().addComponent(new Label("Action received")); } + @Override public void handleRenderRequest(RenderRequest request, RenderResponse response, Root window) { // Portlet up-and-running, enable stuff @@ -173,11 +176,13 @@ public class JSR286PortletRoot extends Root { } } + @Override public void handleEventRequest(EventRequest request, EventResponse response, Root window) { // events not used by this test } + @Override public void handleResourceRequest(ResourceRequest request, ResourceResponse response, Root window) { // nothing special to do here diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java index 78b8f812b9..1bcf455aba 100644 --- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -71,10 +71,12 @@ public class LiferayThemeDemo extends Application.LegacyApplication { private Action.Handler handler = new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { // NOP } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new Action("Open"), @@ -318,6 +320,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { closable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Iterator<Component> it = ts.getComponentIterator(); for (; it.hasNext();) { @@ -415,6 +418,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { ContentMode.XHTML)); tabs.addListener(new TabSheet.SelectedTabChangeListener() { + @Override public void selectedTabChange(SelectedTabChangeEvent event) { if (event.getTabSheet().getSelectedTab() == l) { getMainWindow().addWindow(w); @@ -472,6 +476,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { lockCheckBox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { sp.setLocked((Boolean) event.getProperty().getValue()); sp2.setLocked((Boolean) event.getProperty().getValue()); @@ -595,6 +600,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Humanized", ContentMode.XHTML)); Button show = new Button("Humanized Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification notification = new Notification( title.getValue(), message.getValue()); @@ -606,6 +612,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Warning", ContentMode.XHTML)); show = new Button("Warning Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), Notification.TYPE_WARNING_MESSAGE, true).show(Page @@ -617,6 +624,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Error", ContentMode.XHTML)); show = new Button("Error Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), Notification.TYPE_ERROR_MESSAGE, true).show(Page @@ -628,6 +636,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Tray", ContentMode.XHTML)); show = new Button("Tray Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), Notification.TYPE_TRAY_NOTIFICATION, true).show(Page @@ -694,6 +703,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { final MenuBar.MenuItem find = edit.addItem("Find/Replace", null); find.addItem("Google Search", new Command() { + @Override public void menuSelected(MenuItem selectedItem) { getMainWindow().open( new ExternalResource("http://www.google.com")); diff --git a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java index 6193fd238e..b2cadebd02 100644 --- a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java +++ b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java @@ -31,6 +31,7 @@ public class AbsoluteLayoutAddRemove extends TestBase { final Button b = new Button("Add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (l.getParent() == null) { al.addComponent(l); diff --git a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java index 4388639893..77b8e249ba 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -61,6 +61,7 @@ public class CaptionsInLayouts extends TestBase { Button b = new Button("Add caption text"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { prependCaptions("a"); } @@ -81,6 +82,7 @@ public class CaptionsInLayouts extends TestBase { requiredToggle.setCaption("Required"); requiredToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setRequired((Boolean) event.getProperty().getValue()); } @@ -94,6 +96,7 @@ public class CaptionsInLayouts extends TestBase { iconToggle.setCaption("Icons"); iconToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setIcon((Boolean) event.getProperty().getValue()); } @@ -125,6 +128,7 @@ public class CaptionsInLayouts extends TestBase { errorToggle.setCaption("Error"); errorToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setError((Boolean) event.getProperty().getValue()); } @@ -250,6 +254,7 @@ public class CaptionsInLayouts extends TestBase { layoutSelect.setImmediate(true); layoutSelect.addListener(new ValueChangeListener() { + @Override @SuppressWarnings("unchecked") public void valueChange(ValueChangeEvent event) { Item i = layoutSelect.getItem(event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index f1e05b6fee..51f9e2d88e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -45,6 +45,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { b1.setWidth(270, Sizeable.UNITS_PIXELS); b2.setWidth(270, Sizeable.UNITS_PIXELS); b1.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { cols++; gl.setColumns(cols); @@ -70,6 +71,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { Button restart = new Button("restart"); mainLayout.addComponent(restart); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { mainLayout.getRoot().getApplication().close(); } diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java index 0e2d570101..792bcb1aab 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java @@ -46,6 +46,7 @@ public class CssLayoutCustomCss extends TestBase implements ClickListener { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { layout.setMargin(cb.getValue()); } @@ -73,6 +74,7 @@ public class CssLayoutCustomCss extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); if (b.getCaption().contains("not ")) { diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java index ef07b2c5f5..093dc782fb 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java @@ -16,6 +16,7 @@ public class CssLayoutRemoveComponent extends TestBase { final TextField tf = new TextField("Caption1"); Button b = new Button("Remove field ", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeComponent(tf); } diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java index 4f081af347..df4fc8615d 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java @@ -15,6 +15,7 @@ public class CssLayoutRemoveComponentWithCaption extends TestBase { final TextField tf = new TextField("Caption"); Button b = new Button("Remove field and add new", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeComponent(tf); addComponent(new TextField("new field")); diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java index 0be605c795..ed3c5e66d3 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java @@ -35,6 +35,7 @@ public class CssLayoutSizeChangePropagation extends TestBase { button.addListener(new ClickListener() { boolean bool = true; + @Override public void buttonClick(ClickEvent event) { sp.setExpandRatio(cssLayout, bool ? 1 : 0); bool = !bool; diff --git a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java index 47cb095efa..e119b91b82 100644 --- a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java +++ b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java @@ -44,6 +44,7 @@ public class DeepComponentTrees extends TestBase { final Button b = new Button("Go try your luck with " + i + " layouts!"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { FF2KILLER(i++); b.setCaption("Go try your luck with " + i + " layouts!"); @@ -60,6 +61,7 @@ public class DeepComponentTrees extends TestBase { s.addItem(GridLayout.class); s.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = s.getValue(); if (!value.equals("-- Choose value --")) { diff --git a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java index 7fc33edfc7..f596fdb77e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java @@ -27,6 +27,7 @@ public class FormLayoutWithInvisibleComponent extends TestBase { CheckBox control = new CheckBox("Messages On/Off"); control.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { messages.setVisible((Boolean) event.getProperty().getValue()); messages.setRequired(true); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java index 9ad9adb43a..8713208dc6 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -29,6 +29,7 @@ public class GridLayoutCaptions extends TestBase { private FormFieldFactory fff = new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { @@ -195,6 +196,7 @@ public class GridLayoutCaptions extends TestBase { Button b = new Button("Give me an error!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { aFormWithGl.createErrors(); @@ -205,6 +207,7 @@ public class GridLayoutCaptions extends TestBase { Button b2 = new Button("Get rid of an error!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { aFormWithGl.clearErrors(); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 314a8d7b03..84f27e5f03 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -59,6 +59,7 @@ public class GridLayoutExpandRatioModification extends TestBase implements vl2.setSizeFull(); } + @Override public void buttonClick(ClickEvent event) { if (isVisible) { mainLayout.setRowExpandRatio(2, 0); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java index 1442dc3421..efd1277653 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java @@ -29,6 +29,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift label right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { // Moving component from 0,0 -> 1,0 grid.removeComponent(l); @@ -38,6 +39,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift button right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { grid.removeComponent(b); grid.addComponent(b, 1, 1); @@ -46,6 +48,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift text field right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { grid.removeComponent(tf); grid.addComponent(tf, 1, 2); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java index 6424177fe1..3531a4e13c 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java @@ -31,6 +31,7 @@ public class GridLayoutNPE extends TestBase { b.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { gl.removeComponent(toRemove); @@ -50,6 +51,7 @@ public class GridLayoutNPE extends TestBase { b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toEdit.setValue("Second (edited)"); } diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java index 8689503332..5d45f72142 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java @@ -26,6 +26,7 @@ public class GridLayoutRemoveFinalRow extends TestBase { Button removeRowBtn = new Button("Remove row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeRow(0); } diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java index 78984d33a2..c0e6b27c7d 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java @@ -43,6 +43,7 @@ public class GridLayoutWidthChange extends TestBase { Button testButton = new Button("Reduce GridLayout parent width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setWidth((cc.getWidth() - 10) + "px"); } diff --git a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index 8c05df6ca9..52df4553a9 100644 --- a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -47,6 +47,7 @@ public class HiddenHorizontalLayout extends TestBase { Button b = new Button("toggle layout visibility", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { hl.setVisible(!hl.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java index 23cf868085..57c6173895 100644 --- a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java @@ -213,12 +213,14 @@ public class LayoutPerformanceTests extends TestBase { controls.addComponent(childAmount); controls.addComponent(new Button("Clear", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setTestLayout(new Label("")); } })); controls.addComponent(new Button("Apply", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { SampleType leafType = (SampleType) leafSelector.getValue(); if (leafType == null) { diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index bf5de2976f..5f91786571 100644 --- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -53,6 +53,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { } componentContainerSelect.addListener(new ValueChangeListener() { + @Override @SuppressWarnings("unchecked") public void valueChange(ValueChangeEvent event) { ComponentContainer oldCC = cc; @@ -69,6 +70,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { Button but1 = new Button("Move in and out of component container", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setVisible(!cc.isVisible()); if (!cc.isVisible()) { diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java index 23ae31d786..1285e5b52e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -23,6 +23,7 @@ public class MovingInvisibleField extends TestBase { Button b = new Button("Move hidden textfield to other layout"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (layout1.getComponentIndex(tfHidden) != -1) { layout2.addComponent(tfVisible); diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java index 9f18ef7887..2ceb6428ed 100644 --- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -1005,6 +1005,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createAddButton(AbstractOrderedLayout ol) { Button b = new Button("Add before", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addBefore((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent(), ""); @@ -1019,6 +1020,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createWideAddButton(AbstractOrderedLayout ol) { Button b = new Button("Add 100% before", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addBefore((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent(), "100%"); @@ -1033,6 +1035,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createRemoveButton(AbstractOrderedLayout ol, String suffix) { Button b = new Button("Remove this " + suffix, new ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent()); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java index 2f0f16b4a5..d2f14c114e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java @@ -130,6 +130,7 @@ public class TestAbsoluteLayout extends TestBase { Button componentChooser = new Button("choose component to edit"); componentChooser.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window chooser = new Window("Choose component"); chooser.getContent().setSizeUndefined(); @@ -166,6 +167,7 @@ public class TestAbsoluteLayout extends TestBase { select.setImmediate(true); select.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { editcomponent((Component) event.getProperty() .getValue()); @@ -185,6 +187,7 @@ public class TestAbsoluteLayout extends TestBase { Button addComp = new Button("add component"); addComp.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window chooser = new Window( "Choose component type to add"); @@ -235,6 +238,7 @@ public class TestAbsoluteLayout extends TestBase { select.setImmediate(true); select.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Class<?> c = (Class<?>) event.getProperty() .getValue(); @@ -279,6 +283,7 @@ public class TestAbsoluteLayout extends TestBase { addComponent(positionEditor); Button b = new Button("Commit changes", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { positionEditor.commit(); componentEditor.commit(); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java index 619e4581fa..b998abeb02 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -60,6 +60,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { al.addComponent(new Button("A button with its own click listener", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { log.log("Button " + event.getButton().getCaption() @@ -69,6 +70,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { })); al.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("AbsoluteLayout", event); } @@ -92,6 +94,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { cl.addComponent(new Button("A button with its own click listener", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { log.log("Button " + event.getButton().getCaption() @@ -101,6 +104,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { })); cl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("CSSLayout", event); } @@ -125,6 +129,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { gl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("GridLayout", event); } @@ -166,6 +171,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { gl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("VerticalLayout", event); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java index 3d496fa446..d41fbac1c1 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -65,6 +65,7 @@ public class TestLayoutPerformance extends TestBase { b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int components = Integer.parseInt(n.getValue()); Layout layout = getCurrentLayout(); diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 44a1e27cb8..916a82bb85 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -55,6 +55,7 @@ public class VerticalLayoutExpandRatioModification extends TestBase implements vl2.setSizeFull(); } + @Override public void buttonClick(ClickEvent event) { if (isVisible) { mainLayout.setExpandRatio(vl2, 0); diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java index 98c5425bc6..f3d4029663 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java @@ -43,6 +43,7 @@ public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden extends "Click to set bar visible. Button should stay visible."); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { bar.setVisible(true); foobar.setVisible(true); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index 467705a103..d53fda1748 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -150,6 +150,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.addComponent(cc1); button1.setEnabled(false); @@ -159,6 +160,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.replaceComponent(x22, cc2); button2.setEnabled(false); @@ -168,6 +170,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.moveComponentsFrom(source); button3.setEnabled(false); @@ -177,6 +180,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeComponent(1, 1); button4.setEnabled(false); @@ -187,6 +191,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button5.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeRow(0); button5.setEnabled(false); @@ -196,6 +201,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button6.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeComponent(row3); button6.setEnabled(false); @@ -230,6 +236,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x3.setSizeFull(); button1.setEnabled(false); @@ -239,6 +246,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x3.setWidth("200px"); button2.setEnabled(false); @@ -248,6 +256,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x22.setWidth("200px"); button3.setEnabled(false); @@ -257,6 +266,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x22.setSizeUndefined(); ((Table) x22).addItem(new Object[] { "NEW ROW1" }, 3); @@ -292,6 +302,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setColumnExpandRatio(3, 1); button1.setEnabled(false); @@ -301,6 +312,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setColumnExpandRatio(0, 0.25f); glo.setColumnExpandRatio(1, 0.25f); @@ -313,6 +325,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setRowExpandRatio(0, 0.5f); button3.setEnabled(false); @@ -322,6 +335,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setRowExpandRatio(3, 0.3f); button4.setEnabled(false); @@ -394,6 +408,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setHeight("350px"); button1.setEnabled(false); @@ -403,6 +418,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSizeUndefined(); glo.addComponent(new Label("--- NEW LABEL ---")); @@ -413,6 +429,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setWidth("75%"); glo.setHeight("75%"); @@ -423,6 +440,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSizeFull(); button4.setEnabled(false); @@ -457,6 +475,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setMargin(true); button1.setEnabled(false); @@ -466,6 +485,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSpacing(true); button2.setEnabled(false); @@ -475,6 +495,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setMargin(false); button3.setEnabled(false); @@ -484,6 +505,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index bd60e9ff21..182d4fd1d5 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -132,6 +132,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { addButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.addComponent(new TextField()); addButton.setEnabled(false); @@ -141,6 +142,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { replaceButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.replaceComponent(c1, c3); replaceButton.setEnabled(false); @@ -150,6 +152,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { moveButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.moveComponentsFrom(source); moveButton.setEnabled(false); @@ -159,6 +162,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { removeButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.removeComponent(c1); vlo.removeComponent(c2); @@ -203,6 +207,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { biggerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setSizeFull(); biggerButton.setEnabled(false); @@ -212,6 +217,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { smallerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setWidth("200px"); smallerButton.setEnabled(false); @@ -221,6 +227,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { originalButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { originalButton.setEnabled(false); c.setSizeUndefined(); @@ -270,6 +277,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setHeight("350px"); button1.setEnabled(false); @@ -279,6 +287,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSizeUndefined(); vlo.addComponent(new Label("--- NEW LABEL ---")); @@ -289,6 +298,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setWidth("75%"); vlo.setHeight("75%"); @@ -299,6 +309,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSizeFull(); button4.setEnabled(false); @@ -335,6 +346,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 1.0f); button1.setEnabled(false); @@ -344,6 +356,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 0.5f); vlo.setExpandRatio(c2, 0.5f); @@ -354,6 +367,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 0.75f); vlo.setExpandRatio(c2, 0.25f); @@ -442,6 +456,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setMargin(true); button1.setEnabled(false); @@ -451,6 +466,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSpacing(true); button2.setEnabled(false); @@ -460,6 +476,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setMargin(false); button3.setEnabled(false); @@ -469,6 +486,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index 6a524cd024..90193be7cc 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -35,6 +35,7 @@ public class LayoutTesterApplication extends AbstractTestCase { nextButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = -1577298910202253538L; + @Override public void buttonClick(ClickEvent event) { nextLaytout(); } @@ -106,6 +107,7 @@ public class LayoutTesterApplication extends AbstractTestCase { layoutSelector.addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = -605319614765838359L; + @Override public void valueChange(ValueChangeEvent event) { layoutIndex = -1; nextLaytout(); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 2861acabdd..dcf0d56dcb 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -133,6 +133,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { addButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.addComponent(new TextField()); addButton.setEnabled(false); @@ -142,6 +143,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { replaceButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.replaceComponent(c1, c3); replaceButton.setEnabled(false); @@ -151,6 +153,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { moveButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.moveComponentsFrom(source); moveButton.setEnabled(false); @@ -160,6 +163,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { removeButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.removeComponent(c1); vlo2.removeComponent(c2); @@ -206,6 +210,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { biggerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setSizeFull(); biggerButton.setEnabled(false); @@ -215,6 +220,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { smallerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setWidth("200px"); smallerButton.setEnabled(false); @@ -224,6 +230,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { originalButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { originalButton.setEnabled(false); c.setSizeUndefined(); @@ -280,6 +287,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setHeight("350px"); button1.setEnabled(false); @@ -289,6 +297,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSizeUndefined(); Label newLabel = new Label("--- NEW LABEL ---"); @@ -301,6 +310,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setWidth("75%"); vlo2.setHeight("75%"); @@ -311,6 +321,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSizeFull(); button4.setEnabled(false); @@ -351,6 +362,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 1.0f); button1.setEnabled(false); @@ -360,6 +372,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 0.5f); vlo2.setExpandRatio(c2, 0.5f); @@ -370,6 +383,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 0.75f); vlo2.setExpandRatio(c2, 0.25f); @@ -470,6 +484,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setMargin(true); button1.setEnabled(false); @@ -479,6 +494,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSpacing(true); button2.setEnabled(false); @@ -488,6 +504,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setMargin(false); button3.setEnabled(false); @@ -497,6 +514,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java index 9ed2bd2c75..81f225bc63 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java @@ -55,6 +55,7 @@ class DynamicImageRequestHandler implements RequestHandler { public static final String IMAGE_URL = "myimage.png"; + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java index 6bd3a166e5..ed0a5ba955 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java @@ -27,6 +27,7 @@ public class FindCurrentRootAndApplication extends Root { protected void init(WrappedRequest request) { Button helloButton = new Button("Say Hello"); helloButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Running in "; msg += Application.getCurrent().isProductionMode() ? "production" @@ -36,6 +37,7 @@ public class FindCurrentRootAndApplication extends Root { }); helloButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show("This Root is " + Root.getCurrent().getClass().getSimpleName()); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index 66185ef6a6..af60b0e9e3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -35,6 +35,7 @@ public class IntegerTextFieldDataSource extends AbstractTestRoot { final TextField textField = new TextField("Text field", integerProperty); Button submitButton = new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String uiValue = textField.getValue(); Integer propertyValue = integerProperty.getValue(); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 9c720e45a5..f733b5df40 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -19,6 +19,7 @@ public class IntegerTextFieldStandalone extends AbstractTestRoot { textField.setConverter(new StringToIntegerConverter()); Button submitButton = new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String uiValue = textField.getValue(); try { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 4ccd73b2b3..c2393300f2 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -24,6 +24,7 @@ public class StringMyTypeConverter extends AbstractTestRoot { addComponent(textField); addComponent(new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { Name name = (Name) textField.getConvertedValue(); @@ -50,6 +51,7 @@ public class StringMyTypeConverter extends AbstractTestRoot { } class StringToNameConverter implements Converter<String, Name> { + @Override public Name convertToModel(String text, Locale locale) throws ConversionException { if (text == null) { @@ -63,6 +65,7 @@ class StringToNameConverter implements Converter<String, Name> { return new Name(parts[0], parts[1]); } + @Override public String convertToPresentation(Name name, Locale locale) throws ConversionException { if (name == null) { @@ -72,10 +75,12 @@ class StringToNameConverter implements Converter<String, Name> { } } + @Override public Class<Name> getModelType() { return Name.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index e98b698c07..bf497a7b86 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -30,6 +30,7 @@ public class UsingUriFragments extends Root { // React to fragment changes getPage().addListener(new FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent source) { handleFragment(source.getFragment()); } @@ -40,6 +41,7 @@ public class UsingUriFragments extends Root { addComponent(new Button("Show and set fragment", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { handleFragment(getPage().getFragment()); getPage().setFragment("customFragment"); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java index 5c4fa9d10b..e67a7903c8 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java @@ -14,6 +14,7 @@ public class MyComponent extends AbstractComponent { private int clickCount = 0; private MyComponentServerRpc rpc = new MyComponentServerRpc() { + @Override public void clicked(MouseEventDetails mouseDetails) { clickCount++; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index ea278da218..98ff0386b3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -29,6 +29,7 @@ public class MyPickerConnector extends AbstractComponentConnector implements } private final ElementResizeListener listener = new ElementResizeListener() { + @Override public void onElementResize(ElementResizeEvent e) { int buttonWidth = getLayoutManager().getOuterWidth(e.getElement()); buttonWidth -= getLayoutManager().getMarginRight(e.getElement()); @@ -52,6 +53,7 @@ public class MyPickerConnector extends AbstractComponentConnector implements getLayoutManager().unregisterDependency(this, button); } + @Override public void layout() { Element button = getWidget().getWidget(1).getElement(); int buttonWidth = getLayoutManager().getOuterWidth(button); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java index 213a1b9e6b..7818ac4f99 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java @@ -27,6 +27,7 @@ public class MyPickerWidget extends ComplexPanel { add(button, getElement()); button.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { Window.alert("Calendar picker not yet supported!"); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java index 3c2f9a68b4..40bb7b68b8 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java @@ -25,6 +25,7 @@ public class WidgetContainer extends AbstractComponentContainer { requestRepaint(); } + @Override public void replaceComponent(Component oldComponent, Component newComponent) { int index = children.indexOf(oldComponent); if (index != -1) { @@ -36,10 +37,12 @@ public class WidgetContainer extends AbstractComponentContainer { } } + @Override public int getComponentCount() { return children.size(); } + @Override public Iterator<Component> getComponentIterator() { return children.iterator(); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java index 3b24ec400e..fae4265750 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java @@ -24,6 +24,7 @@ public class WidgetcontainerRoot extends Root { "Click the button to add components to the WidgetContainer.")); Button button = new Button("Add more components", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Random randomGenerator = new Random(); int random = randomGenerator.nextInt(3); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java index 85f9bb2d2e..6f59aa765e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java @@ -17,6 +17,7 @@ public class AnalyticsRoot extends Root { analytics.extend(this); addComponent(new Button("Track pageview", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { analytics.trackPageview("/fake/url"); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java index a6b5cedc47..946a67d7fd 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -21,12 +21,14 @@ import com.vaadin.ui.Notification; public class Flot extends AbstractJavaScriptComponent { public Flot() { registerRpc(new FlotClickRpc() { + @Override public void onPlotClick(int seriesIndex, int dataIndex) { Notification.show("Clicked on [" + seriesIndex + ", " + dataIndex + "]"); } }); registerCallback("onPlotClick", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { int seriesIndex = arguments.getInt(0); int dataIndex = arguments.getInt(1); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java index 00104df9dd..2b5e7337c8 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java @@ -21,6 +21,7 @@ public class FlotJavaScriptRoot extends Root { addComponent(flot); addComponent(new Button("Highlight point", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { flot.highlight(0, 3); } diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java index 1d98e35dd5..2f5c1177fa 100644 --- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java +++ b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java @@ -22,6 +22,7 @@ public class AppResource404 extends TestBase { addComponent(new Button("Remove existing resrouce", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeResource(resource); } diff --git a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java index 3d7379aafe..cb8963c3d4 100644 --- a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java @@ -22,6 +22,7 @@ public class DownloadLargeFileResource extends TestBase { + String.format("%.1f", fileSize / 1024.0 / 1024.0) + "MB file", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { download(); } diff --git a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java index d3bbeef99a..b6dbcfca97 100644 --- a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java @@ -22,6 +22,7 @@ public class NonExistingFileResource extends TestBase { Button b = new Button("Download " + filename); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { FileResource res = new FileResource(new File(getContext() .getBaseDirectory() + "/" + filename), diff --git a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java index 69fd0b2b81..8ab6ce153d 100644 --- a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java +++ b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java @@ -17,6 +17,7 @@ public class ResourceDownload extends TestBase { public void setup() { Button b = new Button("Download (_new)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_new"); } @@ -24,6 +25,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download (_blank)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_blank"); } @@ -31,6 +33,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download ()", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download(""); } @@ -38,6 +41,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download (_top)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_top"); } @@ -45,6 +49,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ResourceDownload.this.getMainWindow().showNotification( "Still working"); @@ -59,6 +64,7 @@ public class ResourceDownload extends TestBase { String filename = "filename"; StreamResource streamResource = new StreamResource(new StreamSource() { + @Override public InputStream getStream() { try { return new FileInputStream("FIXME C:/temp/file.xls"); diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java index 881a3c3be1..dbd2029bb4 100644 --- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java @@ -111,61 +111,73 @@ public class SerializerTest extends AbstractTestRoot { }); testExtension.registerRpc(new SerializerTestRpc() { + @Override public void sendBoolean(boolean value, Boolean boxedValue, boolean[] array) { log.log("sendBoolean: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendByte(byte value, Byte boxedValue, byte[] array) { log.log("sendByte: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendChar(char value, Character boxedValue, char[] array) { log.log("sendChar: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendInt(int value, Integer boxedValue, int[] array) { log.log("sendInt: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendLong(long value, Long boxedValue, long[] array) { log.log("sendLong: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendFloat(float value, Float boxedValue, float[] array) { log.log("sendFloat: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendDouble(double value, Double boxedValue, double[] array) { log.log("sendDouble: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendString(String value) { log.log("sendString: " + value); } + @Override public void sendConnector(Connector connector) { log.log("sendConnector: " + connector.getClass().getName()); } + @Override public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, SimpleTestBean[] array) { log.log("sendBean: " + complexBean + ", " + simpleBean + ", " + Arrays.toString(array)); } + @Override public void sendNull(String value1, String value2) { log.log("sendNull: " + value1 + ", " + value2); } + @Override public void sendNestedArray(int[][] nestedIntArray, SimpleTestBean[][] nestedBeanArray) { log.log("sendNestedArray: " @@ -173,6 +185,7 @@ public class SerializerTest extends AbstractTestRoot { + Arrays.deepToString(nestedBeanArray)); } + @Override public void sendList(List<Integer> intList, List<Connector> connectorList, List<SimpleTestBean> beanList) { log.log("sendList: " + intList + ", " @@ -195,6 +208,7 @@ public class SerializerTest extends AbstractTestRoot { return string; } + @Override public void sendArrayList(List<int[]> primitiveArrayList, List<Integer[]> objectArrayList, List<SimpleTestBean[]> beanArrayList) { @@ -204,12 +218,14 @@ public class SerializerTest extends AbstractTestRoot { + ", " + Arrays.deepToString(beanArrayList.toArray())); } + @Override public void sendListArray(List<Integer>[] objectListArray, List<SimpleTestBean>[] beanListArray) { log.log("sendArrayList: " + Arrays.toString(objectListArray) + ", " + Arrays.toString(beanListArray)); } + @Override public void sendSet(Set<Integer> intSet, Set<Connector> connectorSet, Set<SimpleTestBean> beanSet) { log.log("sendSet: " + intSet + ", " @@ -217,6 +233,7 @@ public class SerializerTest extends AbstractTestRoot { + beanSet); } + @Override public void sendMap(Map<String, SimpleTestBean> stringMap, Map<Connector, Boolean> connectorMap, Map<Integer, Connector> intMap, @@ -253,6 +270,7 @@ public class SerializerTest extends AbstractTestRoot { + ", " + intMapString + ", " + beanMap); } + @Override public void sendWrappedGenerics( Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics) { log.log("sendWrappedGenerics: " + generics.toString()); diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java index cc275c18f4..a2d482dfbf 100644 --- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java @@ -35,6 +35,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { themeToggle = new CheckBox("Runo theme"); themeToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (getTheme() == "reindeer") { setTheme("runo"); @@ -49,6 +50,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { styleToggle = new CheckBox("Black style"); styleToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (!main.getContent().getStyleName().contains("black")) { main.getContent().setStyleName("black"); @@ -63,6 +65,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { iconToggle = new CheckBox("64x icons"); iconToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { largeIcons = !largeIcons; recreateAll(); @@ -74,6 +77,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { nativeToggle = new CheckBox("Native buttons"); nativeToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { nativeButtons = !nativeButtons; recreateAll(); @@ -120,6 +124,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { main.addComponent(b); Button c = new Button("toggle enabled", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { b.setEnabled(!b.isEnabled()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java index 872084d436..b1841b69ba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java @@ -32,6 +32,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(selectWithoutNullItem); Button b = new Button("Select NULL_PROPERTY", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select(NULL_ITEM_ID); printState(); @@ -41,6 +42,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select("1"); printState(); @@ -50,6 +52,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select("2"); printState(); @@ -60,6 +63,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select null", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select(null); printState(); @@ -79,6 +83,7 @@ public class Ticket1230 extends Application.LegacyApplication { selectWithNullItem.setCaption("Select with null item id"); Button b = new Button("Select NULL_PROPERTY", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select(NULL_ITEM_ID); printState(); @@ -89,6 +94,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select("1"); printState(); @@ -98,6 +104,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select("2"); printState(); @@ -107,6 +114,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select null", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select(null); printState(); @@ -118,6 +126,7 @@ public class Ticket1230 extends Application.LegacyApplication { w.addComponent(new Button("print select values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printState(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java index 81a164d22e..4c0c210f06 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java @@ -27,6 +27,7 @@ public class Ticket124 extends Application.LegacyApplication { tf = new TextField("Row nr"); Button insert = new Button("Insert row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { insertRow(); @@ -34,6 +35,7 @@ public class Ticket124 extends Application.LegacyApplication { }); Button delete = new Button("Delete row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { deleteRow(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java index b35d185811..7e9f5dab2c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java @@ -33,10 +33,12 @@ public class Ticket1365 extends com.vaadin.Application.LegacyApplication new ShortcutAction("CTRL-S", ShortcutAction.KeyCode.S, new int[] { ShortcutAction.ModifierKey.CTRL }), }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { status.setValue("Pressed " + action.getCaption() + " to fire shortcut. Texfield value: " + f.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java index a1a5b449d1..92d3598382 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java @@ -26,6 +26,7 @@ public class Ticket1368 extends Application.LegacyApplication { addColumn.setImmediate(true); addColumn.setNewItemsAllowed(true); addColumn.setNewItemHandler(new ComboBox.NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { t.addContainerProperty(newItemCaption, String.class, "-"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java index dfccf31956..3ba7ae2bfa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java @@ -30,10 +30,12 @@ public class Ticket1397 extends Application.LegacyApplication { "fooTextField"); PopupView.Content content = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(prop.getValue()); } + @Override public Component getPopupComponent() { return new TextField("Edit foo", prop); } @@ -56,6 +58,7 @@ public class Ticket1397 extends Application.LegacyApplication { public myButton() { super("Reverse the property"); this.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { StringBuffer getContents = prop2.getValue(); getContents.reverse(); @@ -68,10 +71,12 @@ public class Ticket1397 extends Application.LegacyApplication { final Panel panel2 = new Panel("Editor with a button"); panel2.addComponent(new myButton()); PopupView.Content content2 = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(prop2.getValue()); } + @Override public Component getPopupComponent() { return panel2; } @@ -89,10 +94,12 @@ public class Ticket1397 extends Application.LegacyApplication { panel3.addComponent(tf2); PopupView.Content content3 = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(op.getValue()); } + @Override public Component getPopupComponent() { return panel3; } @@ -113,10 +120,12 @@ public class Ticket1397 extends Application.LegacyApplication { final InlineDateField df = new InlineDateField("", new Date()); PopupView pp = new PopupView(new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(df.getValue()); } + @Override public Component getPopupComponent() { return df; } @@ -130,11 +139,13 @@ public class Ticket1397 extends Application.LegacyApplication { + lineNum + " and see how the overview-version changes."); + @Override public String getMinimizedValueAsHTML() { return "" + String.valueOf(tf.getValue()).length() + " characters of info"; } + @Override public Component getPopupComponent() { return tf; } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java index c280be4e4a..438f7e2d5f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java @@ -118,6 +118,7 @@ public class Ticket1435 extends Application.LegacyApplication { collapse.setStyleName("collapse"); collapse.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { if (useWorkaround) { container.setVisible(false); @@ -144,6 +145,7 @@ public class Ticket1435 extends Application.LegacyApplication { if (useWorkaround) { expand.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.setVisible(true); root.setHeight(lastHeight, lastHeightUnit); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index 9a777d655c..4b7d4201e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -23,6 +23,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { Button b = new Button("click to show notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -35,6 +36,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to warning notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -46,6 +48,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to Humanized notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -56,6 +59,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to test modality!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.addComponent(new Label("clicked")); @@ -68,6 +72,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to test modality!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.addComponent(new Label("clicked")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java index 0c06a24df5..9835e046dc 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java @@ -26,6 +26,7 @@ public class Ticket1506_Panel extends Panel { private Component initButton(final ObjectProperty<?> property) { Button button = new Button("Clear select"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { property.setValue(null); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java index 616e40d917..d6b53db7c7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java @@ -38,6 +38,7 @@ public class Ticket1506_TestContainer implements Container { items.put(ITEM_2_ID, item2); } + @Override public Item getItem(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -45,6 +46,7 @@ public class Ticket1506_TestContainer implements Container { return items.get(itemId); } + @Override public Collection<String> getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); @@ -55,6 +57,7 @@ public class Ticket1506_TestContainer implements Container { return a; } + @Override public Collection<String> getItemIds() { if (items.isEmpty()) { loadItems(); @@ -65,6 +68,7 @@ public class Ticket1506_TestContainer implements Container { return a; } + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -76,6 +80,7 @@ public class Ticket1506_TestContainer implements Container { return null; } + @Override public Class<String> getType(Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -83,6 +88,7 @@ public class Ticket1506_TestContainer implements Container { return String.class; } + @Override public int size() { if (items.isEmpty()) { loadItems(); @@ -90,6 +96,7 @@ public class Ticket1506_TestContainer implements Container { return items.size(); } + @Override public boolean containsId(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -97,29 +104,35 @@ public class Ticket1506_TestContainer implements Container { return items.containsKey(itemId); } + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java index 863ce907da..7ac34dcd2e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java @@ -33,6 +33,7 @@ public class Ticket1506_TestContainer2 implements Container { } } + @Override public Item getItem(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -40,6 +41,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.get(itemId); } + @Override public Collection<String> getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); @@ -50,6 +52,7 @@ public class Ticket1506_TestContainer2 implements Container { return a; } + @Override public Collection<String> getItemIds() { if (items.isEmpty()) { loadItems(); @@ -57,6 +60,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.keySet(); } + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -68,6 +72,7 @@ public class Ticket1506_TestContainer2 implements Container { return null; } + @Override public Class<String> getType(Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -75,6 +80,7 @@ public class Ticket1506_TestContainer2 implements Container { return String.class; } + @Override public int size() { if (items.isEmpty()) { loadItems(); @@ -82,6 +88,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.size(); } + @Override public boolean containsId(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -89,29 +96,35 @@ public class Ticket1506_TestContainer2 implements Container { return items.containsKey(itemId); } + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java index 614c471d3e..b9fd2debd5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java @@ -35,6 +35,7 @@ public class Ticket1572 extends com.vaadin.Application.LegacyApplication { Button b = new Button("next margin state"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { nextMarginState(); } @@ -48,6 +49,7 @@ public class Ticket1572 extends com.vaadin.Application.LegacyApplication { Button b2 = new Button("next spacing state"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { nextSpacingState(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java index 1efea99a0e..6831d4c52d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java @@ -52,6 +52,7 @@ public class Ticket1581 extends com.vaadin.Application.LegacyApplication { final Button stop = new Button("Stop updating", new ClickListener() { boolean active = true; + @Override public void buttonClick(ClickEvent event) { if (active) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java index 7aba886133..95cc918b6e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java @@ -50,6 +50,7 @@ class MyDynamicResource implements RequestHandler { * Returns null if the URI does not match. Otherwise returns a download * stream that contains the response from the server. */ + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java index 0faf9b8afb..5cb03e77af 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java @@ -32,6 +32,7 @@ public class Ticket1598 extends Application.LegacyApplication { for (int i = 0; i < 5; i++) { first.addItem(new String("Submenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); } @@ -44,6 +45,7 @@ public class Ticket1598 extends Application.LegacyApplication { firstSubItem1.addItem(new String("Subsubmenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -56,6 +58,7 @@ public class Ticket1598 extends Application.LegacyApplication { firstSubItem2.addItem(new String("Subsubmenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -69,6 +72,7 @@ public class Ticket1598 extends Application.LegacyApplication { second.addItem(new String("Second submenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -82,6 +86,7 @@ public class Ticket1598 extends Application.LegacyApplication { for (int i = 2; i <= 3; i++) { (menuBar.getItems().get(i)).setCommand(new Command() { + @Override public void menuSelected(MenuItem selectedItem) { main.showNotification("Action " + selectedItem.getText()); } @@ -92,6 +97,7 @@ public class Ticket1598 extends Application.LegacyApplication { fourth.setText("Add new item"); fourth.setCommand(new Command() { + @Override public void menuSelected(MenuItem selected) { menuBar.addItem("Newborn", null, null); } @@ -108,6 +114,7 @@ public class Ticket1598 extends Application.LegacyApplication { // A command for removing the selected menuitem Command removeCommand = new Command() { + @Override public void menuSelected(MenuItem selected) { MenuItem parent = selected.getParent(); if (parent != null) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java index 1819076b32..b8bf8deb20 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java @@ -27,6 +27,7 @@ public class Ticket161 extends Application.LegacyApplication { Button b = new Button("Truncate to 20 rows"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Container containerDataSource = t.getContainerDataSource(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java index 1774000355..43feab5ab7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java @@ -45,6 +45,7 @@ public class Ticket1632 extends Application.LegacyApplication { b.addListener(new Button.ClickListener() { boolean visible = false; + @Override public void buttonClick(ClickEvent event) { visible = !visible; if (visible) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java index d78a1d78af..3c64a49316 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java @@ -16,6 +16,7 @@ public class Ticket1659 extends Application.LegacyApplication { "Change URI using Application.getURL()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.open(new ExternalResource(getURL() + "#" + System.currentTimeMillis())); @@ -24,6 +25,7 @@ public class Ticket1659 extends Application.LegacyApplication { mainWin.addComponent(new Button("Change URI uring Window.getURL()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.open(new ExternalResource(mainWin.getURL() + "#" + System.currentTimeMillis())); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java index 891cdf9f21..277096598e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java @@ -14,6 +14,7 @@ public class Ticket1673 extends com.vaadin.Application.LegacyApplication { setMainWindow(main); main.addComponent(new Button("close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { close(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java index 827879d3c6..01792aeb89 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java @@ -279,6 +279,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { } Property.ValueChangeListener marginSpacingListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateMarginsAndSpacing(); } @@ -343,6 +344,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right"); Property.ValueChangeListener alignmentChangeListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateAlignments(((Integer) hAlign.getValue()).intValue(), ((Integer) vAlign.getValue()).intValue()); @@ -372,6 +374,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right"); lAlign.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { testPanelLayout.setComponentAlignment(testedLayout, ((Integer) lAlign.getValue()).intValue(), diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java index 7ca90904f8..2cbb648227 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java @@ -24,6 +24,7 @@ public class Ticket1772 extends com.vaadin.Application.LegacyApplication { b.addListener(new Button.ClickListener() { int counter = 0; + @Override public void buttonClick(ClickEvent event) { gridLayout diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java index aed69056aa..63af96b1a2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java @@ -27,6 +27,7 @@ public class Ticket1775 extends com.vaadin.Application.LegacyApplication { button2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Label mainComponent = new Label("Main"); Label header = new Label("Header"); @@ -34,6 +35,7 @@ public class Ticket1775 extends com.vaadin.Application.LegacyApplication { layout.addComponent(mainComponent, "body"); layout.addComponent(header, "loginUser"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { layout.addComponent(anotherComponent, "body"); layout.removeComponent("loginUser"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java index d627d11e18..1c9e24ffd4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java @@ -91,6 +91,7 @@ public class Ticket1804 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<Select> i = listOfAllFields.iterator(); i @@ -136,6 +137,7 @@ public class Ticket1804 extends com.vaadin.Application.LegacyApplication { this.msg = msg; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || value.toString().length() == 0) { throw new InvalidValueException(msg); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java index d7eac667f0..a40f5b25b9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java @@ -30,6 +30,7 @@ public class Ticket1805 extends com.vaadin.Application.LegacyApplication { final TextField size = new TextField("Grid width in css unit"); size.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String width = size.getValue().toString(); if (width == null || width.equals("")) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java index c47ea49697..2c979f4600 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java @@ -25,18 +25,21 @@ public class Ticket1806 extends com.vaadin.Application.LegacyApplication { "This button does nothing (but flushes queued variable changes)")); main.addComponent(new Button("Commit the field to property", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf1.commit(); } })); main.addComponent(new Button("Show property value", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + prop.getValue() + "'"); } })); main.addComponent(new Button("Show field value", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + tf1.getValue() + "'"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java index d530c949e8..93d3d05686 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java @@ -56,6 +56,7 @@ public class Ticket1811 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<TextField> i = listOfAllFields.iterator(); i diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java index 8e5f107b17..ce0dbc3ca5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java @@ -47,6 +47,7 @@ public class Ticket1819 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<Select> i = listOfAllFields.iterator(); i diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 912f5ba02d..de91b04c1c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -29,6 +29,7 @@ public class Ticket1834PanelScrolling extends Button b = new Button("update"); currentState.addComponent(b); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { state.setValue("ScrollTop: " + p.getScrollTop() + " ScrollLeft: " + p.getScrollLeft()); @@ -38,6 +39,7 @@ public class Ticket1834PanelScrolling extends b = new Button("ScrollBy 50px"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setScrollLeft(p.getScrollLeft() + 50); p.setScrollTop(p.getScrollTop() + 50); @@ -52,6 +54,7 @@ public class Ticket1834PanelScrolling extends b.addListener(new ClickListener() { int i = 0; + @Override public void buttonClick(ClickEvent event) { p.addComponent(new Label("new Row" + ++i)); } @@ -61,6 +64,7 @@ public class Ticket1834PanelScrolling extends b = new Button("Repaint Panel"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java index 2af5bf9c85..4b546de0f6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java @@ -41,6 +41,7 @@ public class Ticket1857 extends Application.LegacyApplication implements footer.addComponent(actionHandlerEnabler); actionHandlerEnabler.setImmediate(true); actionHandlerEnabler.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (actionHandlerEnabler.getValue().booleanValue()) { t.addActionHandler(Ticket1857.this); @@ -54,9 +55,11 @@ public class Ticket1857 extends Application.LegacyApplication implements footer.addComponent(cellStylesEnabler); cellStylesEnabler.setImmediate(true); cellStylesEnabler.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (cellStylesEnabler.getValue().booleanValue()) { t.setCellStyleGenerator(new Table.CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { Object cell = t.getContainerProperty(itemId, propertyId).getValue(); @@ -99,10 +102,12 @@ public class Ticket1857 extends Application.LegacyApplication implements private final Action removeAction = new Action("Remove"); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { removeAction }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification("Removing row number:" + target); ((Table) sender).removeItem(target); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java index 6072782dc3..0a8992c17f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java @@ -52,6 +52,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToGridButton = new Button("Switch to GridLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToGridButton, gridLayout); } @@ -60,6 +61,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToOrderedButton = new Button("Switch to OrderedLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToOrderedButton, orderedLayout); } @@ -69,6 +71,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToFormsButton = new Button("Switch to Form", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToFormsButton, formLayout); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java index fdbecf8eae..9fe8ccd801 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java @@ -24,6 +24,7 @@ public class Ticket1900 extends Application.LegacyApplication { f[i].setRequired(true); main.addComponent(f[i]); f[i].addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("Validity test", "Testcase " + j + " is " + (f[j].isValid() ? "valid" : "invalid")); @@ -60,6 +61,7 @@ public class Ticket1900 extends Application.LegacyApplication { this.c = c; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || !value.toString().contains(c)) { throw new InvalidValueException("Value does not contain " + c); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java index 68a2eaa2bc..75a2aafb96 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java @@ -48,6 +48,7 @@ public class Ticket1919 extends com.vaadin.Application.LegacyApplication { p.setSizeFull(); Button b = new Button("toggle Values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggleStyleName(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java index c0a1c7d2c9..416bb80875 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java @@ -30,6 +30,7 @@ public class Ticket1921 extends Application.LegacyApplication implements inner = new VerticalLayout(); outer.addComponent(inner); button = new Button("foo", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { newState(); } @@ -92,6 +93,7 @@ public class Ticket1921 extends Application.LegacyApplication implements } } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java index d24cace2c9..48d8ff458c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java @@ -26,6 +26,7 @@ public class Ticket1939 extends Application.LegacyApplication { w.addComponent(new Button("show me the bug", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setWidth(null); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java index aed322ca4d..2a29113829 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java @@ -46,6 +46,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { b = new Button( "change introduction caption (should add * to tab name)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { testContent.setCaption(testContent.getCaption() + "*"); } @@ -54,6 +55,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { b = new Button("change tab caption (should add * to tab name)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { actions.setCaption(actions.getCaption() + "*"); } @@ -64,6 +66,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { final UserError e = new UserError("Test error"); b = new Button("Toggle error", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (testContent.getComponentError() == null) { testContent.setComponentError(e); @@ -75,6 +78,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { actions.addComponent(b); b = new Button("Change table caption", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.setCaption(t.getCaption() + "*"); } @@ -82,6 +86,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { actions.addComponent(b); b = new Button("Toggle Table error", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (t.getComponentError() == null) { t.setComponentError(e); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java index 3c5822fbda..b35baa5300 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java @@ -38,6 +38,7 @@ public class Ticket1970 extends Application.LegacyApplication { w.addComponent(new Button("Show open windows", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String openWindows = ""; for (Iterator<LegacyWindow> i = getWindows().iterator(); i @@ -57,6 +58,7 @@ public class Ticket1970 extends Application.LegacyApplication { final LegacyWindow w = new LegacyWindow(); w.addComponent(new Button("Show the name of the application", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.showNotification("Name of this window = " + w.getName()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java index d4b1345eb1..24d11e6569 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java @@ -30,6 +30,7 @@ public class Ticket1973 extends com.vaadin.Application.LegacyApplication { Button refreshTable = new Button("Change table container"); refreshTable.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent e) { table.setContainerDataSource(container2); table.setContainerDataSource(container1); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java index d43aac9da0..68307f7f99 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java @@ -31,6 +31,7 @@ public class Ticket1973_2 extends Application.LegacyApplication { Button refreshTable = new Button("Change table container"); refreshTable.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent e) { table.setContainerDataSource(container2); table.setContainerDataSource(container1); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java index d908cc567c..e959098765 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java @@ -38,6 +38,7 @@ public class Ticket1975 extends Application.LegacyApplication { layout.addComponent(new Button("Disable/Enable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean e = cl1.isEnabled(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java index 431c3a6b99..fe0b636c56 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java @@ -62,6 +62,7 @@ public class Ticket1982 extends Application.LegacyApplication { min.setVisible(false); max.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { min.setVisible(true); max.setVisible(false); @@ -71,6 +72,7 @@ public class Ticket1982 extends Application.LegacyApplication { } }); min.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { min.setVisible(false); max.setVisible(true); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java index 5bd0cd2ae6..4deb5020ab 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java @@ -83,6 +83,7 @@ public class Ticket1983 extends Application.LegacyApplication { Button button = new Button("Change col value to short"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { // Change the column value to a short one --> Should remove // the scrollbar @@ -117,6 +118,7 @@ public class Ticket1983 extends Application.LegacyApplication { CheckBox checkBox = new CheckBox("Two col"); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { table.setVisibleColumns(new Object[] { propId, propId2 }); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java index 23f377e89e..2aaacef448 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java @@ -40,6 +40,7 @@ public class Ticket1995 extends Application.LegacyApplication { mainWin.addComponent(new Button("Add item", new com.vaadin.ui.Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addItem(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java index 5c4779e69e..061fc0cf16 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java @@ -38,6 +38,7 @@ public class Ticket20 extends Application.LegacyApplication { } } + @Override public void validate(Object value) throws InvalidValueException { if (!isValid(value)) { throw new InvalidValueException(value @@ -49,6 +50,7 @@ public class Ticket20 extends Application.LegacyApplication { v2.addValidator(v); v2.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (!"".equals("" + value)) { throw new InvalidValueException("Value is not empty string"); @@ -69,6 +71,7 @@ public class Ticket20 extends Application.LegacyApplication { mainWin.addComponent(new Button("Validate integer", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { mainWin.showNotification("The field is " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java index a14c881b85..8c7a7ba659 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java @@ -22,6 +22,7 @@ public class Ticket2001 extends Application.LegacyApplication { final CheckBox b = new CheckBox("fixed width: 30px", false); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) b.getValue()) { l.setWidth("30px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java index 6700267a25..e0b8635f32 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java @@ -17,6 +17,7 @@ public class Ticket2007 extends Application.LegacyApplication { setMainWindow(main); main.addComponent(new Button("Open another (non-main) window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { LegacyWindow c = new LegacyWindow( "Non-main browser window " + (++childs)); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java index 7667d6190b..68cf5ef6d4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java @@ -40,6 +40,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { final VerticalLayout events = new VerticalLayout(); t.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { events.addComponent(new Label(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") @@ -62,6 +63,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { .getTestTable(5, 100); table.setRowHeaderMode(Table.ROW_HEADER_MODE_ID); table.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { events2.addComponent(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") @@ -115,6 +117,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { getMainWindow().addWindow(this); done.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().removeWindow(PropertyEditor.this); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java index 538ebc4ccd..8d9a5e67d4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java @@ -33,6 +33,7 @@ public class Ticket2014 extends Application.LegacyApplication { layout.addComponent(new Button("Change class name", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { b1.setStyleName(UUID.randomUUID().toString()); } @@ -51,6 +52,7 @@ public class Ticket2014 extends Application.LegacyApplication { b1 = new Button("Button inside orderedLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("Clicked " + event.getButton().getCaption()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java index cab8fc261c..c36bb5c25e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java @@ -111,6 +111,7 @@ public class Ticket2021 extends Application.LegacyApplication { Button b = new Button("Enable/disable caption and watch button move", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("Enable/disable caption"); for (AbstractComponent l : new AbstractComponent[] { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java index 238561ef47..427a55391b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java @@ -31,6 +31,7 @@ public class Ticket2023 extends com.vaadin.Application.LegacyApplication gl.addComponent(new Button("null", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { c.setWidth(null); c.setHeight(null); @@ -43,6 +44,7 @@ public class Ticket2023 extends com.vaadin.Application.LegacyApplication } + @Override public void buttonClick(ClickEvent event) { c.setWidth(event.getButton().getCaption()); c.setHeight(event.getButton().getCaption()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java index 1eadd3d7bd..8acf4f1d16 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java @@ -81,6 +81,7 @@ public class Ticket2029 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Component c = ((Component) event.getProperty()); c.setCaption("askfdj"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java index 86d9cf6d40..c979898299 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java @@ -25,6 +25,7 @@ public class Ticket2037 extends com.vaadin.Application.LegacyApplication { main.addComponent(lo); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { repopupate(lo); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java index a5c102b988..fa4cd76f47 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java @@ -21,6 +21,7 @@ public class Ticket2038 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { w.showNotification("TextField is " + (tf.isValid() ? "" : "in") + "valid, with error: " + tf.getErrorMessage(), @@ -35,6 +36,7 @@ public class Ticket2038 extends Application.LegacyApplication { w.addComponent(b); b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError((Boolean) b.getValue() ? "Field must not be empty" : null); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java index c4eded63d7..d79f4a1bd6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java @@ -26,6 +26,7 @@ public class Ticket2042 extends Application.LegacyApplication { layout.addComponent(new Label("abc")); layout.addComponent(new Button("B", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification n = new Notification("Test"); getMainWindow().showNotification(n); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java index 84978a42e1..0b5a537b4d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java @@ -71,6 +71,7 @@ public class Ticket2048 extends Application.LegacyApplication { "Replace image with new embedded component (flashes)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Embedded newEmbedded = new Embedded(null, new ThemeResource("icons/64/folder-add.png")); @@ -85,6 +86,7 @@ public class Ticket2048 extends Application.LegacyApplication { b = new Button("Change image source (is fine)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String img = "folder-add"; if (((ThemeResource) embedded.getSource()).getResourceId() diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java index 751dbbae01..fd64d6e35a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java @@ -25,6 +25,7 @@ public class Ticket2053 extends Application.LegacyApplication { + "draw changes not originating from this window. Such changes include changes " + "made by other browser-windows."); Button add = new Button("Add a window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final String name = "Child " + (++childs); LegacyWindow c = new LegacyWindow(name); @@ -35,6 +36,7 @@ public class Ticket2053 extends Application.LegacyApplication { final TextField tf = new TextField("Non immediate textfield"); c.addComponent(tf); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.addComponent(new Label(name + " send text:" + tf.getValue())); @@ -44,6 +46,7 @@ public class Ticket2053 extends Application.LegacyApplication { final String caption = "Slow button " + i; c.addComponent(new Button(caption, new Button.ClickListener() { + @Override public synchronized void buttonClick( ClickEvent event) { try { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java index b47fbc8818..1d7d8bb006 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java @@ -31,6 +31,7 @@ public class Ticket2060 extends Application.LegacyApplication { button2 = new Button("Button without width"); button3 = new Button("Click to repaint buttons", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { button1.requestRepaint(); button2.requestRepaint(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java index 0881d141cb..1f633d7337 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java @@ -95,6 +95,7 @@ public class Ticket2061 extends Application.LegacyApplication { return columns; } + @Override public void valueChange(ValueChangeEvent event) { } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java index 98badf36e8..e3cd09926e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java @@ -148,6 +148,7 @@ public class Ticket2061b extends Application.LegacyApplication implements return columns; } + @Override public void valueChange(ValueChangeEvent event) { } @@ -192,6 +193,7 @@ public class Ticket2061b extends Application.LegacyApplication implements } } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { p.setScrollTop(10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java index a8188a4913..082b956fe0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java @@ -111,6 +111,7 @@ public class Ticket2061c extends Application.LegacyApplication implements return columns; } + @Override public void valueChange(ValueChangeEvent event) { } @@ -140,6 +141,7 @@ public class Ticket2061c extends Application.LegacyApplication implements } } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { p.setScrollTop(10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java index b4171b9bac..2042cf7cad 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java @@ -27,6 +27,7 @@ public class Ticket2090 extends Application.LegacyApplication { w.addComponent(label); w.addComponent(target); height.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { target.setHeight(height.getValue()); @@ -38,6 +39,7 @@ public class Ticket2090 extends Application.LegacyApplication { } }); width.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { target.setWidth(width.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java index 6278f7d4df..0f0c00b05c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java @@ -30,6 +30,7 @@ public class Ticket2099 extends Application.LegacyApplication { private void createUI(GridLayout layout) { Button b = new Button("Show popup", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addWindow(popup); // popup.setVisible(true); @@ -42,6 +43,7 @@ public class Ticket2099 extends Application.LegacyApplication { layout.addComponent(b); layout.addComponent(new Button("Hide label '222'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { l2.setVisible(!l2.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java index b40035a189..11f5ceb0b8 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java @@ -52,6 +52,7 @@ public class Ticket2104 extends Application.LegacyApplication { cb = new CheckBox("icon"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getItemIconPropertyId() == null) { tree.setItemIconPropertyId("icon"); @@ -82,6 +83,7 @@ public class Ticket2104 extends Application.LegacyApplication { "http://www.itmill.com/res/images/itmill_logo.gif")); tree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { getMainWindow().addComponent( new Label(event.toString() + " // " + event.getItemId() @@ -117,6 +119,7 @@ public class Ticket2104 extends Application.LegacyApplication { table.addItem("Item " + i); } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { getMainWindow().addComponent( new Label(event.toString() + " // " + event.getItemId() diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java index 0776f6c4a6..6edc625b39 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java @@ -27,6 +27,7 @@ public class Ticket2106 extends Application.LegacyApplication { setMainWindow(new LegacyWindow("#2106")); getMainWindow().addComponent( new Button("Do nothing", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addComponent( new Label("Last time did nothing: " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java index 57926143eb..09ba9fac0b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java @@ -23,6 +23,7 @@ public class Ticket2107 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { w.showNotification("TextField is " + (tf.isValid() ? "" : "in") + "valid, with error: " + tf.getErrorMessage(), @@ -31,6 +32,7 @@ public class Ticket2107 extends Application.LegacyApplication { }); tf.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (value == null || value.toString().length() <= 3) { throw new InvalidValueException( @@ -46,6 +48,7 @@ public class Ticket2107 extends Application.LegacyApplication { w.addComponent(b); b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError(b.getValue() ? "Field must not be empty" : null); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java index 933494f78a..6a299d8599 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java @@ -39,6 +39,7 @@ public class Ticket2117 extends Application.LegacyApplication { w.addComponent(new Label("It has also been redirected to " + w.getURL() + " to support reloading")); w.addComponent(new Button("button", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.showNotification("Button clicked"); w.addComponent(new Label("clicked")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java index 34054e09d1..3820550f02 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java @@ -74,6 +74,7 @@ public class Ticket2119 extends Application.LegacyApplication { layout.addComponent(select); globalValue.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(Property.ValueChangeEvent event) { Object value = event.getProperty().getValue(); valueProperty.setValue((null != value) ? value.toString() @@ -83,6 +84,7 @@ public class Ticket2119 extends Application.LegacyApplication { final Button changeValueButton = new Button("Change Value to 2"); changeValueButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { globalValue.setValue("2"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java index cc81c787b2..b12a865e80 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java @@ -34,12 +34,14 @@ public class Ticket2125 extends Application.LegacyApplication { table.addContainerProperty("String", String.class, "a string"); table.addContainerProperty("Boolean", Boolean.class, Boolean.TRUE); table.addGeneratedColumn("Generated", new ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Label("Item " + itemId); } }); table.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (new Integer(4).equals(itemId)) { if (propertyId == null) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java index abcca6d59c..c9e070bef4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java @@ -46,6 +46,7 @@ public class Ticket2126 extends com.vaadin.Application.LegacyApplication { refreshTable.addListener(new Button.ClickListener() { boolean full = true; + @Override public void buttonClick(Button.ClickEvent e) { if (full) { table.setContainerDataSource(container2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java index ba4dd2ee46..31e1a9a0d6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java @@ -25,6 +25,7 @@ public class Ticket2179 extends Application.LegacyApplication { f.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("Test field is " + (f.isValid() ? "valid" : "invalid")); @@ -40,6 +41,7 @@ public class Ticket2179 extends Application.LegacyApplication { this.c = c; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || !value.toString().contains(c)) { throw new InvalidValueException("Value does not contain " + c); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java index c3219102f6..44893eb531 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java @@ -70,6 +70,7 @@ public class Ticket2181 extends Application.LegacyApplication implements return options; } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == setButton) { set(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java index eef13ca06c..4caba62df2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java @@ -71,6 +71,7 @@ public class Ticket2204 extends Application.LegacyApplication { Button b = new Button("Show area", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { showHide(); } @@ -80,6 +81,7 @@ public class Ticket2204 extends Application.LegacyApplication { b = new Button("Show tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { showTab(); } @@ -128,6 +130,7 @@ public class Ticket2204 extends Application.LegacyApplication { Form f = (Form) cc; f.setFormFieldFactory(new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { formTextArea = new RichTextArea(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java index ada9471f18..3f0f35bb84 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java @@ -25,6 +25,7 @@ public class Ticket2208 extends Application.LegacyApplication { t.setHeight("150px"); t.addGeneratedColumn("col 3 (green)", new ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -38,6 +39,7 @@ public class Ticket2208 extends Application.LegacyApplication { t.addContainerProperty("col 4", String.class, ""); t.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if ("col 1 (red)".equals(propertyId)) { return "red"; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java index 5ba69895b6..a387781ae3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java @@ -31,6 +31,7 @@ public class Ticket2209 extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java index 4a45709ef6..226df8b5e7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java @@ -38,6 +38,7 @@ public class Ticket2209OL extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java index e2e51d8101..921f3b190b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java @@ -44,6 +44,7 @@ public class Ticket2209OL2 extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java index 2b7d5ef6d1..886aa376c3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java @@ -46,6 +46,7 @@ public class Ticket2221 extends Application.LegacyApplication { Button b = new Button("Switch textfield/panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Component visible = tf; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java index 15b2b630a5..4b44ed1a87 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java @@ -33,6 +33,7 @@ public class Ticket2242 extends Application.LegacyApplication implements Button b = new Button("Change container datasource", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < 5; i++) { t.setContainerDataSource(createContainer()); @@ -71,6 +72,7 @@ public class Ticket2242 extends Application.LegacyApplication implements return ic; } + @Override public void valueChange(ValueChangeEvent event) { System.out.println("Value change from " + tableValue + " to " + t.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java index 8540960b30..a360760039 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java @@ -33,6 +33,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>(new MyBean())); @@ -42,6 +43,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new bigger item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>( new MyBiggerBean())); @@ -52,6 +54,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new grid layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setLayout(new GridLayout()); @@ -61,6 +64,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new form layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setLayout(new FormLayout()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java index cf1d2f64d2..b5d6772e7f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java @@ -21,6 +21,7 @@ public class Ticket2267 extends Application.LegacyApplication { Button button = new Button("1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); l.setValue(l.getValue() + b.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java index 67fe3f9846..c72b4e15ff 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java @@ -38,6 +38,7 @@ public class Ticket2282 extends Application.LegacyApplication { Button b = new Button("Swap", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (layout1.getWidth() < 0.0) { layout1.setWidth("500px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java index 4cd421e30d..0ad023450c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java @@ -25,6 +25,7 @@ public class Ticket2289 extends Application.LegacyApplication { w.setContent(ol); Button b = new Button("close current tab"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -34,6 +35,7 @@ public class Ticket2289 extends Application.LegacyApplication { b = new Button("close first tab"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java index a413e87110..35e9b8f2c5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java @@ -47,6 +47,7 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication addRequestHandler(this); } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java index 36bda7095c..1cad5bde4f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java @@ -34,6 +34,7 @@ public class Ticket2310 extends Application.LegacyApplication { b.addListener(new Button.ClickListener() { int i = 0; + @Override public void buttonClick(ClickEvent event) { l.setValue("foobar " + i++); @@ -43,6 +44,7 @@ public class Ticket2310 extends Application.LegacyApplication { Button b2 = new Button("toggle panel visibility"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setVisible(!p.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java index f1906d1492..f583a4af4b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java @@ -34,6 +34,7 @@ public class Ticket2329 extends Application.LegacyApplication { } class TestColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object rowId, Object columnId) { return new Button("1"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java index f71492a96b..f0cae1a59f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java @@ -17,6 +17,7 @@ public class Ticket2337 extends Application.LegacyApplication { setMainWindow(w); Button b = new Button("add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gl.addComponent(new Label("asd"), 0, gl.getCursorY(), 2, gl.getCursorY()); @@ -28,6 +29,7 @@ public class Ticket2337 extends Application.LegacyApplication { b = new Button("empty", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gl.removeAllComponents(); ; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java index 207d6ee413..5528dfebd6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java @@ -25,6 +25,7 @@ public class Ticket2347 extends Application.LegacyApplication { b1 = new Button("200px button"); b1.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (b1.getWidth() == 200.0) { b1.setWidth("300px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java index 19d473f970..252406cc2d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java @@ -25,6 +25,7 @@ public class Ticket2365 extends Application.LegacyApplication { Button b = new Button("Toggle parent level size"); lo.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (p.getWidth() > 0) { p.setSizeUndefined(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java index a121d93099..0036bdc7b2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java @@ -33,6 +33,7 @@ public class Ticket2406 extends Application.LegacyApplication { b.setSizeFull(); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.setHeight("200px"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java index 0514e9bb39..509f4cf437 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java @@ -19,6 +19,7 @@ public class Ticket2415 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("New value = " + tf); } @@ -30,6 +31,7 @@ public class Ticket2415 extends Application.LegacyApplication { tf2.setImmediate(true); tf2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("New value = " + tf2); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java index b751488bae..f6e6c1e7b5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java @@ -30,10 +30,12 @@ public class Ticket2431 extends Application.LegacyApplication { Action[] actions = new Action[] { a1, a2 }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == a1) { getMainWindow().addComponent(new Label("CTRL X hit")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java index fc6445d62f..f48cf7a79a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java @@ -15,16 +15,19 @@ public class Ticket2436 extends Application.LegacyApplication { final Button remover = new Button("Remove PopupView"); final PopupView pv = new PopupView(new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return "PopupView"; } + @Override public Component getPopupComponent() { return remover; } }); remover.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { main.removeComponent(pv); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java index 8123fe1182..97d096405e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java @@ -14,6 +14,7 @@ public class Ticket2526 extends Application.LegacyApplication { setMainWindow(main); Button b = new Button("Add windows"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.addWindow(new Window()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java index a3ff6808dc..ee60c0ce7e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java @@ -174,6 +174,7 @@ public class Ticket2998 extends Application.LegacyApplication { if (propertyId.equals("kilometers")) { f.setWidth("4em"); f.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { // FIXME this does not follow the standard pattern diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java index 924b1318ab..b6e01d912f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java @@ -36,6 +36,7 @@ public class Ticket3146 extends Application.LegacyApplication { Button clearButton = new Button("Clear selection", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection(); } @@ -43,6 +44,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton); Button clearButton2 = new Button("Clear selection 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection2(); } @@ -50,6 +52,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton2); Button clearButton3 = new Button("Clear selection 3", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection3(); } @@ -57,6 +60,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton3); Button printButton = new Button("Print selection", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printSelection(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java index f6fbe05e38..e3b90c94b0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java @@ -34,6 +34,7 @@ public class Ticket34 extends Application.LegacyApplication { mainWin.getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent event) { getMainWindow().showNotification( "Fragment now: " + event.getFragment()); @@ -90,6 +91,7 @@ public class Ticket34 extends Application.LegacyApplication { p.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String viewName = tf.getValue().toString(); // fragmentChangedListener will change the view if possible diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java index c68dc9d534..fef7061516 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java @@ -32,6 +32,7 @@ public class Ticket6002 extends TestBase { "Changing this field modifies only the textfield", property1); tf1.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // This value change event is called twice if the new // input value is an integer. The second time is during @@ -57,6 +58,7 @@ public class Ticket6002 extends TestBase { property2); tf2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // This value change event is called twice if the new // input value is an integer. The second time is during diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java index 473ec79342..8d6df0142e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java @@ -51,28 +51,33 @@ public class Ticket677 extends Application.LegacyApplication { l.addComponent(new Button("Toggle root panel", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(root); } })); l.addComponent(new Button("Toggle panel one", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(one); } })); l.addComponent(new Button("Toggle panel two", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(two); } })); l.addComponent(new Button("Toggle form", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(form); } })); l.addComponent(new Button("Toggle table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(table); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java index 11d643cd52..c62cee038c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java @@ -20,6 +20,7 @@ public class Ticket695 extends Application.LegacyApplication { w.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); try { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java index 091e0c97af..d871c8adc4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java @@ -42,12 +42,14 @@ public class Ticket736 extends Application.LegacyApplication { f.setBuffered(true); Button commit = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.commit(); } }); Button discard = new Button("Discard", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.discard(); } @@ -90,6 +92,7 @@ public class Ticket736 extends Application.LegacyApplication { mainWin.addComponent(new Button("Show state of the address object", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.showNotification(address.toString()); } @@ -164,6 +167,7 @@ public class Ticket736 extends Application.LegacyApplication { /** Simple state validator */ static class IsValidState implements Validator { + @Override public void validate(Object value) throws InvalidValueException { // Empty and null are accepted values if (value == null || "".equals("" + value)) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java index 714b3c21ca..413d823d2d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java @@ -35,6 +35,7 @@ public class Ticket846 extends Application.LegacyApplication { mainWin.addComponent(new Button("Validate integer", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { mainWin.showNotification("The field is " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java index bf6f6d1879..f72ff8beec 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java @@ -27,6 +27,7 @@ public class Ticket932 extends Application.LegacyApplication { Button b = new Button("Check value"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setValue("Length: " + tx.getValue().toString().length() + " Content: " + tx.getValue()); @@ -46,6 +47,7 @@ public class Ticket932 extends Application.LegacyApplication { Button b2 = new Button("Check value"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setValue("Length: " + tx2.getValue().toString().length() + " Content: " + tx2.getValue()); diff --git a/tests/testbench/com/vaadin/tests/util/TestClickListener.java b/tests/testbench/com/vaadin/tests/util/TestClickListener.java index 95b9cf2d40..b9f6d66b3e 100644 --- a/tests/testbench/com/vaadin/tests/util/TestClickListener.java +++ b/tests/testbench/com/vaadin/tests/util/TestClickListener.java @@ -29,6 +29,7 @@ public class TestClickListener implements Button.ClickListener { System.out.println("Created listener " + name + ", id=" + count); } + @Override public void buttonClick(ClickEvent event) { System.out .println("ClickEvent from listener " + name + ", id=" + count); diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java index 8fb0c3585d..d6627a7d94 100644 --- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java +++ b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java @@ -58,6 +58,7 @@ public class EmptyFieldErrorIndicators extends TestBase { Button validate = new Button("Validate fields"); validate.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.validate(); @@ -96,6 +97,7 @@ public class EmptyFieldErrorIndicators extends TestBase { form.getLayout().addComponent(setDateButton); // form.addField("Set Date", setDateButton); setDateButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.getField("Date").setValue(new Date(0)); } diff --git a/tests/testbench/com/vaadin/tests/validation/TestValidators.java b/tests/testbench/com/vaadin/tests/validation/TestValidators.java index a530dee852..746a460da8 100644 --- a/tests/testbench/com/vaadin/tests/validation/TestValidators.java +++ b/tests/testbench/com/vaadin/tests/validation/TestValidators.java @@ -137,6 +137,7 @@ public class TestValidators extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java index 51c4f5ecc8..dd1732023b 100644 --- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java +++ b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java @@ -27,6 +27,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { requiredInput = new CheckBox("Field required"); requiredInput.setImmediate(true); requiredInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequired((Boolean) requiredInput.getValue()); } @@ -35,6 +36,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { requiredErrorInput = new TextField("Required error message"); requiredErrorInput.setImmediate(true); requiredErrorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError((String) requiredErrorInput.getValue()); } @@ -44,6 +46,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { integerValidatorInput.setImmediate(true); integerValidatorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) integerValidatorInput.getValue()) { tf.addValidator(integerValidator); @@ -57,6 +60,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { stringLengthValidatorInput.setImmediate(true); stringLengthValidatorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) stringLengthValidatorInput.getValue()) { tf.addValidator(stringLengthValidator); diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 72bfbe285a..79125e46c5 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -29,6 +29,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { public SerializerTestConnector() { registerRpc(SerializerTestRpc.class, new SerializerTestRpc() { + @Override public void sendWrappedGenerics( Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics) { Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> updated = new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>(); @@ -49,12 +50,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.sendWrappedGenerics(updated); } + @Override public void sendString(String value) { char[] chars = value.toCharArray(); Arrays.sort(chars); rpc.sendString(new String(chars)); } + @Override public void sendSet(Set<Integer> intSet, Set<Connector> connectorSet, Set<SimpleTestBean> beanSet) { @@ -68,6 +71,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Collections.singleton(getRootConnector()), beanSet); } + @Override public void sendNestedArray(int[][] nestedIntArray, SimpleTestBean[][] nestedBeanArray) { rpc.sendNestedArray(new int[][] { { nestedIntArray[1][0], @@ -75,6 +79,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { { nestedBeanArray[0][1] }, { nestedBeanArray[0][0] } }); } + @Override public void sendMap(Map<String, SimpleTestBean> stringMap, Map<Connector, Boolean> connectorMap, Map<Integer, Connector> intMap, @@ -93,11 +98,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector { getThisConnector()), updatedBeanMap); } + @Override public void sendLong(long value, Long boxedValue, long[] array) { rpc.sendLong(array[0], Long.valueOf(value), new long[] { array[1], boxedValue.longValue() }); } + @Override public void sendList(List<Integer> intList, List<Connector> connectorList, List<SimpleTestBean> beanList) { Collections.sort(intList); @@ -107,17 +114,20 @@ public class SerializerTestConnector extends AbstractExtensionConnector { beanList); } + @Override public void sendInt(int value, Integer boxedValue, int[] array) { rpc.sendInt(array.length, Integer.valueOf(array[0]), new int[] { value, boxedValue.intValue() }); } + @Override public void sendFloat(float value, Float boxedValue, float[] array) { Arrays.sort(array); rpc.sendFloat(boxedValue.floatValue(), Float.valueOf(value), array); } + @Override public void sendDouble(double value, Double boxedValue, double[] array) { rpc.sendDouble(value + boxedValue.doubleValue(), @@ -125,16 +135,19 @@ public class SerializerTestConnector extends AbstractExtensionConnector { new double[] { array.length, array[0], array[1] }); } + @Override public void sendConnector(Connector connector) { rpc.sendConnector(getThisConnector()); } + @Override public void sendChar(char value, Character boxedValue, char[] array) { rpc.sendChar(Character.toUpperCase(boxedValue.charValue()), Character.valueOf(value), new String(array) .toLowerCase().toCharArray()); } + @Override public void sendByte(byte value, Byte boxedValue, byte[] array) { // There will most certainly be a bug that is not discovered // because this particular method doesn't do anything with it's @@ -142,6 +155,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.sendByte(value, boxedValue, array); } + @Override public void sendBoolean(boolean value, Boolean boxedValue, boolean[] array) { boolean[] inverseArray = new boolean[array.length]; @@ -152,6 +166,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Boolean.valueOf(!value), inverseArray); } + @Override public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, SimpleTestBean[] array) { SimpleTestBean updatedSimpleBean = new SimpleTestBean(); @@ -174,6 +189,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { arrayList.toArray(new SimpleTestBean[array.length])); } + @Override public void sendArrayList(List<int[]> primitiveArrayList, List<Integer[]> objectArrayList, List<SimpleTestBean[]> beanArrayList) { @@ -191,10 +207,12 @@ public class SerializerTestConnector extends AbstractExtensionConnector { updatedObjectArrayList, beanArrayList); } + @Override public void sendNull(String value1, String value2) { rpc.sendNull(value2, value1); } + @Override public void sendListArray(List<Integer>[] objectListArray, List<SimpleTestBean>[] beanListArray) { rpc.sendListArray(new List[] { objectListArray[1], diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java index d2066c53c8..d199122447 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -24,6 +24,7 @@ public class HelloWorldExtensionConnector extends AbstractExtensionConnector { @Override protected void init() { registerRpc(GreetAgainRpc.class, new GreetAgainRpc() { + @Override public void greetAgain() { greet(); } diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java index 2a131c07c8..f140dad172 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java @@ -19,6 +19,7 @@ public class MyComponentConnector extends AbstractComponentConnector { public MyComponentConnector() { getWidget().addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { final MouseEventDetails mouseDetails = MouseEventDetailsBuilder @@ -29,6 +30,7 @@ public class MyComponentConnector extends AbstractComponentConnector { } }); registerRpc(MyComponentClientRpc.class, new MyComponentClientRpc() { + @Override public void alert(String message) { Window.alert(message); } diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java index 012060f437..00b6a98896 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java @@ -30,6 +30,7 @@ public class WidgetContainerConnector extends return GWT.create(VWidgetContainer.class); } + @Override public void updateCaption(ComponentConnector connector) { } }
\ No newline at end of file |