Commit 72d027f7 authored by Lionel Seinturier's avatar Lionel Seinturier
Browse files

Remove duplicate method for class loading.

parent 1aacddce
......@@ -204,7 +204,7 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator {
// ServiceReference and input interface implementations for callbacks
String signature = it.getFcItfSignature();
Class<?> cl = jc.create(signature);
Class<?> cl = jc.loacClass(signature);
Annotation annot =
ClassHelper.getAnnotation(
cl,
......
......@@ -76,7 +76,7 @@ extends ServerInterfaceClassGenerator {
/*
* Add type parameters if any.
*/
Class<?> proxycl = jc.create(it.getFcItfSignature());
Class<?> proxycl = jc.loacClass(it.getFcItfSignature());
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl);
if( tpnames.length != 0 ) {
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
......
......@@ -189,7 +189,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
// ServiceReference and input interface implementations for callbacks
String signature = it.getFcItfSignature();
Class<?> cl = jc.create(signature);
Class<?> cl = jc.loacClass(signature);
Annotation annot =
ClassHelper.getAnnotation(
cl,
......
......@@ -89,7 +89,7 @@ extends AbstractInterceptorSourceCodeGenerator {
/*
* Add type parameters if any.
*/
Class<?> proxycl = jc.create(signature);
Class<?> proxycl = jc.loacClass(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl);
if( tpnames.length != 0 ) {
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
......
......@@ -70,7 +70,7 @@ extends InterfaceImplementationClassGenerator {
*/
String signature = it.getFcItfSignature();
sb.append(signature);
Class<?> proxycl = jc.create(signature);
Class<?> proxycl = jc.loacClass(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl);
if( tpnames.length != 0 ) {
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
......
......@@ -103,7 +103,7 @@ extends AbstractProxyClassGenerator {
*/
String signature = it.getFcItfSignature();
sb.append(signature);
Class<?> proxycl = jc.create(signature);
Class<?> proxycl = jc.loacClass(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl);
if( tpnames.length != 0 ) {
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
......@@ -122,7 +122,7 @@ extends AbstractProxyClassGenerator {
* if any.
*/
String signature = it.getFcItfSignature();
Class<?> proxycl = jc.create(signature);
Class<?> proxycl = jc.loacClass(signature);
String[] tpnames = ClassHelper.getTypeParameterNames(proxycl);
if( tpnames.length != 0 ) {
String s = ClassHelper.getTypeParameterNamesSignature(tpnames);
......
......@@ -74,7 +74,7 @@ extends org.ow2.frascati.tinfi.opt.oo.InitializerOOCtrlClassGenerator {
for (ControllerDesc ctrlDesc : ctrlDescs) {
String ctrlImplName = ctrlDesc.getImplName();
Class<?> cl = jc.create(ctrlImplName);
Class<?> cl = jc.loacClass(ctrlImplName);
if( SCAExtendedContentController.class.isAssignableFrom(cl) ) {
// SCA Content Controller
String contentClassName = (String) contentDesc;
......
......@@ -54,7 +54,6 @@ import org.objectweb.fractal.julia.InitializationContext;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.TypeGeneratorItf;
import org.objectweb.fractal.juliac.conf.Constants;
import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.helper.ClassHelper;
import org.objectweb.fractal.juliac.helper.MemberHelper;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
......@@ -108,9 +107,7 @@ extends ClassGenerator {
public static TypeGeneratorItf get( Juliac jc, String contentClassName )
throws IllegalContentClassMetaData {
JuliacConfig jconf = jc.getJuliacConfig();
Class<?> cl = jconf.load(contentClassName);
Class<?> cl = jc.loacClass(contentClassName);
ContentClassMetaData ccmd = ContentClassMetaData.get(cl);
TypeGeneratorItf scacccg = null;
......
......@@ -121,7 +121,7 @@ public class TinfiParserSupportImpl implements ADLParserSupportItf {
public boolean acceptADLDesc( String adl ) {
try {
// Check that the ADL corresponds to a class that can be loaded
jc.create(adl);
jc.loacClass(adl);
return true;
}
catch( RuntimeClassNotFoundException cnfe ) {
......@@ -155,7 +155,7 @@ public class TinfiParserSupportImpl implements ADLParserSupportItf {
/*
* adl contains the name of the SCA annotated component implementation.
*/
Class<?> cl = jc.create(adl);
Class<?> cl = jc.loacClass(adl);
/*
* Retrieve provided services declared by the @Service annotation.
......@@ -241,7 +241,7 @@ public class TinfiParserSupportImpl implements ADLParserSupportItf {
}
String reftypename =
strs[1].substring(0,strs[1].length()-1); // remove trailing >
reftype = jc.create(reftypename);
reftype = jc.loacClass(reftypename);
}
else {
reftype = fieldtype;
......
......@@ -131,7 +131,7 @@ public class SCAUltraMerge extends AbstractUltraMerge {
CtField<?> ctfield = umfield.getCtField();
CtTypeReference<?> tref = ctfield.getType();
String qname = tref.getQualifiedName();
Class<?> umclass = jc.create(qname);
Class<?> umclass = jc.loacClass(qname);
/*
* Fields of type List hold references for collection references.
......@@ -146,7 +146,7 @@ public class SCAUltraMerge extends AbstractUltraMerge {
CtField<?> ctfield = umfield.getCtField();
CtTypeReference<?> tref = ctfield.getType();
String qname = tref.getQualifiedName();
Class<?> umclass = jc.create(qname);
Class<?> umclass = jc.loacClass(qname);
/*
* Fields of type List hold references for collection references.
......@@ -251,7 +251,7 @@ public class SCAUltraMerge extends AbstractUltraMerge {
CtClass<?> ctclass = umclass.getCtClass();
String umclassname = ctclass.getQualifiedName();
Class<?> cl = jc.create(umclassname);
Class<?> cl = jc.loacClass(umclassname);
Scope scope = cl.getAnnotation(Scope.class);
if ( scope != null ) {
......
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