1 files changed, 15 insertions, 14 deletions

diff --git a/src/com/vaadin/event/dd/acceptCriteria/Or.java b/src/com/vaadin/event/dd/acceptCriteria/Or.java
index 6537f86b30..59f4de90f2 100644
--- a/src/com/vaadin/event/dd/acceptCriteria/Or.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/Or.java
@@ -7,31 +7,32 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 
-public class Or implements AcceptCriterion {
+/**
+ * TODO consider replacing this with intersection
+ * 
+ */
+public class Or extends ClientSideCriterion {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
     private AcceptCriterion f1;
     private AcceptCriterion f2;
 
-    Or(AcceptCriterion f1, AcceptCriterion f2) {
+    public Or(ClientSideCriterion f1, ClientSideCriterion f2) {
         this.f1 = f1;
         this.f2 = f2;
     }
 
-    public boolean isClientSideVerifiable() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void paint(PaintTarget target) throws PaintException {
-        // TODO Auto-generated method stub
-
+    @Override
+    public void paintContent(PaintTarget target) throws PaintException {
+        super.paintContent(target);
+        f1.paint(target);
+        f2.paint(target);
     }
 
     public boolean accepts(DragAndDropEvent dragEvent) {
         return f1.accepts(dragEvent) || f2.accepts(dragEvent);
     }
 
-    public void paintResponse(PaintTarget target) throws PaintException {
-        // TODO Auto-generated method stub
-
-    }
 }
\ No newline at end of file