Changeset 44

Timestamp:

02/12/09 01:24:39 (3 years ago)

Author:

harald

Message:

--

Files:

• trunk (modified) (1 prop)
• trunk/out/templates/cs/class.vm (modified) (1 diff)
• trunk/out/templates/cs/enum.vm (modified) (1 diff)
• trunk/out/templates/cs/interface.vm (modified) (1 diff)
• trunk/out/templates/cs/proxy.vm (modified) (1 diff)
• trunk/src/org/fluffnstuff/asdoclet/generator/utils/GeneratorUtils.java (modified) (8 diffs)

trunk/out/templates/cs/class.vm

@@ -20 +20 @@
-#end
-#macro(method $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.upperMethodName}
+type($descriptor) ${descriptor.upperMethodName}#generics($descriptor.genericType)
-#end
-#macro(property $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.propertyName}
+type($descriptor) ${descriptor.propertyName}#generics($descriptor.genericType)
-#end
-#*

trunk/out/templates/cs/enum.vm

@@ -20 +20 @@
-#end
-#macro(method $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.upperMethodName}
+type($descriptor) ${descriptor.upperMethodName}#generics($descriptor.genericType)
-#end
-#macro(property $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.propertyName}
+type($descriptor) ${descriptor.propertyName}#generics($descriptor.genericType)
-#end
-#*

trunk/out/templates/cs/interface.vm

@@ -20 +20 @@
-#end
-#macro(method $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.upperMethodName}
+type($descriptor) ${descriptor.upperMethodName}#generics($descriptor.genericType)
-#end
-#macro(property $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.propertyName}
+type($descriptor) ${descriptor.propertyName}#generics($descriptor.genericType)
-#end
-#*

trunk/out/templates/cs/proxy.vm

@@ -20 +20 @@
-#end
-#macro(method $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.upperMethodName}
+type($descriptor) ${descriptor.upperMethodName}#generics($descriptor.genericType)
-#end
-#macro(property $descriptor)
-if($descriptor.genericType.arguments)#generics($descriptor.genericType) #end#type($descriptor) ${descriptor.propertyName}
+type($descriptor) ${descriptor.propertyName}#generics($descriptor.genericType)
-#end
-#*

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

@@ -6 +6 @@
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.HashSet;
-import java.util.Map;
-
@@ -12 +13 @@
-
-import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.MethodDoc;
-import com.sun.javadoc.ParameterizedType;
-import com.sun.javadoc.Type;
-import com.sun.javadoc.TypeVariable;
-import com.sun.javadoc.WildcardType;
-import com.sun.javadoc.MethodDoc;
-
-public final class GeneratorUtils {
+        public static org.fluffnstuff.asdoclet.generator.Type getType(Type type, Generator generator) {
+                return getType(type, generator, new HashSet<String>());
+        }
+
-        public static org.fluffnstuff.asdoclet.generator.Type getType(String name, Generator generator) {
-                if (name == null) return org.fluffnstuff.asdoclet.generator.Type.NULL;
@@ -32 +37 @@
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(doc.typeParameters())));
-                for (Type argument : doc.typeParameters()) {
-
+, new HashSet<String>()
-                }
-
@@ -41 +46 @@
-        }
-
-
+, Collection<String> visited
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Processing argument {0} <{1}>", argument.qualifiedTypeName(), argument.getClass().getCanonicalName()));
-
-
+, visited
-                if (argumentType != org.fluffnstuff.asdoclet.generator.Type.NULL) {
-
+, visited
-                        if (arguments != null) arguments.add(argumentType);
-                }
-        }
-
-ublic static org.fluffnstuff.asdoclet.generator.Type getType(Type type, Generator generator
+rivate static org.fluffnstuff.asdoclet.generator.Type getType(Type type, Generator generator, Collection<String> visited
-                if (generator.isDebug()) System.out.println(MessageFormat.format("Generating type {0} <{1}>", type.qualifiedTypeName(), type.getClass().getCanonicalName()));
+
+                if (visited.contains(type.toString())) return getType(type.qualifiedTypeName(), generator);
+                visited.add(type.toString());
-
-                Map<String, org.fluffnstuff.asdoclet.generator.Type> bounds = new HashMap<String, org.fluffnstuff.asdoclet.generator.Type>();
@@ -61 +69 @@
-                        if (generator.isDebug()) System.out.println(MessageFormat.format("Arguments {0}", Arrays.toString(parameterizedType.typeArguments())));
-                        for (Type argument : parameterizedType.typeArguments()) {
-
+, visited
-                        }
-                } else if (type instanceof ClassDoc) {
@@ -67 +75 @@
-                        if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(classDoc.typeParameters())));
-                        for (Type argument : classDoc.typeParameters()) {
-
+, visited
-                        }
-                }
@@ -90 +98 @@
-        }
-
-
+, Collection<String> visited
-                Type[] types = null;
-                if (argument instanceof TypeVariable) {
@@ -102 +110 @@
-
-                        if (boundType != null) {
-
+, visited
-
-                                if (bound != org.fluffnstuff.asdoclet.generator.Type.NULL) {