Merge branch '6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
	src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
	src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
	tests/server-side/com/vaadin/tests/VaadinClasses.java

Removed Java5-incompatible @Override annotations

2 files changed, 32 insertions, 36 deletions

diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
index a2a76ec6cf..5fdb982b9e 100644
--- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java
+++ b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
@@ -112,17 +112,14 @@ 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/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 66f5737683..e9b5b4fea3 100644
--- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -129,7 +129,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);
@@ -185,7 +185,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;
@@ -226,7 +226,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * @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) {
@@ -240,7 +240,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * @see com.vaadin.data.Container#getContainerPropertyIds()
      */
-    @Override
+
     public Collection<?> getContainerPropertyIds() {
         return Collections.unmodifiableCollection(propertyIds);
     }
@@ -250,7 +250,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);
@@ -297,7 +297,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * {@inheritDoc}
      */
-    @Override
+
     public Collection<?> getItemIds() {
         updateCount();
         ArrayList<RowId> ids = new ArrayList<RowId>();
@@ -354,7 +354,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;
@@ -367,7 +367,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * @see com.vaadin.data.Container#size()
      */
-    @Override
+
     public int size() {
         updateCount();
         return size + sizeOfAddedItems() - removedItems.size();
@@ -378,7 +378,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)) {
@@ -446,7 +446,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. */
@@ -507,7 +507,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * {@inheritDoc}
      */
-    @Override
+
     public void addContainerFilter(Filter filter)
             throws UnsupportedFilterException {
         // filter.setCaseSensitive(!ignoreCase);
@@ -519,7 +519,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * {@inheritDoc}
      */
-    @Override
+
     public void removeContainerFilter(Filter filter) {
         filters.remove(filter);
     }
@@ -559,7 +559,7 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * {@inheritDoc}
      */
-    @Override
+
     public void removeAllContainerFilters() {
         filters.clear();
         refresh();
@@ -574,7 +574,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++) {
@@ -621,7 +621,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;
@@ -648,7 +648,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);
     }
@@ -658,7 +658,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);
     }
@@ -668,7 +668,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
-    @Override
+
     public Object firstItemId() {
         updateCount();
         if (size == 0) {
@@ -696,7 +696,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;
@@ -722,7 +722,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);
     }
@@ -732,7 +732,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);
     }
@@ -747,7 +747,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      * boolean[])
      */
-    @Override
+
     public void sort(Object[] propertyId, boolean[] ascending) {
         sorters.clear();
         if (propertyId == null || propertyId.length == 0) {
@@ -776,7 +776,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
-    @Override
+
     public Collection<?> getSortableContainerPropertyIds() {
         return getContainerPropertyIds();
     }
@@ -1350,7 +1350,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * @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();
@@ -1361,7 +1361,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();
@@ -1372,7 +1372,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();
     }
@@ -1383,7 +1383,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
-    @Override
+
     public Item addItemAfter(Object previousItemId, Object newItemId)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
@@ -1394,7 +1394,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();
@@ -1405,7 +1405,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();
     }
@@ -1415,7 +1415,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();
@@ -1432,7 +1432,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin
      * .data.Container.ItemSetChangeListener)
      */
-    @Override
+
     public void addListener(Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners == null) {
             itemSetChangeListeners = new LinkedList<Container.ItemSetChangeListener>();
@@ -1447,7 +1447,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin
      * .data.Container.ItemSetChangeListener)
      */
-    @Override
+
     public void removeListener(Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners != null) {
             itemSetChangeListeners.remove(listener);
@@ -1477,7 +1477,6 @@ public class SQLContainer implements Container, Container.Filterable,
             super(source);
         }
 
-        @Override
         public Container getContainer() {
             return (Container) getSource();
         }