Changeset 4

Timestamp:

07/16/08 17:44:24 (4 years ago)

Author:

harald

Message:

• Separate generator from doclet
  
• Add velocity generator in parallel to the as generator
  

Files:

• trunk/asdoclet.ipr (modified) (1 diff)
• trunk/lib/velocity-dep.jar (added)
• trunk/src/org/fluffnstuff/asdoclet/AsDoclet.java (modified) (3 diffs)
• trunk/src/org/fluffnstuff/asdoclet/generator (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/AsGenerator.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/Generator.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/VelocityGenerator.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/ClassDescriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/Descriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/FieldDescriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/MethodDescriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/ParameterDescriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/generator/velocity/TypeDescriptor.java (added)
• trunk/src/org/fluffnstuff/asdoclet/handler/AbstractHandler.java (modified) (2 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/ClassHandler.java (modified) (5 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/Constants.java (modified) (2 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/EnumHandler.java (modified) (2 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java (modified) (6 diffs)
• trunk/src/org/fluffnstuff/asdoclet/map (added)
• trunk/src/org/fluffnstuff/asdoclet/map/ClassTypeMap.java (moved) (moved from trunk/src/org/fluffnstuff/asdoclet/AsClassTypeMap.java) (1 diff)
• trunk/src/org/fluffnstuff/asdoclet/map/TypeMap.java (moved) (moved from trunk/src/org/fluffnstuff/asdoclet/AsTypeMap.java) (2 diffs)
• trunk/templates (added)
• trunk/templates/cs (added)
• trunk/templates/cs/class.vm (added)

trunk/asdoclet.ipr

@@ -331 +331 @@
-  <component name="copyright">
-    <Base>
-1
+2
-    </Base>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="4" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="HTML">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JAVA">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JSP">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="JavaScript">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="Properties">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />
-      <option name="fileLocation" value="1" />
-      <option name="useAlternate" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="XML">
-      <option name="templateOptions">
-        <value>
-          <option name="block" value="true" />
-          <option name="separateBefore" value="false" />
-          <option name="separateAfter" value="false" />
-          <option name="prefixLines" value="true" />
-          <option name="lenBefore" value="80" />
-          <option name="lenAfter" value="80" />
-          <option name="box" value="false" />
-          <option name="filler" value=" " />
-        </value>
-      </option>
-      <option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
-      <option name="keyword" value="Copyright" />
-      <option name="fileTypeOverride" value="2" />
-      <option name="relativeBefore" value="true" />
-      <option name="addBlankAfter" value="true" />

trunk/src/org/fluffnstuff/asdoclet/AsDoclet.java

@@ -4 +4 @@
-import com.sun.javadoc.DocErrorReporter;
-import com.sun.javadoc.RootDoc;
+import org.fluffnstuff.asdoclet.generator.AsGenerator;
+import org.fluffnstuff.asdoclet.generator.Generator;
+import org.fluffnstuff.asdoclet.generator.VelocityGenerator;
-import org.fluffnstuff.asdoclet.handler.*;
-
-
-
-
+
+
-
-public class AsDoclet {
@@ -15 +16 @@
-    private static final String PARAM_ANNOTATION_MAP = "-annotationmap";
-
-AsClassTypeMap typeMap = new As
-AsTypeMap annotationMap = new As
+ClassTypeMap typeMap = new 
+TypeMap annotationMap = new 
-
-IO
+
-        String destination = readOptions(root.options());
-
-
-
+
+
+
-
-        for (ClassDoc classDoc : root.classes()) {
-            if (TagParser.hasClassTags(classDoc)) {
-project
+generator
-                handler.process(classDoc);
-            }
-        }
-
-
-
+
-
-        return true;
@@ -55 +56 @@
-    }
-
-ActionScriptProject project
+Generator generator
-        Handler handler;
-
-        if (classDoc.isInterface()) {
-project
+generator
-        } else if (typeMap.isEnum(classDoc.qualifiedTypeName())) {
-project
+generator
-        } else {
-project
+generator
-        }
-

trunk/src/org/fluffnstuff/asdoclet/handler/AbstractHandler.java

@@ -2 +2 @@
-
-import com.sun.javadoc.ClassDoc;
-
-
-
-
-
-
+
+
-
-public abstract class AbstractHandler implements Handler {
-    private static final String COMMENT_PREFIX = "\t * ";
-
-ActionScriptProject project
-As
-As
+Generator generator
+
+
-
-ActionScriptProject project, AsTypeMap typeMap, As
-project = project
+Generator generator, TypeMap typeMap, 
+generator = generator
-        this.typeMap = typeMap;
-        this.annotationMap = annotationMap;
-    }
-
-As
+
-        return annotationMap;
-    }
-
-ActionScriptProject getProject
-project
+Generator getGenerator
+generator
-    }
-
-As
+
-        return typeMap;
-    }
-
-
-
-
-
-
-
-
-
+
-        StringBuilder description = new StringBuilder();
-        String comment = classDoc.commentText();
@@ -55 +44 @@
-        description.append(COMMENT_PREFIX).append("Do not edit.");
-
-
-
-
-
-
-
-
-
+
-    }
-}

trunk/src/org/fluffnstuff/asdoclet/handler/ClassHandler.java

