merge master

1 files changed, 35 insertions, 0 deletions

diff --git a/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
new file mode 100644
index 0000000000..19c2e5f273
--- /dev/null
+++ b/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
@@ -0,0 +1,35 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.shared.ui.dd;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
+
+/**
+ * An annotation type used to point the server side counterpart for client side
+ * a {@link VAcceptCriterion} class.
+ * <p>
+ * Annotations are used at GWT compilation phase, so remember to rebuild your
+ * widgetset if you do changes for {@link AcceptCriterion} mappings.
+ * 
+ * Prior to Vaadin 7, the mapping was done with an annotation on server side
+ * classes.
+ * 
+ * @since 7.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface AcceptCriterion {
+    /**
+     * @return the class of the server side counterpart for the annotated
+     *         criterion
+     */
+    Class<?> value();
+
+}