Changeset 86
- Timestamp:
- 2009-11-24 13:33:10 (2 years ago)
- Files:
-
- trunk/build.xml (modified) (2 diffs)
- trunk/src/org/fluffnstuff/asdoclet (modified) (1 prop)
- trunk/src/org/fluffnstuff/asdoclet/AsDoclet.java (modified) (4 diffs)
- trunk/src/org/fluffnstuff/asdoclet/generator/AsGenerator.java (modified) (7 diffs)
- trunk/src/org/fluffnstuff/asdoclet/generator/Generator.java (modified) (1 diff)
- trunk/src/org/fluffnstuff/asdoclet/generator/VelocityGenerator.java (modified) (3 diffs)
- trunk/src/org/fluffnstuff/asdoclet/generator/utils/GeneratorUtils.java (modified) (8 diffs)
- trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java (modified) (2 diffs)
- trunk/src/org/fluffnstuff/asdoclet/logback.xml (added)
- trunk/templates/cs/class.vm (modified) (2 diffs)
- trunk/templates/cs/enum.vm (modified) (2 diffs)
- trunk/templates/cs/interface.vm (modified) (2 diffs)
- trunk/templates/cs/proxy.vm (modified) (2 diffs)
- trunk/test/TestAsdoclet.java (modified) (1 diff)
- trunk/test/asdoclet/test/TestProxyInterface.java (modified) (1 diff)
- 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/TestClassAnnotations.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestException.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreClass.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreGeneric.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreInClass.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreInClassBase.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreInInterface.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreInInterfaceBase.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestIgnoreInterface.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestInterfaceAnnotations.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestInterfaceGeneric.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestOverrideClass.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestOverrideClassBase.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestOverrideInterface.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestOverrideInterfaceBase.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestProxyInterface.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceBase.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceGeneric.cs (modified) (2 diffs)
- trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceProxy.cs (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build.xml
r74 r86 30 30 <classpath refid="compile.classpath"/> 31 31 </javac> 32 33 <copy todir="${output.dir}"> 34 <fileset dir="${basedir}/src"> 35 <include name="**/*.xml"/> 36 </fileset> 37 <fileset dir="${basedir}"> 38 <include name="templates/**"/> 39 </fileset> 40 </copy> 41 32 42 </target> 33 43 … … 49 59 </manifest> 50 60 <fileset dir="${output.dir}"> 61 <exclude name="**/logback-test.xml"/> 62 51 63 <include name="org/fluffnstuff/**"/> 52 </fileset>53 <fileset dir="${basedir}">54 64 <include name="templates/**"/> 55 65 </fileset> trunk/src/org/fluffnstuff/asdoclet
- Property svn:ignore set to
logback-test.xml
- Property svn:ignore set to
trunk/src/org/fluffnstuff/asdoclet/AsDoclet.java
r79 r86 2 2 3 3 import java.lang.annotation.Annotation; 4 import java.net.URL; 4 5 import java.util.Arrays; 5 6 … … 14 15 import org.fluffnstuff.asdoclet.map.ClassTypeMap; 15 16 import org.fluffnstuff.asdoclet.map.TypeMap; 17 import org.slf4j.Logger; 18 import org.slf4j.LoggerFactory; 16 19 20 import ch.qos.logback.classic.LoggerContext; 21 import ch.qos.logback.classic.joran.JoranConfigurator; 22 import ch.qos.logback.core.util.StatusPrinter; 17 23 import com.sun.javadoc.ClassDoc; 18 24 import com.sun.javadoc.DocErrorReporter; … … 30 36 private static final String PARAM_ANNOTATION_TYPE_MAP = "-annotationmap"; 31 37 38 private static final Logger logger = LoggerFactory.getLogger(AsDoclet.class); 39 40 static { 41 try { 42 URL config = AsDoclet.class.getResource("logback-test.xml"); 43 if (config == null) config = AsDoclet.class.getResource("logback.xml"); 44 45 LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); 46 lc.reset(); 47 48 JoranConfigurator configurator = new JoranConfigurator(); 49 configurator.setContext(lc); 50 configurator.doConfigure(config); 51 52 StatusPrinter.printInCaseOfErrorsOrWarnings(lc); 53 } catch (Exception e) { 54 e.printStackTrace(); 55 } 56 } 57 32 58 public static boolean start(RootDoc root) throws Exception { 33 59 Generator generator = readOptions(root.options()); … … 37 63 38 64 for (ClassDoc classDoc : docs) { 39 System.out.println("Processing " + classDoc.qualifiedName()); 65 logger.info("Processing {}", classDoc.qualifiedName()); 66 40 67 if (TagParser.hasClassTags(generator, classDoc)) { 41 68 Handler handler = createHandler(generator, classDoc); trunk/src/org/fluffnstuff/asdoclet/generator/AsGenerator.java
r82 r86 12 12 import org.fluffnstuff.asdoclet.handler.Constants; 13 13 import org.fluffnstuff.asdoclet.map.TypeMap; 14 14 import org.slf4j.Logger; 15 import org.slf4j.LoggerFactory; 16 17 import com.sun.javadoc.ClassDoc; 15 18 import uk.co.badgersinfoil.metaas.ActionScriptFactory; 16 19 import uk.co.badgersinfoil.metaas.ActionScriptProject; … … 23 26 import uk.co.badgersinfoil.metaas.dom.ASType; 24 27 import uk.co.badgersinfoil.metaas.dom.Visibility; 25 import com.sun.javadoc.ClassDoc;26 28 27 29 public class AsGenerator implements Generator { 28 30 private static ActionScriptFactory factory = new ActionScriptFactory(); 31 32 private final Logger logger = LoggerFactory.getLogger(AsGenerator.class); 29 33 30 34 private ActionScriptProject project; … … 171 175 @Override 172 176 public void beginClass(Type classType) { 173 System.out.println("Creating ActionScript class " +classType);177 logger.info("Creating ActionScript class {}", classType); 174 178 175 179 newClass(classType, false); … … 179 183 @Override 180 184 public void beginEnum(Type name) { 181 System.out.println("Creating ActionScript enumeration " +name);185 logger.info("Creating ActionScript enumeration {}", name); 182 186 183 187 newClass(name, true); … … 201 205 @Override 202 206 public void beginInterface(Type name) { 203 System.out.println("Creating ActionScript interface " +name);207 logger.info("Creating ActionScript interface {}", name); 204 208 205 209 unit = project.newInterface(name.getName()); … … 240 244 @Override 241 245 public void beginProxy(Type proxy, Type baseType, Type interfaceType) { 242 System.out.println("Creating ActionScript proxy " +proxy.getName());246 logger.info("Creating ActionScript proxy {}", proxy.getName()); 243 247 244 248 ASCompilationUnit eventUnit = project.newClass(proxy.getName() + "Events"); … … 358 362 359 363 @Override 360 public boolean isDebug() {361 return false;362 }363 364 @Override365 364 public Type postProcessType(Type type) { 366 365 if (type.getDimensions() > 0) return GeneratorUtils.getType(Collection.class.getCanonicalName(), this); trunk/src/org/fluffnstuff/asdoclet/generator/Generator.java
r82 r86 64 64 boolean hasEnumSupport(); 65 65 66 boolean isDebug();67 68 66 Type postProcessType(Type type); 69 67 trunk/src/org/fluffnstuff/asdoclet/generator/VelocityGenerator.java
r82 r86 174 174 } 175 175 if (proxyMethodDescriptor != null) { 176 if (type.getTypeMap().containsKey(type.getName())) type = type.getTypeMap().get(type.getName()); 176 177 178 type = replaceType(type); 179 180 177 181 ParameterDescriptor parameterDescriptor = new ParameterDescriptor(type, name); 178 182 proxyMethodDescriptor.addParameterDescriptor(parameterDescriptor); 179 183 } 184 } 185 186 private Type replaceType(Type type) { 187 if (type.getTypeMap().containsKey(type.getName())) return type.getTypeMap().get(type.getName()); 188 189 Collection<Type> arguments = new ArrayList<Type>(); 190 if (type.getArguments() != null) { 191 for (Type argument : type.getArguments()) { 192 argument.setTypeMap(type.getTypeMap()); 193 arguments.add(replaceType(argument)); 194 } 195 } 196 197 return new Type(type.getName(), arguments, type.getBounds(), type.getDimensions(), type.isGeneric()); 180 198 } 181 199 … … 268 286 if (callbackType != org.fluffnstuff.asdoclet.generator.Type.EMPTY) { 269 287 if (methodDescriptor != null) methodDescriptor.setCallbackType(callbackType); 270 if (proxyMethodDescriptor != null) proxyMethodDescriptor.setCallbackType( callbackType);288 if (proxyMethodDescriptor != null) proxyMethodDescriptor.setCallbackType(replaceType(callbackType)); 271 289 } 272 290 … … 320 338 public boolean hasEnumSupport() { 321 339 return true; 322 }323 324 @Override325 public boolean isDebug() {326 return false;327 340 } 328 341 trunk/src/org/fluffnstuff/asdoclet/generator/utils/GeneratorUtils.java
r76 r86 2 2 3 3 import java.lang.annotation.Annotation; 4 import java.text.MessageFormat;5 4 import java.util.ArrayList; 6 5 import java.util.Arrays; … … 12 11 import org.fluffnstuff.asdoclet.generator.Generator; 13 12 import org.fluffnstuff.asdoclet.map.TypeMap; 13 import org.slf4j.Logger; 14 import org.slf4j.LoggerFactory; 14 15 15 16 import com.sun.javadoc.AnnotationDesc; … … 22 23 23 24 public final class GeneratorUtils { 25 private static final Logger logger = LoggerFactory.getLogger(GeneratorUtils.class); 26 24 27 private static Map<String, org.fluffnstuff.asdoclet.generator.Type> enumerationTypes = new HashMap<String, org.fluffnstuff.asdoclet.generator.Type>(); 25 28 26 29 public static org.fluffnstuff.asdoclet.generator.Type getType(MethodDoc doc, Generator generator, Collection<String> ignore) { 27 if (generator.isDebug()) System.out.println(MessageFormat.format("Generating type {0} <{1}>", doc.name(), doc.getClass().getCanonicalName()));30 logger.debug("Generating type {} <{}>", doc.name(), doc.getClass().getCanonicalName()); 28 31 29 32 Map<String, org.fluffnstuff.asdoclet.generator.Type> bounds = new HashMap<String, org.fluffnstuff.asdoclet.generator.Type>(); 30 33 Collection<org.fluffnstuff.asdoclet.generator.Type> arguments = new ArrayList<org.fluffnstuff.asdoclet.generator.Type>(); 31 34 32 if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(doc.typeParameters())));35 logger.debug("Parameters {}", Arrays.toString(doc.typeParameters())); 33 36 for (Type argument : doc.typeParameters()) { 34 37 processArgument(argument, generator, arguments, bounds, ignore, new HashSet<String>()); … … 42 45 43 46 private static void processArgument(Type argument, Generator generator, Collection<org.fluffnstuff.asdoclet.generator.Type> arguments, Map<String, org.fluffnstuff.asdoclet.generator.Type> bounds, Collection<String> ignore, Collection<String> visited) { 44 if (generator.isDebug()) System.out.println(MessageFormat.format("Processing argument {0} <{1}>", argument.qualifiedTypeName(), argument.getClass().getCanonicalName()));47 logger.debug("Processing argument {} <{}>", argument.qualifiedTypeName(), argument.getClass().getCanonicalName()); 45 48 46 49 org.fluffnstuff.asdoclet.generator.Type argumentType = getType(argument, generator, ignore, visited); … … 52 55 53 56 private static org.fluffnstuff.asdoclet.generator.Type getType(Type type, Generator generator, Collection<String> ignore, Collection<String> visited) { 54 if (generator.isDebug()) System.out.println(MessageFormat.format("Generating type {0} <{1}>", type.qualifiedTypeName(), type.getClass().getCanonicalName()));57 logger.debug("Generating type {} <{}>", type.qualifiedTypeName(), type.getClass().getCanonicalName()); 55 58 56 59 if (ignore.contains(type.qualifiedTypeName())) return org.fluffnstuff.asdoclet.generator.Type.NULL; … … 67 70 if (type instanceof ParameterizedType) { 68 71 ParameterizedType parameterizedType = type.asParameterizedType(); 69 if (generator.isDebug()) System.out.println(MessageFormat.format("Arguments {0}", Arrays.toString(parameterizedType.typeArguments())));72 logger.debug("Arguments {}", Arrays.toString(parameterizedType.typeArguments())); 70 73 for (Type argument : parameterizedType.typeArguments()) { 71 74 processArgument(argument, generator, arguments, bounds, ignore, visited); … … 73 76 } else if (type instanceof ClassDoc) { 74 77 ClassDoc classDoc = type.asClassDoc(); 75 if (generator.isDebug()) System.out.println(MessageFormat.format("Parameters {0}", Arrays.toString(classDoc.typeParameters())));78 logger.debug("Parameters {}", Arrays.toString(classDoc.typeParameters())); 76 79 for (Type argument : classDoc.typeParameters()) { 77 80 processArgument(argument, generator, arguments, bounds, ignore, visited); … … 142 145 143 146 if (bound != org.fluffnstuff.asdoclet.generator.Type.NULL) { 144 if (generator.isDebug()) System.out.println(MessageFormat.format("Adding boundary {0} extends {1} <{2}>", argument.qualifiedTypeName(), boundType.qualifiedTypeName(), boundType.getClass().getCanonicalName()));147 logger.debug("Adding boundary {} extends {} <{}>", new Object[]{argument.qualifiedTypeName(), boundType.qualifiedTypeName(), boundType.getClass().getCanonicalName()}); 145 148 bounds.put(argument.qualifiedTypeName(), bound); 146 149 } trunk/src/org/fluffnstuff/asdoclet/handler/InterfaceHandler.java
r82 r86 89 89 } 90 90 91 returnType.setTypeMap(typeMap); 92 91 93 org.fluffnstuff.asdoclet.generator.Type actualReturnType = returnType; 92 94 … … 111 113 asyncType = new org.fluffnstuff.asdoclet.generator.Type(callbackType, null, null, 0, false); 112 114 } 115 116 asyncType.setTypeMap(typeMap); 113 117 } 114 118 trunk/templates/cs/class.vm
r71 r86 5 5 *# 6 6 namespace $typeDescriptor.nameSpace { 7 #region AsDoclet generated code 7 8 #if($typeDescriptor.description) /** 8 9 * <summary> … … 38 39 #end 39 40 } 41 #endregion 40 42 } trunk/templates/cs/enum.vm
r71 r86 5 5 *# 6 6 namespace $typeDescriptor.nameSpace { 7 #region AsDoclet generated code 7 8 #if($typeDescriptor.description) /** 8 9 * <summary> … … 18 19 19 20 } 21 #endregion 20 22 } trunk/templates/cs/interface.vm
r71 r86 5 5 *# 6 6 namespace $typeDescriptor.nameSpace { 7 #region AsDoclet generated code 7 8 #if($typeDescriptor.description) /** 8 9 * <summary> … … 32 33 #end 33 34 } 35 #endregion 34 36 } trunk/templates/cs/proxy.vm
r79 r86 5 5 *# 6 6 namespace $typeDescriptor.nameSpace { 7 #region AsDoclet generated code 7 8 #if($typeDescriptor.description) /** 8 9 * <summary> … … 41 42 #end 42 43 } 44 #endregion 43 45 } trunk/test/TestAsdoclet.java
r82 r86 3 3 public class TestAsdoclet { 4 4 public static void main(String[] args) { 5 Main.execute(new String[]{"-d", "test/results/cs", "-doclet", "org.fluffnstuff.asdoclet.AsDoclet", "-generator", " actionscript", "asdoclet.test", "test/asdoclet/test/TestProxyInterface.java"});5 Main.execute(new String[]{"-d", "test/results/cs", "-doclet", "org.fluffnstuff.asdoclet.AsDoclet", "-generator", "cs", "asdoclet.test", "test/asdoclet/test/TestProxyInterface.java"}); 6 6 } 7 7 } trunk/test/asdoclet/test/TestProxyInterface.java
r82 r86 5 5 /** 6 6 * @actionscript.class proxy=<code>true</code> 7 * @cs.class proxy=<code>true</code> 7 * @cs.class proxy=<code>true</code> async=<code>true</code> async.callbacktype=AsyncCallback<$type$> 8 8 */ 9 9 public interface TestProxyInterface extends TestProxyInterfaceBase<Date> { trunk/test/asdoclet/test/TestProxyInterfaceBase.java
r82 r86 1 1 package asdoclet.test; 2 2 3 import java.util.Collection; 3 4 import java.util.Date; 4 5 … … 8 9 */ 9 10 public interface TestProxyInterfaceBase<T extends Date> extends TestProxyInterfaceGeneric { 10 voidfoo(T bar);11 Collection<T> foo(T bar); 11 12 } trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceBase.as
r82 r86 6 6 */ 7 7 public interface TestProxyInterfaceBase extends asdoclet.test.TestProxyInterfaceGeneric { 8 override function foo(bar:Date): void;8 override function foo(bar:Date):Array; 9 9 } 10 10 } trunk/test/expectations/actionscript/asdoclet/test/TestProxyInterfaceProxy.as
r82 r86 10 10 protected function onStatus(status:Object):void { 11 11 } 12 public function foo(bar:Date): void{13 dispatchCall(TestProxyInterfaceProxyEvents.Foo, bar);12 public function foo(bar:Date):Array { 13 return dispatchCall(TestProxyInterfaceProxyEvents.Foo, bar) as Array; 14 14 } 15 15 } trunk/test/expectations/cs/asdoclet/test/TestClassAnnotations.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 18 19 public virtual string NotAnnotatedProperty { get { return this.notAnnotatedProperty; } set { this.notAnnotatedProperty = value; } } 19 20 } 21 #endregion 20 22 } trunk/test/expectations/cs/asdoclet/test/TestException.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 13 14 public TestException(string message, System.Exception exception) : base(message, exception) {} 14 15 } 16 #endregion 15 17 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreClass.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 public virtual T Test { get { return this.test; } set { this.test = value; } } 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreGeneric.cs
r76 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 10 11 public class TestIgnoreGeneric : asdoclet.test.TestOverrideClass { 11 12 } 13 #endregion 12 14 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreInClass.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 public virtual T Test { get { return this.test; } set { this.test = value; } } 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreInClassBase.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 10 11 public class TestIgnoreInClassBase<T> { 11 12 } 13 #endregion 12 14 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreInInterface.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 void TestMethod(); 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreInInterfaceBase.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 10 11 public interface TestIgnoreInInterfaceBase<T> { 11 12 } 13 #endregion 12 14 } trunk/test/expectations/cs/asdoclet/test/TestIgnoreInterface.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 void TestMethod(); 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestInterfaceAnnotations.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 16 17 void NotAnnotatedMethod(); 17 18 } 19 #endregion 18 20 } trunk/test/expectations/cs/asdoclet/test/TestInterfaceGeneric.cs
r81 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 11 12 void Foo(A bar, B baz); 12 13 } 14 #endregion 13 15 } trunk/test/expectations/cs/asdoclet/test/TestOverrideClass.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 public override T Test { get { return this.test; } set { this.test = value; } } 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestOverrideClassBase.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 public virtual T Test { get { return this.test; } set { this.test = value; } } 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestOverrideInterface.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 void TestMethod(); 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestOverrideInterfaceBase.cs
r71 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 12 13 void TestMethod(); 13 14 } 15 #endregion 14 16 } trunk/test/expectations/cs/asdoclet/test/TestProxyInterface.cs
r82 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 10 11 public interface TestProxyInterface : asdoclet.test.TestProxyInterfaceBase<java.sql.Date> { 11 12 } 13 #endregion 12 14 } trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceBase.cs
r82 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 9 10 */ 10 11 public interface TestProxyInterfaceBase<T> : asdoclet.test.TestProxyInterfaceGeneric where T : System.DateTime? { 11 voidFoo(T bar);12 System.Collections.Generic.ICollection<T> Foo(T bar); 12 13 } 14 #endregion 13 15 } trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceGeneric.cs
r79 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 /** 5 6 * <summary> … … 11 12 void Foo(string bar); 12 13 } 14 #endregion 13 15 } trunk/test/expectations/cs/asdoclet/test/TestProxyInterfaceProxy.cs
r82 r86 2 2 3 3 namespace asdoclet.test { 4 #region AsDoclet generated code 4 5 public class TestProxyInterfaceProxy : asdoclet.test.TestProxyInterface { 5 6 protected virtual T DispatchCall<T>(string methodName, params object[] args) { … … 10 11 } 11 12 12 virtual public void Foo( java.sql.Date bar) {13 DispatchCall<object>("foo", bar);13 virtual public void Foo(AsyncCallback<System.Collections.Generic.ICollection<java.sql.Date>> async, java.sql.Date bar) { 14 BeginDispatchCall<System.Collections.Generic.ICollection<java.sql.Date>>("foo", async, bar); 14 15 } 15 virtual public void Foo( string bar) {16 DispatchCall<object>("foo", bar);16 virtual public void Foo(AsyncCallback async, string bar) { 17 BeginDispatchCall<object>("foo", async, bar); 17 18 } 18 19 } 20 #endregion 19 21 }