Changeset 82

Timestamp:

10/23/09 12:06:13 (2 years ago)

Author:

harald

Message:

--

Files:

• trunk/src/org/fluffnstuff/asdoclet/generator/AsGenerator.java (modified) (5 diffs)
• trunk/src/org/fluffnstuff/asdoclet/generator/Generator.java (modified) (4 diffs)
• trunk/src/org/fluffnstuff/asdoclet/generator/VelocityGenerator.java (modified) (5 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java (modified) (3 diffs)
• trunk/test/TestAsdoclet.java (modified) (1 diff)
• trunk/test/asdoclet/test/TestProxyInterface.java (modified) (2 diffs)
• trunk/test/asdoclet/test/TestProxyInterfaceBase.java (modified) (2 diffs)
• trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceBase.as (modified) (1 diff)
• trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceProxy.as (modified) (1 diff)
• trunk/test/expectations/cs/asdoclet/test/TestProxyInterface.cs (modified) (1 diff)
• trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceBase.cs (modified) (1 diff)
• trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceProxy.cs (modified) (1 diff)

trunk/src/org/fluffnstuff/asdoclet/generator/AsGenerator.java

@@ -23 +23 @@
-import uk.co.badgersinfoil.metaas.dom.ASType;
-import uk.co.badgersinfoil.metaas.dom.Visibility;
+import com.sun.javadoc.ClassDoc;
-
-public class AsGenerator implements Generator {
@@ -147 +148 @@
-
-        @Override
-        public void beginGetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override) {
-                fieldType = resolveTypeArguments(classType, methodType, fieldType);
-
-                if (type instanceof ASClassType) {
-                        addField(classType, Modifier.PRIVATE, fieldType, "_" + propertyName, null, null);
-                        beginMethod(classType, Type.EMPTY, modifier, fieldType, "get " + propertyName, false, override);
-                        method.addStmt("return _" + propertyName + ";");
-                } else {
-                        beginMethod(classType, Type.EMPTY, modifier, fieldType, "get " + propertyName, false, override);
-                }
-
-                setMethodDescription(comment);
-        }
-
-        @Override
-        public void addInterface(Type name) {
-                if (type instanceof ASInterfaceType) {
@@ -181 +167 @@
-
-                addImport(type.getName());
+        }
+
+        @Override
+        public void beginClass(Type classType) {
+                System.out.println("Creating ActionScript class " + classType);
+
+                newClass(classType, false);
+                addAnnotation(GeneratorUtils.getType("RemoteClass(alias=\"" + classType.getName() + "\")", this));
+        }
+
+        @Override
+        public void beginEnum(Type name) {
+                System.out.println("Creating ActionScript enumeration " + name);
+
+                newClass(name, true);
+        }
+
+        @Override
+        public void beginGetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override) {
+                fieldType = resolveTypeArguments(classType, methodType, fieldType);
+
+                if (type instanceof ASClassType) {
+                        addField(classType, Modifier.PRIVATE, fieldType, "_" + propertyName, null, null);
+                        beginMethod(classType, Type.EMPTY, modifier, fieldType, "get " + propertyName, false, override);
+                        method.addStmt("return _" + propertyName + ";");
+                } else {
+                        beginMethod(classType, Type.EMPTY, modifier, fieldType, "get " + propertyName, false, override);
+                }
+
+                setMethodDescription(comment);
+        }
+
+        @Override
+        public void beginInterface(Type name) {
+                System.out.println("Creating ActionScript interface " + name);
+
+                unit = project.newInterface(name.getName());
+                type = unit.getType();
+                imports = new TreeSet<String>();
+        }
+
+        @Override
+        public void beginMethod(Type classType, Type methodType, int modifier, Type returnType, String methodName, boolean asnyc, boolean override) {
+                returnType = resolveTypeArguments(classType, methodType, returnType);
+
+                if (unit != null) {
+                        method = type.newMethod(methodName, getVisibility(modifier), returnType.getName());
+                        method.setOverride(override);
+                }
+
+                if (proxyUnit != null) {
+                        String proxyMethodName = firstToUpper(methodName);
+                        boolean hasField = false;
+
+                        for (Object o : eventType.getFields()) {
+                                ASField field = (ASField) o;
+                                if (field.getName().equals(proxyMethodName)) {
+                                        hasField = true;
+                                        break;
+                                }
+                        }
+
+                        if (!hasField) {
+                                createConst(eventType, proxyMethodName, MessageFormat.format("\"{0}\"", methodName), "String", null);
+                                proxyMethod = proxyType.newMethod(methodName, Visibility.PUBLIC, returnType.getName());
+                        }
+                }
+
+                addImport(returnType.getName());
+        }
+
+        @Override
+        public void beginProxy(Type proxy, Type baseType, Type interfaceType) {
+                System.out.println("Creating ActionScript proxy " + proxy.getName());
+
+                ASCompilationUnit eventUnit = project.newClass(proxy.getName() + "Events");
+                proxyUnit = project.newClass(proxy.getName());
+
+                eventType = (ASClassType) eventUnit.getType();
+                proxyType = (ASClassType) proxyUnit.getType();
+
+                proxyType.addImplementedInterface(interfaceType.getName());
+
+                proxyImports = new TreeSet<String>();
+                proxyImports.add(interfaceType.getName());
+
+                if (baseType != Type.NULL) {
+                        proxyType.setSuperclass(baseType.getName());
+                        proxyImports.add(baseType.getName());
+                }
+
+                ASMethod callMethod = proxyType.newMethod(Constants.METHOD_CALL, Visibility.PROTECTED, "Object");
+                callMethod.addParam("name", "String");
+                callMethod.addParam("...args", null);
+                callMethod.addStmt("throw new Error(\"Not Implemented\");");
+
+                ASMethod resultMethod = proxyType.newMethod(Constants.METHOD_ON_RESULT, Visibility.PROTECTED, Type.VOID.getName());
+                resultMethod.addParam("result", "Object");
+
+                ASMethod statusMethod = proxyType.newMethod(Constants.METHOD_ON_STATUS, Visibility.PROTECTED, Type.VOID.getName());
+                statusMethod.addParam("status", "Object");
-        }
-
@@ -201 +288 @@
-
-        @Override
-        public void beginClass(Type classType) {
-                System.out.println("Creating ActionScript class " + classType);
-
-                newClass(classType, false);
-                addAnnotation(GeneratorUtils.getType("RemoteClass(alias=\"" + classType.getName() + "\")", this));
-        }
-
-        @Override
-        public void beginEnum(Type name) {
-                System.out.println("Creating ActionScript enumeration " + name);
-
-                newClass(name, true);
-        }
-
-        @Override
-        public void beginInterface(Type name) {
-                System.out.println("Creating ActionScript interface " + name);
-
-                unit = project.newInterface(name.getName());
-                type = unit.getType();
-                imports = new TreeSet<String>();
-        }
-
-        @Override
-        public void beginMethod(Type classType, Type methodType, int modifier, Type returnType, String methodName, boolean asnyc, boolean override) {
-                returnType = resolveTypeArguments(classType, methodType, returnType);
-
-                if (unit != null) {
-                        method = type.newMethod(methodName, getVisibility(modifier), returnType.getName());
-                        method.setOverride(override);
-                }
-
-                if (proxyUnit != null) {
-                        String proxyMethodName = firstToUpper(methodName);
-                        boolean hasField = false;
-
-                        for (Object o : eventType.getFields()) {
-                                ASField field = (ASField) o;
-                                if (field.getName().equals(proxyMethodName)) {
-                                        hasField = true;
-                                        break;
-                                }
-                        }
-
-                        if (!hasField) {
-                                createConst(eventType, proxyMethodName, MessageFormat.format("\"{0}\"", methodName), "String", null);
-                                proxyMethod = proxyType.newMethod(methodName, Visibility.PUBLIC, returnType.getName());
-                        }
-                }
-
-                addImport(returnType.getName());
-        }
-
-        @Override
-        public void beginProxy(Type proxy, Type baseType, Type interfaceType) {
-                System.out.println("Creating ActionScript proxy " + proxy.getName());
-
-                ASCompilationUnit eventUnit = project.newClass(proxy.getName() + "Events");
-                proxyUnit = project.newClass(proxy.getName());
-
-                eventType = (ASClassType) eventUnit.getType();
-                proxyType = (ASClassType) proxyUnit.getType();
-
-                proxyType.addImplementedInterface(interfaceType.getName());
-
-                proxyImports = new TreeSet<String>();
-                proxyImports.add(interfaceType.getName());
-
-                if (baseType != Type.NULL) {
-                        proxyType.setSuperclass(baseType.getName());
-                        proxyImports.add(baseType.getName());
-                }
-
-                ASMethod callMethod = proxyType.newMethod(Constants.METHOD_CALL, Visibility.PROTECTED, "Object");
-                callMethod.addParam("name", "String");
-                callMethod.addParam("...args", null);
-                callMethod.addStmt("throw new Error(\"Not Implemented\");");
-
-                ASMethod resultMethod = proxyType.newMethod(Constants.METHOD_ON_RESULT, Visibility.PROTECTED, Type.VOID.getName());
-                resultMethod.addParam("result", "Object");
-
-                ASMethod statusMethod = proxyType.newMethod(Constants.METHOD_ON_STATUS, Visibility.PROTECTED, Type.VOID.getName());
-                statusMethod.addParam("status", "Object");
-        }
-
-        @Override
-        public void endClass() {
-                end();
@@ -381 +382 @@
-        public void setTypeDescription(String description) {
-                if (!StringUtils.isEmpty(description)) type.setDescription(description.trim());
+        }
+
+        @Override
+        public boolean traverse(ClassDoc classDoc) {
+                return true;
-        }
-

trunk/src/org/fluffnstuff/asdoclet/generator/Generator.java

@@ -4 +4 @@
-
-import org.fluffnstuff.asdoclet.map.TypeMap;
+
+import com.sun.javadoc.ClassDoc;
-
-public interface Generator {
@@ -16 +18 @@
-        void addField(Type classType, int modifier, Type fieldType, String fieldName, Object value, String comment);
-
-        void beginGetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override);
-
-        void addInterface(Type type);
-
-        void addParameter(Type classType, Type methodType, Type type, String name);
-
-        void beginSetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override);
-
-        void beginClass(Type type);
-
-        void beginEnum(Type type);
+
+        void beginGetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override);
-
-        void beginInterface(Type type);
@@ -33 +33 @@
-
-        void beginProxy(Type type, Type baseType, Type interfaceType);
+
+        void beginSetter(Type classType, Type methodType, int modifier, Type fieldType, String propertyName, String comment, boolean override);
-
-        void endClass();
@@ -71 +73 @@
-
-        void setTypeDescription(String description);
+
+        boolean traverse(ClassDoc classDoc);
-}

trunk/src/org/fluffnstuff/asdoclet/generator/VelocityGenerator.java

@@ -25 +25 @@
-import org.fluffnstuff.asdoclet.map.TypeMap;
-
+import com.sun.javadoc.ClassDoc;
+
-public class VelocityGenerator implements Generator {
-        private static final String CSHARP = "cs";
@@ -161 +163 @@
-
-        @Override
+        public void addInterface(Type name) {
+                typeDescriptor.addInterface(name);
+        }
+
+        @Override
+        public void addParameter(Type classType, Type methodType, Type type, String name) {
+                if (methodDescriptor != null) {
+                        ParameterDescriptor parameterDescriptor = new ParameterDescriptor(type, name);
+                        methodDescriptor.addParameterDescriptor(parameterDescriptor);
+                }
+                if (proxyMethodDescriptor != null) {
+                        if (type.getTypeMap().containsKey(type.getName())) type = type.getTypeMap().get(type.getName());
+                        ParameterDescriptor parameterDescriptor = new ParameterDescriptor(type, name);
+                        proxyMethodDescriptor.addParameterDescriptor(parameterDescriptor);
+                }
+        }
+
+        @Override
+        public void beginClass(Type type) {
+                beginType(new ClassDescriptor(type));
+        }
+
+        @Override
+        public void beginEnum(Type type) {
+                beginType(new EnumDescriptor(type));
+        }
+
+        @Override
-        public void beginGetter(Type classType, Type methodType, int modifier, Type returnType, String propertyName, String description, boolean override) {
-                propertyDescriptor = new PropertyDescriptor(modifier, returnType, methodType, propertyName);
@@ -174 +204 @@
-
-        @Override
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -205 +245 @@
-
-        @Override
-        public void beginClass(Type type) {
-                beginType(new ClassDescriptor(type));
-        }
-
-        @Override
-        public void beginEnum(Type type) {
-                beginType(new EnumDescriptor(type));
-        }
-
-        @Override
-        public void beginInterface(Type type) {
-                beginType(new InterfaceDescriptor(type));
-        }
-
-        @Override
-        public void beginMethod(Type classType, Type methodType, int modifier, Type returnType, String methodName, boolean asnyc, boolean override) {
-                if (typeDescriptor != null) {
-                        methodDescriptor = new MethodDescriptor(modifier, returnType, methodType, methodName, asnyc);
-                        methodDescriptor.setOverride(override);
-                        typeDescriptor.addMethodDescriptor(methodDescriptor);
-                }
-                if (proxyTypeDescriptor != null) {
-                        proxyMethodDescriptor = new MethodDescriptor(modifier, returnType, methodType, methodName, asnyc);
-                        proxyTypeDescriptor.addMethodDescriptor(proxyMethodDescriptor);
-                }
-        }
-
-        @Override
-        public void beginProxy(Type proxy, Type baseType, Type interfaceType) {
-                proxyTypeDescriptor = new ProxyDescriptor(proxy);
-                proxyTypeDescriptor.addInterface(interfaceType);
-
-                if (baseType != Type.NULL) proxyTypeDescriptor.setSuperclass(baseType);
-
-                typeDescriptors.add(proxyTypeDescriptor);
-        }
-
-        @Override
-        public void endClass() {
-                typeDescriptor = null;
@@ -365 +367 @@
-        }
-
+        @Override
+        public boolean traverse(ClassDoc classDoc) {
+                return classDoc.isIncluded();
+        }
+
-        private void beginType(TypeDescriptor typeDescriptor) {
-                this.typeDescriptor = typeDescriptor;

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

@@ -3 +3 @@
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.fluffnstuff.asdoclet.generator.Generator;
@@ -155 +155 @@
-                        ClassDoc classDoc = type.asClassDoc();
-
+                        // don't process interfaces that are not part of the source path
+                        if (!getGenerator().traverse(classDoc)) continue;
+
-                        org.fluffnstuff.asdoclet.generator.Type interfaceType = GeneratorUtils.getType(type, getGenerator(), ignore);
-
@@ -178 +181 @@
-
-                                boolean bean = TagParser.getBooleanCommand(Constants.COMMAND_BEAN, commands);
-Type
+Class
-
-                                traverseInterfaces(classDoc, ignore, commands);

trunk/test/TestAsdoclet.java

@@ -3 +3 @@
-public class TestAsdoclet {
-        public static void main(String[] args) {
-cs
+actionscript
-        }
-}

trunk/test/asdoclet/test/TestProxyInterface.java

@@ -1 +1 @@
-package asdoclet.test;
+
+import java.sql.Date;
-
-/**
@@ -5 +7 @@
- * @cs.class proxy=<code>true</code>
- */
-Integer
+Date
-}

trunk/test/asdoclet/test/TestProxyInterfaceBase.java

@@ -1 +1 @@
-package asdoclet.test;
+
+import java.util.Date;
-
-/**
@@ -5 +7 @@
- * @cs.class
- */
-
+ extends Date
-        void foo(T bar);
-}

trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceBase.as

@@ -6 +6 @@
-         */
-        public interface TestProxyInterfaceBase extends  asdoclet.test.TestProxyInterfaceGeneric {
-Object
+Date
-        }
-}

trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceProxy.as

@@ -10 +10 @@
-                protected function onStatus(status:Object):void {
-                }
-Object
+Date
-                        dispatchCall(TestProxyInterfaceProxyEvents.Foo, bar);
-                }

trunk/test/expectations/cs/asdoclet/test/TestProxyInterface.cs

@@ -8 +8 @@
-         * </summary>
-         */
-int?
+java.sql.Date
-        }
-}

trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceBase.cs

@@ -8 +8 @@
-         * </summary>
-         */
-
+where T : System.DateTime? 
-                void Foo(T bar);
-        }

trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceProxy.cs

@@ -10 +10 @@
-        }
-
-int?
+java.sql.Date
-                        DispatchCall<object>("foo", bar);
-                }