fixed name and javadocs for gwt generator used to build criteria map

svn changeset:12081/svn branch:6.3

3 files changed, 12 insertions, 27 deletions

diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index fde9d0d024..d8c77e0d6d 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -33,7 +33,7 @@
 		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap"/>
 	</generate-with>
 	
-	<generate-with class="com.vaadin.terminal.gwt.widgetsetutils.AcceptCriterionGenerator">
+	<generate-with class="com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator">
 		<when-type-is class="com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory"/>
 	</generate-with>
 	
diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
index 5d3ddc3e5b..4f6ef67b9e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
@@ -3,29 +3,13 @@
  */
 package com.vaadin.terminal.gwt.client.ui.dd;
 
+import com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator;
+
+/**
+ * Generated by {@link AcceptCriteriaFactoryGenerator}
+ * 
+ */
 public abstract class VAcceptCriterionFactory {
 
     public abstract VAcceptCriterion get(String name);
-    // name = name.intern();
-    // // FIXME make all lazy inited and possibility to use instances per
-    // // handler
-    // // TODO maybe just ditch singleton idea and use new instances on each
-    // // fetch for all types of components.
-    // if (name.equals("-ss")) {
-    // return GWT.create(ServerAccept.class);
-    // } else if (name.equals("com.vaadin.ui.Tree.TreeDropCriterion")) {
-    // return GWT.create(LazyInitItemIdentifiers.class);
-    // } else if (name == "needsItemId") {
-    // return GWT.create(HasItemId.class);
-    // } else if (name == "acceptAll") {
-    // return GWT.create(AcceptAll.class);
-    // } else if (name == "and") {
-    // return GWT.create(And.class);
-    // } else if (name == "overTreeNode") {
-    // return GWT.create(OverTreeNode.class);
-    // } else if (name == "component") {
-    // return GWT.create(ComponentCriteria.class);
-    // }
-    // return null;
-    // }
 }
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index 08712a61f5..02faefa3f4 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java
@@ -19,14 +19,15 @@ import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptcriteria.ClientCriterion;
 import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
-import com.vaadin.ui.ClientWidget;
+import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory;
 
 /**
- * GWT generator to build WidgetMapImpl dynamically based on
- * {@link ClientWidget} annotations available in workspace.
+ * GWT generator to build {@link VAcceptCriterionFactory} implementation
+ * dynamically based on {@link ClientCriterion} annotations available in
+ * classpath.
  * 
  */
-public class AcceptCriterionGenerator extends Generator {
+public class AcceptCriteriaFactoryGenerator extends Generator {
 
     private String packageName;
     private String className;