]> source.dussan.org Git - vaadin-framework.git/commitdiff
fixed name and javadocs for gwt generator used to build criteria map
authorMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 24 Mar 2010 17:44:05 +0000 (17:44 +0000)
committerMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 24 Mar 2010 17:44:05 +0000 (17:44 +0000)
svn changeset:12081/svn branch:6.3

src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java [new file with mode: 0644]
src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java [deleted file]

index fde9d0d0242d9952f5dfd40328cd0a0e71c3f426..d8c77e0d6d0daf5a5720b5e656e1accb5972aa55 100644 (file)
@@ -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>
        
index 5d3ddc3e5b0d706a49ae4a98b08392a52128be2a..4f6ef67b9e64eea2b6d4646b55cd56f7911911fc 100644 (file)
@@ -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/AcceptCriteriaFactoryGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java
new file mode 100644 (file)
index 0000000..02faefa
--- /dev/null
@@ -0,0 +1,127 @@
+/*
+@ITMillApache2LicenseForJavaFiles@
+ */
+package com.vaadin.terminal.gwt.widgetsetutils;
+
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Date;
+
+import com.google.gwt.core.ext.Generator;
+import com.google.gwt.core.ext.GeneratorContext;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.TreeLogger.Type;
+import com.google.gwt.core.ext.typeinfo.JClassType;
+import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
+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.terminal.gwt.client.ui.dd.VAcceptCriterionFactory;
+
+/**
+ * GWT generator to build {@link VAcceptCriterionFactory} implementation
+ * dynamically based on {@link ClientCriterion} annotations available in
+ * classpath.
+ * 
+ */
+public class AcceptCriteriaFactoryGenerator extends Generator {
+
+    private String packageName;
+    private String className;
+
+    @Override
+    public String generate(TreeLogger logger, GeneratorContext context,
+            String typeName) throws UnableToCompleteException {
+
+        try {
+            TypeOracle typeOracle = context.getTypeOracle();
+
+            // get classType and save instance variables
+            JClassType classType = typeOracle.getType(typeName);
+            packageName = classType.getPackage().getName();
+            className = classType.getSimpleSourceName() + "Impl";
+            // Generate class source code
+            generateClass(logger, context);
+        } catch (Exception e) {
+            logger.log(TreeLogger.ERROR,
+                    "Accept criterion factory creation failed", e);
+        }
+        // return the fully qualifed name of the class generated
+        return packageName + "." + className;
+    }
+
+    /**
+     * Generate source code for WidgetMapImpl
+     * 
+     * @param logger
+     *            Logger object
+     * @param context
+     *            Generator context
+     */
+    private void generateClass(TreeLogger logger, GeneratorContext context) {
+        // get print writer that receives the source code
+        PrintWriter printWriter = null;
+        printWriter = context.tryCreate(logger, packageName, className);
+        // print writer if null, source code has ALREADY been generated,
+        // return (WidgetMap is equal to all permutations atm)
+        if (printWriter == null) {
+            return;
+        }
+        logger.log(Type.INFO, "Detecting available criteria ...");
+        Date date = new Date();
+
+        // init composer, set class properties, create source writer
+        ClassSourceFileComposerFactory composer = null;
+        composer = new ClassSourceFileComposerFactory(packageName, className);
+        composer.addImport("com.google.gwt.core.client.GWT");
+        composer
+                .setSuperclass("com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory");
+        SourceWriter sourceWriter = composer.createSourceWriter(context,
+                printWriter);
+
+        // generator constructor source code
+        generateInstantiatorMethod(sourceWriter, context, logger);
+        // close generated class
+        sourceWriter.outdent();
+        sourceWriter.println("}");
+        // commit generated class
+        context.commit(logger, printWriter);
+        logger.log(Type.INFO, "Done. ("
+                + (new Date().getTime() - date.getTime()) / 1000 + "seconds)");
+
+    }
+
+    private void generateInstantiatorMethod(SourceWriter sourceWriter,
+            GeneratorContext context, TreeLogger logger) {
+
+        sourceWriter.println("public VAcceptCriterion get(String name) {");
+        sourceWriter.indent();
+
+        sourceWriter.println("name = name.intern();");
+
+        Collection<Class<? extends AcceptCriterion>> clientSideVerifiableCriterion = ClassPathExplorer
+                .getCriterion();
+
+        for (Class<? extends AcceptCriterion> class1 : clientSideVerifiableCriterion) {
+            logger.log(Type.INFO, "creating mapping for "
+                    + class1.getCanonicalName());
+            String canonicalName = class1.getCanonicalName();
+            Class<? extends VAcceptCriterion> clientClass = class1
+                    .getAnnotation(ClientCriterion.class).value();
+            sourceWriter.print("if (\"");
+            sourceWriter.print(canonicalName);
+            sourceWriter.print("\" == name) return GWT.create(");
+            sourceWriter.print(clientClass.getCanonicalName());
+            sourceWriter.println(".class );");
+            sourceWriter.print("else ");
+        }
+
+        sourceWriter.println("return null;");
+        sourceWriter.outdent();
+        sourceWriter.println("}");
+    }
+
+}
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java
deleted file mode 100644 (file)
index 08712a6..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-@ITMillApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.widgetsetutils;
-
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Date;
-
-import com.google.gwt.core.ext.Generator;
-import com.google.gwt.core.ext.GeneratorContext;
-import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.core.ext.TreeLogger.Type;
-import com.google.gwt.core.ext.typeinfo.JClassType;
-import com.google.gwt.core.ext.typeinfo.TypeOracle;
-import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
-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;
-
-/**
- * GWT generator to build WidgetMapImpl dynamically based on
- * {@link ClientWidget} annotations available in workspace.
- * 
- */
-public class AcceptCriterionGenerator extends Generator {
-
-    private String packageName;
-    private String className;
-
-    @Override
-    public String generate(TreeLogger logger, GeneratorContext context,
-            String typeName) throws UnableToCompleteException {
-
-        try {
-            TypeOracle typeOracle = context.getTypeOracle();
-
-            // get classType and save instance variables
-            JClassType classType = typeOracle.getType(typeName);
-            packageName = classType.getPackage().getName();
-            className = classType.getSimpleSourceName() + "Impl";
-            // Generate class source code
-            generateClass(logger, context);
-        } catch (Exception e) {
-            logger.log(TreeLogger.ERROR,
-                    "Accept criterion factory creation failed", e);
-        }
-        // return the fully qualifed name of the class generated
-        return packageName + "." + className;
-    }
-
-    /**
-     * Generate source code for WidgetMapImpl
-     * 
-     * @param logger
-     *            Logger object
-     * @param context
-     *            Generator context
-     */
-    private void generateClass(TreeLogger logger, GeneratorContext context) {
-        // get print writer that receives the source code
-        PrintWriter printWriter = null;
-        printWriter = context.tryCreate(logger, packageName, className);
-        // print writer if null, source code has ALREADY been generated,
-        // return (WidgetMap is equal to all permutations atm)
-        if (printWriter == null) {
-            return;
-        }
-        logger.log(Type.INFO, "Detecting available criteria ...");
-        Date date = new Date();
-
-        // init composer, set class properties, create source writer
-        ClassSourceFileComposerFactory composer = null;
-        composer = new ClassSourceFileComposerFactory(packageName, className);
-        composer.addImport("com.google.gwt.core.client.GWT");
-        composer
-                .setSuperclass("com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory");
-        SourceWriter sourceWriter = composer.createSourceWriter(context,
-                printWriter);
-
-        // generator constructor source code
-        generateInstantiatorMethod(sourceWriter, context, logger);
-        // close generated class
-        sourceWriter.outdent();
-        sourceWriter.println("}");
-        // commit generated class
-        context.commit(logger, printWriter);
-        logger.log(Type.INFO, "Done. ("
-                + (new Date().getTime() - date.getTime()) / 1000 + "seconds)");
-
-    }
-
-    private void generateInstantiatorMethod(SourceWriter sourceWriter,
-            GeneratorContext context, TreeLogger logger) {
-
-        sourceWriter.println("public VAcceptCriterion get(String name) {");
-        sourceWriter.indent();
-
-        sourceWriter.println("name = name.intern();");
-
-        Collection<Class<? extends AcceptCriterion>> clientSideVerifiableCriterion = ClassPathExplorer
-                .getCriterion();
-
-        for (Class<? extends AcceptCriterion> class1 : clientSideVerifiableCriterion) {
-            logger.log(Type.INFO, "creating mapping for "
-                    + class1.getCanonicalName());
-            String canonicalName = class1.getCanonicalName();
-            Class<? extends VAcceptCriterion> clientClass = class1
-                    .getAnnotation(ClientCriterion.class).value();
-            sourceWriter.print("if (\"");
-            sourceWriter.print(canonicalName);
-            sourceWriter.print("\" == name) return GWT.create(");
-            sourceWriter.print(clientClass.getCanonicalName());
-            sourceWriter.println(".class );");
-            sourceWriter.print("else ");
-        }
-
-        sourceWriter.println("return null;");
-        sourceWriter.outdent();
-        sourceWriter.println("}");
-    }
-
-}