1 files changed, 13 insertions, 10 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 68fb87a986..0e8d1c0152 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;
@@ -28,9 +29,6 @@ import com.vaadin.ui.Component;
 
 public class DragAndDropService implements VariableOwner, ClientConnector {
 
-    private static final Logger logger = Logger
-            .getLogger(DragAndDropService.class.getName());
-
     private int lastVisitId;
 
     private boolean lastVisitAccepted = false;
@@ -50,8 +48,9 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
         // Validate drop handler owner
         if (!(owner instanceof DropTarget)) {
-            logger.severe("DropHandler owner " + owner
-                    + " must implement DropTarget");
+            getLogger()
+                    .severe("DropHandler owner " + owner
+                            + " must implement DropTarget");
             return;
         }
         // owner cannot be null here
@@ -81,8 +80,9 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
         DropHandler dropHandler = (dropTarget).getDropHandler();
         if (dropHandler == null) {
             // No dropHandler returned so no drop can be performed.
-            logger.fine("DropTarget.getDropHandler() returned null for owner: "
-                    + dropTarget);
+            getLogger().fine(
+                    "DropTarget.getDropHandler() returned null for owner: "
+                            + dropTarget);
             return;
         }
 
@@ -275,13 +275,16 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
     }
 
-    public Iterator<Extension> getExtensionIterator() {
+    public Collection<Extension> getExtensions() {
         // TODO Auto-generated method stub
-        return null;
+        return Collections.emptySet();
     }
 
     public void removeExtension(Extension extension) {
         // TODO Auto-generated method stub
+    }
 
+    private Logger getLogger() {
+        return Logger.getLogger(DragAndDropService.class.getName());
     }
 }