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

1 files changed, 0 insertions, 17 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index d04ecb8380..0e8d1c0152 100644
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -43,7 +43,6 @@ 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,12 +181,10 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
         return transferable;
     }
 
-    @Override
     public boolean isEnabled() {
         return isConnectorEnabled();
     }
 
-    @Override
     public boolean isImmediate() {
         return true;
     }
@@ -221,82 +218,68 @@ 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
     }