Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/vaadin/terminal/gwt/server/DragAndDropService.java

2 files changed, 6 insertions, 5 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/src/com/vaadin/terminal/gwt/server/ClientConnector.java
index 359e112738..860627a352 100644
--- a/src/com/vaadin/terminal/gwt/server/ClientConnector.java
+++ b/src/com/vaadin/terminal/gwt/server/ClientConnector.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.List;
 
 import com.vaadin.terminal.AbstractClientConnector;
@@ -137,7 +137,7 @@ public interface ClientConnector extends Connector, RpcTarget {
      */
     public void detach();
 
-    public Iterator<Extension> getExtensionIterator();
+    public Collection<Extension> getExtensions();
 
     public void removeExtension(Extension extension);
 }
diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 101e7f0cb3..d04ecb8380 100644
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -4,7 +4,8 @@
 package com.vaadin.terminal.gwt.server;
 
 import java.io.PrintWriter;
-import java.util.Iterator;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -290,9 +291,9 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
     }
 
     @Override
-    public Iterator<Extension> getExtensionIterator() {
+    public Collection<Extension> getExtensions() {
         // TODO Auto-generated method stub
-        return null;
+        return Collections.emptySet();
     }
 
     @Override