@@ -2 +2 @@
-
-import com.sun.javadoc.*;
-
-
-
-
-
-
+
+
-
-import java.beans.Introspector;
+import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.HashMap;
@@ -16 +13 @@
-
-public class ClassHandler extends AbstractHandler {
-ActionScriptProject project, AsTypeMap typeMap, As
-project
+Generator generator, TypeMap typeMap, 
+generator
-    }
-
@@ -29 +26 @@
-        String ignore = TagParser.getStringCommand(Constants.COMMAND_IGNORE, "", commands);
-
-
-
+
-
-type.newMetaTag
-type.newMetaTag
+getGenerator().addAnnotation
+getGenerator().addAnnotation
-
-
-
-
-
+
+
+
+
+
-    }
-
-, ASClassType type
+
-        for (MethodDoc methodDoc : classDoc.methods()) {
-            Map<String, String> methodCommands = new HashMap<String, String>(commands);
@@ -52 +49 @@
-                if (propertyName != null) {
-                    String fieldType = getFieldType(methodDoc, findField(classDoc, propertyName), imports, methodCommands);
-ASField field = type.newField(propertyName, Visibility.PUBLIC, fieldTyp
+getGenerator().addField(Modifier.PUBLIC, fieldType, propertyNam
-
-, field
+
-                }
-            }
@@ -116 +113 @@
-    }
-
-, ASField field
+
-        StringBuilder description = new StringBuilder();
-        String comment = methodDoc.commentText();
-        if (comment != null) description.append(comment.trim());
-field.set
+getGenerator().setField
-    }
-
-, ASClassType type
+
-        ClassDoc superClassDoc = classDoc.superclass();
-        if (superClassDoc != null) {
-            String superClassName = superClassDoc.qualifiedTypeName();
-type
+getGenerator()
-        }
-    }

trunk/src/org/fluffnstuff/asdoclet/handler/Constants.java

@@ -1 +1 @@
-package org.fluffnstuff.asdoclet.handler;
-
-
+public 
-    public static final String TAG_ACTIONSCRIPT_CLASS = "actionscript.class";
-    public static final String TAG_ACTIONSCRIPT_METHOD = "actionscript.method";
@@ -14 +14 @@
-
-    public static final String COMMAND_BINDABLE = "bindable";
-    public static final String COMMAND_HANDLER = "handler";
-    public static final String COMMAND_IGNORE = "ignore";
-    public static final String COMMAND_TYPE = "type";

trunk/src/org/fluffnstuff/asdoclet/handler/EnumHandler.java

@@ -3 +3 @@
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.FieldDoc;
-
-
-
-
+
+
-
-public class EnumHandler extends AbstractHandler {
-ActionScriptProject project, AsTypeMap typeMap, As
-project
+Generator generator, TypeMap typeMap, 
+generator
-    }
-
@@ -16 +14 @@
-
-    public void process(ClassDoc classDoc) {
-
-
-
+
+
-
-processClassComment(classDoc, type
+for (FieldDoc fieldDoc : classDoc.fields()) getGenerator().addEnumField(fieldDoc.name()
-
-for (FieldDoc fieldDoc : classDoc.fields()) createConst(type, fieldDoc.name(), fieldDoc.name()
+getGenerator().endEnum(
-    }
-}

trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java

@@ -4 +4 @@
-import com.sun.javadoc.MethodDoc;
-import com.sun.javadoc.Parameter;
-
-
-
-
+
+
-
-import java.beans.Introspector;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.HashMap;
@@ -17 +13 @@
-
-public class InterfaceHandler extends AbstractHandler {
-ActionScriptProject project, AsTypeMap typeMap, As
-project
+Generator generator, TypeMap typeMap, 
+generator
-    }
-
@@ -24 +20 @@
-
-    public void process(ClassDoc classDoc) {
-, null, null, null, true, null
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        Map<String, String> commands = new HashMap<String, String>();
-
@@ -58 +29 @@
-        commands.putAll(TagParser.processClassTags(classDoc));
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
+
-            proxyImports.addAll(imports);
-processImports(proxyUnit, 
+getGenerator().endProxy(
-        }
-    }
-
-createProxy(String interfaceName, Map<String, String> commands, ASClassType proxyType, Collection<String> proxyImports, String returnType
-String baseType = TagParser.getStringCommand(Constants.COMMAND_PROXY_BASE_CLASS, commands
+processInterfaceInternal(ClassDoc classDoc, String asyncReturnType, Map<String, String> parentCommands, Collection<String> proxyImports, Collection<String> imports
+Map<String, String> commands = new HashMap<String, String>(
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }
-
-
+
+
+
+
+
+
+
+
-        Map<String, String> methodCommands = new HashMap<String, String>(commands);
-
@@ -144 +93 @@
-
-        boolean async = TagParser.getBooleanCommand(Constants.COMMAND_ASYNC, methodCommands);
-        boolean handler = TagParser.getBooleanCommand(Constants.COMMAND_HANDLER, methodCommands);
-        boolean ignore = TagParser.getBooleanCommand(Constants.COMMAND_IGNORE, methodCommands);
-
-        if (!ignore) {
-            if (async) {
-returnType)) imports.add(r
+asyncReturnType)) imports.add(asyncR
-            } else {
-
-
+
-            }
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
-            }
-
-
-
-
-
+
-
-if (method != null) processMethodComment(methodDoc, method
+processMethodComment(methodDoc
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        StringBuilder description = new StringBuilder();
-        String comment = methodDoc.commentText();
@@ -223 +122 @@
-        if (comment != null) description.append(comment.trim());
-
-method.set
+getGenerator().setMethod
-    }
-}

trunk/src/org/fluffnstuff/asdoclet/map/ClassTypeMap.java

@@ -1 @@
-
+.map
-
-import java.util.Collection;
-
-AsClassTypeMap extends As
-As
+ClassTypeMap extends 
+
-        typeMap.put("boolean", "Boolean");
-        typeMap.put("byte", "Number");

trunk/src/org/fluffnstuff/asdoclet/map/TypeMap.java

@@ -1 @@
-
+.map
-
-import java.util.Collection;
@@ -5 +5 @@
-import java.util.Map;
-
-As
+
-    protected final Map<String, String> typeMap = new HashMap<String, String>();
-