From fd7311e75a64064036e6f56d02b2e5ededa5b10d Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 17 Mar 2010 16:16:03 +0000
Subject: [PATCH] javadocs

svn changeset:11940/svn branch:6.3
---
 src/com/vaadin/event/dd/acceptCriteria/And.java |  8 +++++---
 src/com/vaadin/event/dd/acceptCriteria/Or.java  | 12 ++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/com/vaadin/event/dd/acceptCriteria/And.java b/src/com/vaadin/event/dd/acceptCriteria/And.java
index e3cfa216d3..52bf2f7c1d 100644
--- a/src/com/vaadin/event/dd/acceptCriteria/And.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/And.java
@@ -11,8 +11,10 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 
 /**
- * Criterion type that joins two or more {@link ClientSideCriterion} together
- * and validates that all sub criterion validates.
+ * A compound criterion that accepts the drag if all of its criteria accepts the
+ * drag.
+ * 
+ * @see Or
  * 
  * @since 6.3
  * 
@@ -25,7 +27,7 @@ public class And extends ClientSideCriterion {
     /**
      * 
      * @param f1
-     *            ClientSideCriterion that must match
+     *            criteria of which the And criterion will be composed
      */
     public And(ClientSideCriterion... f1) {
         this.f1 = f1;
diff --git a/src/com/vaadin/event/dd/acceptCriteria/Or.java b/src/com/vaadin/event/dd/acceptCriteria/Or.java
index 26cb90b18e..35eee06b4c 100644
--- a/src/com/vaadin/event/dd/acceptCriteria/Or.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/Or.java
@@ -12,19 +12,23 @@ import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.gwt.client.ui.dd.VOr;
 
 /**
- * A compound criterion that returns true if any of criteria returns true.
+ * A compound criterion that accepts the drag if any of its criterion accepts
+ * it.
+ * 
+ * @see And
  * 
  * @since 6.3
  * 
  */
 @ClientCriterion(VOr.class)
 public class Or extends ClientSideCriterion {
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1L;
     private AcceptCriterion criteria[];
 
+    /**
+     * @param criteria
+     *            the criteria of which the Or criteria will be composed
+     */
     public Or(ClientSideCriterion... criteria) {
         this.criteria = criteria;
     }
-- 
2.39.5