Changeset 76

Timestamp:

10/21/09 16:21:22 (2 years ago)

Author:

harald

Message:

--

Files:

• trunk/src/org/fluffnstuff/asdoclet/generator/utils/GeneratorUtils.java (modified) (9 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/AbstractHandler.java (modified) (4 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/ClassHandler.java (modified) (5 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/EnumHandler.java (modified) (2 diffs)
• trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java (modified) (6 diffs)
• trunk/test (modified) (1 prop)
• trunk/test/TestAsdoclet.java (modified) (1 diff)
• trunk/test/asdoclet/test (modified) (1 prop)
• trunk/test/asdoclet/test/TestException.java (modified) (1 diff)
• trunk/test/asdoclet/test/TestIgnoreGeneric.java (added)
• trunk/test/expectations/actionscript/asdoclet/test/TestException.as (modified) (1 diff)
• trunk/test/expectations/actionscript/asdoclet/test/TestIgnoreGeneric.as (added)
• trunk/test/expectations/cs/asdoclet/test/TestIgnoreGeneric.cs (added)

trunk/src/org/fluffnstuff/asdoclet/generator/utils/GeneratorUtils.java

@@ -24 +24 @@
-        private static Map<String, org.fluffnstuff.asdoclet.generator.Type> enumerationTypes = new HashMap<String, org.fluffnstuff.asdoclet.generator.Type>();
-
-
+, Collection<String> ignore
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Generating type {0} <{1}>", doc.name(), doc.getClass().getCanonicalName()));
-
@@ -32 +32 @@
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(doc.typeParameters())));
-                for (Type argument : doc.typeParameters()) {
-
+ignore, 
-                }
-
@@ -41 +41 @@
-        }
-
-
+ignore, Collection<String> 
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Processing argument {0} <{1}>", argument.qualifiedTypeName(), argument.getClass().getCanonicalName()));
-
-
+ignore, 
-                if (argumentType != org.fluffnstuff.asdoclet.generator.Type.NULL) {
-
+ignore, 
-                        if (arguments != null) arguments.add(argumentType);
-                }
-        }
-
-
+ignore, Collection<String> 
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Generating type {0} <{1}>", type.qualifiedTypeName(), type.getClass().getCanonicalName()));
+
+                if (ignore.contains(type.qualifiedTypeName())) return org.fluffnstuff.asdoclet.generator.Type.NULL;
-
-                if (visited.contains(type.toString())) return getType(type.qualifiedTypeName(), generator);
@@ -67 +69 @@
-                        if (generator.isDebug()) System.out.println(MessageFormat.format("Arguments {0}", Arrays.toString(parameterizedType.typeArguments())));
-                        for (Type argument : parameterizedType.typeArguments()) {
-
+ignore, 
-                        }
-                } else if (type instanceof ClassDoc) {
@@ -73 +75 @@
-                        if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(classDoc.typeParameters())));
-                        for (Type argument : classDoc.typeParameters()) {
-
+ignore, 
-                        }
-                }
@@ -100 +102 @@
-                                for (AnnotationDesc annotationDesc : methodDoc.annotations()) {
-                                        if (annotationDesc.annotationType().qualifiedTypeName().equals(enumAnnotation.getCanonicalName())) {
-
+, new HashSet<String>()
-                                                enumerationTypes.put(typeName, type);
-                                                return type;
@@ -113 +115 @@
-        }
-
-
-
+, Collection<String> ignore
+ignore, 
-        }
-
@@ -125 +127 @@
-        }
-
-
+ignore, Collection<String> 
-                Type[] types = null;
-                if (argument instanceof TypeVariable) {
@@ -137 +139 @@
-
-                        if (boundType != null) {
-
+ignore, 
-
-                                if (bound != org.fluffnstuff.asdoclet.generator.Type.NULL) {

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

@@ -62 +62 @@
-
-                                if (fieldType == null) {
-
-
+, ignore
+, ignore
-                                }
-
@@ -165 +165 @@
-                if (classDoc.isInterface()) {
-                        for (ClassDoc interfaceDoc : classDoc.interfaces()) {
+                                org.fluffnstuff.asdoclet.generator.Type interfaceClass = GeneratorUtils.getType(interfaceDoc, getGenerator(), ignore);
+
+                                if (interfaceClass == org.fluffnstuff.asdoclet.generator.Type.NULL) return false;
-                                if (ignore.contains(interfaceDoc.qualifiedTypeName() + "." + name)) return false;
-                                if (ignore.contains(interfaceDoc.qualifiedTypeName())) return false;
@@ -176 +179 @@
-                        }
-                } else {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                ignore.addAll(getIgnore(commands));
-                        }
@@ -230 +236 @@
-        protected void processInterfaces(ClassDoc classDoc, Set<String> ignore) {
-                for (Type type : classDoc.interfaceTypes()) {
-
+, ignore
-
-                        if (interfaceName != org.fluffnstuff.asdoclet.generator.Type.NULL && !ignore.contains(interfaceName.getName())) {

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

@@ -3 +3 @@
-import java.util.Map;
-import java.util.Set;
+import java.util.Collection;
-
-import org.fluffnstuff.asdoclet.generator.Generator;
@@ -24 +25 @@
-                Set<String> ignore = getIgnore(commands);
-
-
+, ignore
-
-                getGenerator().beginClass(type);
@@ -33 +34 @@
-                processInterfaces(classDoc, ignore);
-                processClassComment(classDoc);
-
+, ignore
-                processBeanProperties(type, classDoc, ignore, commands);
-
@@ -45 +46 @@
-        }
-
-
+, Collection<String> ignore
-                for (FieldDoc fieldDoc : classDoc.fields()) {
-                        if (fieldDoc.isFinal() && fieldDoc.isPublic()) {
-
+, ignore
-                                getGenerator().addConstant(classType, type, fieldDoc.name(), fieldDoc.constantValueExpression(), fieldDoc.commentText());
-                        }
@@ -54 +55 @@
-        }
-
-Set
+Collection
-                Type type = classDoc.superclassType();
-                if ((type != null) && !type.qualifiedTypeName().equals(Object.class.getCanonicalName())) {
-
+, ignore
-
-                        if (superClass != org.fluffnstuff.asdoclet.generator.Type.NULL && !ignore.contains(superClass.getName())) {

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

@@ -4 +4 @@
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.HashSet;
-
-import org.fluffnstuff.asdoclet.generator.Generator;
@@ -36 +37 @@
-        private void processEnumConstants(Type type, ClassDoc classDoc) throws InvocationTargetException, IllegalAccessException, ClassNotFoundException {
-                Method getter = findGetter(classDoc);
-
+, new HashSet<String>()
-
-                for (FieldDoc fieldDoc : classDoc.enumConstants()) {

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

@@ -6 +6 @@
-import java.util.Map;
-import java.util.Set;
+import java.util.HashSet;
-
-import org.fluffnstuff.asdoclet.generator.Generator;
@@ -27 +28 @@
-                boolean proxy = TagParser.getBooleanCommand(Constants.COMMAND_PROXY, commands);
-                if (proxy) {
-
+, new HashSet<String>()
-                        String proxyName = TagParser.getStringCommand(Constants.COMMAND_PROXY_NAME, interfaceName + "Proxy", commands);
-                        String baseType = TagParser.getStringCommand(Constants.COMMAND_PROXY_SUPER_CLASS, commands);
@@ -47 +48 @@
-
-        private void processInterfaceInternal(ClassDoc classDoc, Map<String, String> commands) {
-                org.fluffnstuff.asdoclet.generator.Type interfaceName = GeneratorUtils.getType(classDoc, getGenerator());
-
-                boolean bean = TagParser.getBooleanCommand(Constants.COMMAND_BEAN, commands);
-                Set<String> ignore = getIgnore(commands);
+
+                org.fluffnstuff.asdoclet.generator.Type interfaceName = GeneratorUtils.getType(classDoc, getGenerator(), ignore);
-
-                getGenerator().beginInterface(interfaceName);
@@ -79 +80 @@
-                Map<String, String> methodCommands = new HashMap<String, String>(commands);
-                Map<String, String> methodOnlyCommands = new HashMap<String, String>();
-
-
+
+
+
-
-                if (typeMap != null) {
@@ -128 +130 @@
-
-                        for (Parameter parameter : methodDoc.parameters()) {
-
+, ignore
-                        }
-
@@ -151 +153 @@
-                        ClassDoc classDoc = type.asClassDoc();
-
-
+, ignore
-
-                        if (interfaceType != org.fluffnstuff.asdoclet.generator.Type.NULL && !ignore.contains(interfaceType.getName())) {
-
+, ignore
-                                Map<String, org.fluffnstuff.asdoclet.generator.Type> typeMap = null;
-

trunk/test/TestAsdoclet.java

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

trunk/test/asdoclet/test/TestException.java

@@ -20 +20 @@
-                super(message, cause);
-        }
+
+        /**
+         * @return message
+         * @cs.property ignore=<code>true</code>
+         */
+        @Override
+        public String getMessage() {
+                return super.getMessage();
+        }
-}

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

@@ -6 +6 @@
-        [RemoteClass(alias="asdoclet.test.TestException")]
-        public class TestException {
+                private var _message:String;
+                public function get message():String {
+                        return _message;
+                }
+                public function set message(value:String):void {
+                        _message=value;
+                }
-        }
-}