Commit 14a0bfc7 authored by Lionel Seinturier's avatar Lionel Seinturier
Browse files

Reintroduce the resolution mechanism for generic types.

parent bc1e382b
......@@ -102,7 +102,7 @@ extends AbstractInterceptorSourceCodeGenerator {
bv.visitln(" METHODS = new java.lang.reflect.Method[]{");
// Iterate on methods
String proxyclname = proxycl.getName();
String proxyclname = proxycl.toString(proxycl.cl);
for (int i = 0; i < proxymethods.length; i++) {
UCMethod proxym = proxymethods[i];
......
......@@ -212,7 +212,7 @@ extends AbstractProxyClassGenerator {
if( ! rtype.getName().equals("void") ) {
final String msg =
"@OneWay annotated method "+proxym.toString()+" in "+
proxycl.getName()+" should return void";
proxycl.toString(proxycl.cl)+" should return void";
throw new TinfiRuntimeException(msg);
}
mv.visitln(" new Thread() {");
......
......@@ -307,14 +307,14 @@ public class TinfiParserSupportImpl implements ADLParserSupportItf {
controllerDesc.equals(Constants.class) ) {
final String msg =
"Both controller and controllerDesc cannot be null in "+
mAnnot+" for class "+uc.getName();
mAnnot+" for class "+uc.toString(uc.cl);
throw new IOException(msg);
}
// Custom membrane specified with @Membrane(controllerDesc=...)
if( ! controllerDesc.equals(Constants.class) ) {
Class<?> cl =
MembraneHelper.getMembraneDef(mAnnot,uc.getName());
MembraneHelper.getMembraneDef(mAnnot,uc.toString(uc.cl));
Membrane mdef = cl.getAnnotation(Membrane.class);
controller = mdef.desc();
JuliacConfig jconf = jc.getJuliacConfig();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment