Commit f48a858b authored by Lionel Seinturier's avatar Lionel Seinturier
Browse files

Refactoring towards removing the unified class framework.

parent d4f44cd1
......@@ -40,7 +40,7 @@ import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.ucf.UnifiedClassHelper;
import org.ow2.frascati.tinfi.opt.oo.CallBackInterfaceClassGenerator;
import org.ow2.frascati.tinfi.opt.oo.ClientInterfaceClassGenerator;
......@@ -205,7 +205,7 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator {
// ServiceReference and input interface implementations for callbacks
String signature = it.getFcItfSignature();
UnifiedClass cl = jc.create(signature);
UClass cl = jc.create(signature);
Annotation annot =
UnifiedClassHelper.getAnnotation(
cl,
......
......@@ -31,8 +31,8 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.osoa.sca.annotations.EndsConversation;
......@@ -74,7 +74,7 @@ extends AbstractProxyClassGenerator {
@Override
public void setMergeable( boolean mergeable ) {
if(mergeable) {
String msg = "This generator cannot generate mergeable code";
final String msg = "This generator cannot generate mergeable code";
throw new IllegalArgumentException(msg);
}
}
......@@ -95,11 +95,12 @@ extends AbstractProxyClassGenerator {
}
@Override
public void generateConstructors( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateConstructors( ClassSourceCodeVisitor cv, UClass proxycl ) {
super.generateConstructors(cv, proxycl);
// public constructor()
BlockSourceCodeVisitor mv = cv.visitConstructor(Modifier.PUBLIC,null,null,null);
BlockSourceCodeVisitor mv =
cv.visitConstructor(Modifier.PUBLIC,null,null,null);
mv.visitEnd();
// public constructor(Component,String,Type,boolean,Object)
......@@ -118,7 +119,7 @@ extends AbstractProxyClassGenerator {
@Override
public void generateProxyMethodBodyBeforeCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
/*
* Regiqter the request context and get the content instance which
......@@ -136,7 +137,7 @@ extends AbstractProxyClassGenerator {
@Override
public void generateProxyMethodBodyAfterCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
// End of the try block
mv.visitln(" }");
......@@ -144,7 +145,7 @@ extends AbstractProxyClassGenerator {
// Release the content instance
mv.visit(" releaseContent(impl,");
if( proxym.getAnnotation(EndsConversation.class) == null ) {
if( proxym.method.getAnnotation(EndsConversation.class) == null ) {
mv.visit("false");
}
else {
......@@ -156,7 +157,7 @@ extends AbstractProxyClassGenerator {
mv.visitln(" }");
}
public String getDelegatingInstance( UnifiedClass proxycl, UnifiedMethod proxym ) {
public String getDelegatingInstance( UClass proxycl, UCMethod proxym ) {
return "impl";
}
}
......@@ -31,9 +31,9 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.TypeGeneratorItf;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.StringHelper;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentOutInterface;
......@@ -77,10 +77,10 @@ extends ServerInterfaceClassGenerator {
/*
* Add type parameters if any.
*/
UnifiedClass proxycl = jc.create(it.getFcItfSignature());
String[] tpnames = proxycl.getTypeParameterNames();
UClass proxycl = jc.create(it.getFcItfSignature());
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
name += s;
}
......@@ -105,7 +105,7 @@ extends ServerInterfaceClassGenerator {
}
@Override
public void generateMethods( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateMethods( ClassSourceCodeVisitor cv, UClass proxycl ) {
super.generateMethods(cv, proxycl);
......@@ -127,7 +127,7 @@ extends ServerInterfaceClassGenerator {
@Override
public void generateProxyMethod(
ClassSourceCodeVisitor cv, UnifiedClass proxycl, UnifiedMethod proxym ) {
ClassSourceCodeVisitor cv, UClass proxycl, UCMethod proxym ) {
/*
* Indeed nothing.
* Proxy methods are inherited from the component server interface
......
......@@ -36,7 +36,7 @@ import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.ucf.UnifiedClassHelper;
/**
......@@ -190,7 +190,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
// ServiceReference and input interface implementations for callbacks
String signature = it.getFcItfSignature();
UnifiedClass cl = jc.create(signature);
UClass cl = jc.create(signature);
Annotation annot =
UnifiedClassHelper.getAnnotation(
cl,
......
......@@ -23,8 +23,9 @@
package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
......@@ -45,13 +46,13 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator {
}
@Override
public String getDelegatingInstance( UnifiedClass proxycl, UnifiedMethod proxym ) {
public String getDelegatingInstance( UClass proxycl, UCMethod proxym ) {
return "impl";
}
@Override
public void generateProxyMethodBodyDelegatingCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
String rtypename = proxym.getGenericReturnType();
......@@ -60,16 +61,16 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator {
mv.visitln(" Object ret = null;");
}
else {
UnifiedClass rtype = proxym.getReturnType();
if( rtype.isPrimitive() ) {
UClass rtype = proxym.getReturnType();
if( rtype.cl.isPrimitive() ) {
mv.visitln(" Object proceed = ijp.proceed();");
mv.visit (" ");
mv.visit (rtypename);
mv.visit (" ret = (proceed==null) ? ");
String nul = rtype.getNullValue();
String nul = ClassHelper.getNullValue(rtype.cl);
mv.visit (nul);
mv.visit (" : (");
UnifiedClass boxed = rtype.box();
UClass boxed = rtype.box();
mv.visit (boxed.getName());
mv.visitln(")proceed;");
}
......@@ -91,7 +92,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator {
* @since 1.1.1
*/
@Override
public void generateFieldImpl( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateFieldImpl( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* The implementation of the impl field is inherited from
* TinfiComponentInterceptor.
......@@ -102,7 +103,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator {
* @since 1.1.1
*/
@Override
public void generateMethodGetFcItfDelegate( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateMethodGetFcItfDelegate( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* The implementation of the getFcItfDelegate method is inherited from
* TinfiComponentInterceptor.
......@@ -113,7 +114,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator {
* @since 1.1.1
*/
@Override
public void generateMethodSetFcItfDelegate( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateMethodSetFcItfDelegate( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* The implementation of the setFcItfDelegate method is inherited from
* TinfiComponentInterceptor.
......
......@@ -27,10 +27,10 @@ package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.StringHelper;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.osoa.sca.annotations.EndsConversation;
......@@ -87,14 +87,14 @@ extends AbstractInterceptorSourceCodeGenerator {
@Override
public void setMergeable( boolean mergeable ) {
if(mergeable) {
String msg = "This generator can not generate mergeable code";
final String msg = "This generator cannot generate mergeable code";
throw new IllegalArgumentException(msg);
}
}
@Override
public void generateProxyMethodBodyBeforeCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
/*
* Regiqter the request context and get the content instance which
......@@ -102,9 +102,9 @@ extends AbstractInterceptorSourceCodeGenerator {
*/
mv.visit (" ");
mv.visit (it.getFcItfSignature());
String[] tpnames = proxycl.getTypeParameterNames();
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
mv.visit(s);
}
mv.visit (" impl = setRequestContextAndGet(\"");
......@@ -119,7 +119,7 @@ extends AbstractInterceptorSourceCodeGenerator {
@Override
public void generateProxyMethodBodyFinallyCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
// End of the try block
mv.visitln(" }");
......@@ -127,7 +127,7 @@ extends AbstractInterceptorSourceCodeGenerator {
// Release the content instance
mv.visit(" releaseContent(impl,");
if( proxym.getAnnotation(EndsConversation.class) == null ) {
if( proxym.method.getAnnotation(EndsConversation.class) == null ) {
mv.visit("false");
}
else {
......
......@@ -31,8 +31,8 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.IntentJoinPointImpl;
......@@ -81,19 +81,19 @@ extends AbstractInterceptorSourceCodeGenerator {
@Override
public void setMergeable( boolean mergeable ) {
if(mergeable) {
String msg = "This generator can not generate mergeable code";
final String msg = "This generator cannot generate mergeable code";
throw new IllegalArgumentException(msg);
}
}
@Override
public void generateStaticParts( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateStaticParts( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* Initialize the METHODS field (declared below in method
* generateFields).
*/
UnifiedMethod[] proxymethods = proxycl.getMethods();
UCMethod[] proxymethods = proxycl.getMethods();
BlockSourceCodeVisitor bv = cv.visitStaticPart();
if( proxymethods.length > 0 ) {
bv.visitln(" try {");
......@@ -104,16 +104,16 @@ extends AbstractInterceptorSourceCodeGenerator {
String proxyclname = proxycl.getName();
for (int i = 0; i < proxymethods.length; i++) {
UnifiedMethod proxym = proxymethods[i];
UCMethod proxym = proxymethods[i];
String proxymname = proxym.getName();
UnifiedClass[] paramtypes = proxym.getParameterTypes();
UClass[] paramtypes = proxym.getParameterTypes();
bv.visit(" ");
bv.visit(proxyclname);
bv.visit(".class.getMethod(\"");
bv.visit(proxymname);
bv.visit("\"");
for (UnifiedClass paramtype : paramtypes) {
for (UClass paramtype : paramtypes) {
String paramtypename = paramtype.getName();
bv.visit(",");
bv.visit(paramtypename);
......@@ -135,7 +135,7 @@ extends AbstractInterceptorSourceCodeGenerator {
}
@Override
public void generateFields( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateFields( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* Generate a METHODS field to store the array of component methods
......@@ -252,27 +252,27 @@ extends AbstractInterceptorSourceCodeGenerator {
}
@Override
public void generateMethodInitFcController( BlockSourceCodeVisitor mv, UnifiedClass proxycl ) {
public void generateMethodInitFcController( BlockSourceCodeVisitor mv, UClass proxycl ) {
mv.visitln(" initIntentHandlersMap(METHODS);");
}
@Override
public void generateMethodClone( BlockSourceCodeVisitor mv, UnifiedClass proxycl ) {
public void generateMethodClone( BlockSourceCodeVisitor mv, UClass proxycl ) {
mv.visitln(" clone.initIntentHandlersMap(METHODS);");
}
@Override
public void generateProxyMethodBodyBeforeCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
/*
* Retrieve the index of proxym in the array of methods for proxycl.
*/
int idx = -1;
String proxymstring = proxym.toString();
UnifiedMethod[] ums = proxycl.getMethods();
UCMethod[] ums = proxycl.getMethods();
for (int i = 0; i < ums.length; i++) {
UnifiedMethod um = ums[i];
UCMethod um = ums[i];
String umstring = um.toString();
if( umstring.equals(proxymstring) ) {
idx = i;
......@@ -280,7 +280,7 @@ extends AbstractInterceptorSourceCodeGenerator {
}
}
if( idx == -1 ) {
String msg =
final String msg =
proxym+" should have been found in the array of methods of "+
proxycl;
throw new TinfiRuntimeException(msg);
......@@ -301,7 +301,7 @@ extends AbstractInterceptorSourceCodeGenerator {
* instance and directly call the delegate.
*/
String proxymname = proxym.getName();
UnifiedClass[] ptypes = proxym.getParameterTypes();
UClass[] ptypes = proxym.getParameterTypes();
String rtypename = proxym.getGenericReturnType();
String[] tpnames = proxym.getTypeParameterNames();
......@@ -380,7 +380,7 @@ extends AbstractInterceptorSourceCodeGenerator {
@Override
public void generateProxyMethodBodyFinallyCode(
BlockSourceCodeVisitor mv, UnifiedClass proxycl, UnifiedMethod proxym ) {
BlockSourceCodeVisitor mv, UClass proxycl, UCMethod proxym ) {
// End of else block
mv.visitln(" }");
......@@ -390,8 +390,8 @@ extends AbstractInterceptorSourceCodeGenerator {
mv.visitln(" catch( Throwable t ) {");
// Handle exceptions thrown by the method
UnifiedClass[] excepts = proxym.getExceptionTypes();
for (UnifiedClass except : excepts) {
UClass[] excepts = proxym.getExceptionTypes();
for (UClass except : excepts) {
mv.visit (" if( t instanceof ");
mv.visit (except.getName());
mv.visitln(" ) {");
......
......@@ -26,9 +26,9 @@ package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.StringHelper;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
......@@ -90,10 +90,10 @@ extends AbstractInterceptorSourceCodeGenerator {
/*
* Add type parameters if any.
*/
UnifiedClass proxycl = jc.create(signature);
String[] tpnames = proxycl.getTypeParameterNames();
UClass proxycl = jc.create(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
sb.append(s);
}
......@@ -102,12 +102,12 @@ extends AbstractInterceptorSourceCodeGenerator {
}
@Override
public void generateMethodInitFcController( BlockSourceCodeVisitor mv, UnifiedClass proxycl ) {
public void generateMethodInitFcController( BlockSourceCodeVisitor mv, UClass proxycl ) {
mv.visitIns("super.initFcController(ic)");
}
@Override
public void generateMethodClone( BlockSourceCodeVisitor mv, UnifiedClass proxycl ) {
public void generateMethodClone( BlockSourceCodeVisitor mv, UClass proxycl ) {
mv.visitIns("initFcClone(clone)");
}
}
......@@ -27,9 +27,9 @@ package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.StringHelper;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterface;
......@@ -71,10 +71,10 @@ extends InterfaceImplementationClassGenerator {
*/
String signature = it.getFcItfSignature();
sb.append(signature);
UnifiedClass proxycl = jc.create(signature);
String[] tpnames = proxycl.getTypeParameterNames();
UClass proxycl = jc.create(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
sb.append(s);
}
......@@ -83,7 +83,7 @@ extends InterfaceImplementationClassGenerator {
}
@Override
public void generateFieldImpl( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateFieldImpl( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* Indeed nothing.
* The field is managed by TinfiComponentInterface.
......@@ -91,7 +91,7 @@ extends InterfaceImplementationClassGenerator {
}
@Override
public void generateMethodGetFcItfImpl( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateMethodGetFcItfImpl( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* Indeed nothing.
* The method is inherited from TinfiComponentInterface.
......@@ -99,7 +99,7 @@ extends InterfaceImplementationClassGenerator {
}
@Override
public void generateMethodSetFcItfImpl( ClassSourceCodeVisitor cv, UnifiedClass proxycl ) {
public void generateMethodSetFcItfImpl( ClassSourceCodeVisitor cv, UClass proxycl ) {
/*
* Indeed nothing.
* The method is inherited from TinfiComponentInterface.
......
......@@ -35,13 +35,14 @@ import org.objectweb.fractal.julia.type.BasicInterfaceType;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.TypeGeneratorItf;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.helper.InterfaceTypeHelper;
import org.objectweb.fractal.juliac.helper.StringHelper;
import org.objectweb.fractal.juliac.helper.MethodHelper;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UCMethod;
import org.objectweb.fractal.juliac.ucf.UClass;
import org.objectweb.fractal.juliac.ucf.UnifiedClassHelper;
import org.objectweb.fractal.juliac.ucf.UnifiedMethod;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.osoa.sca.annotations.Conversational;
......@@ -86,7 +87,7 @@ extends AbstractProxyClassGenerator {
@Override
public void setMergeable( boolean mergeable ) {
if(mergeable) {
String msg = "This generator can not generate mergeable code";
final String msg = "This generator cannot generate mergeable code";
throw new IllegalArgumentException(msg);
}
}
......@@ -103,10 +104,10 @@ extends AbstractProxyClassGenerator {
*/
String signature = it.getFcItfSignature();
sb.append(signature);
UnifiedClass proxycl = jc.create(signature);
String[] tpnames = proxycl.getTypeParameterNames();
UClass proxycl = jc.create(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
sb.append(s);
}
......@@ -122,10 +123,10 @@ extends AbstractProxyClassGenerator {
* if any.
*/
String signature = it.getFcItfSignature();
UnifiedClass proxycl = jc.create(signature);
String[] tpnames = proxycl.getTypeParameterNames();
UClass proxycl = jc.create(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl.cl);
if( tpnames.length != 0 ) {
String s = StringHelper.getTypeParameterNamesSignature(tpnames);
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);