Commit 41425cd3 authored by Lionel Seinturier's avatar Lionel Seinturier

Moving to Juliac 2.1.5.

parent 328fbaf6
......@@ -5,6 +5,7 @@ Tinfi 0.4.4
* support unannotated POJO component implementations
* bug fix for intent handlers on component with client interfaces
(bug reported by Nicolas D.)
* move to Juliac 2.1.5
Tinfi 0.4.3
......
......@@ -28,7 +28,7 @@ import java.lang.reflect.Modifier;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Type;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.JuliacItf;
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;
......@@ -56,7 +56,7 @@ extends AbstractProxyClassGenerator {
public CallBackInterfaceClassGenerator(
InterfaceType it, MembraneDesc membraneDesc, boolean mergeable,
JuliacItf jc ) {
Juliac jc ) {
super(it,membraneDesc,mergeable,jc);
}
......
......@@ -26,7 +26,7 @@ package org.ow2.frascati.tinfi.juliac;
import java.lang.reflect.Modifier;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.JuliacItf;
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;
......@@ -58,7 +58,7 @@ extends AbstractProxyClassGenerator {
public CallableReferenceClassGenerator(
InterfaceType it, MembraneDesc membraneDesc, boolean mergeable,
JuliacItf jc ) {
Juliac jc ) {
super(it,membraneDesc,mergeable,jc);
}
......
......@@ -40,6 +40,7 @@ import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException;
import org.objectweb.fractal.juliac.proxy.AttributeControllerClassGenerator;
import org.objectweb.fractal.juliac.proxy.InterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.osoa.sca.annotations.Callback;
......@@ -138,13 +139,24 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
* with this component source code generator.
*/
@Override
protected InitializerClassGenerator[] getInitializerSourceCodeGenerators() {
return
new InitializerClassGenerator[]{
new InitializerOOCtrlClassGenerator()
};
protected InitializerClassGenerator getInitializerSourceCodeGenerator() {
return new InitializerOOCtrlClassGenerator();
}
/**
* Return the source code generator for component interfaces.
*/
@Override
public ProxyClassGenerator getInterfaceSourceCodeGenerator(
InterfaceType it, MembraneDesc membraneDesc ) {
String ctrlDesc = membraneDesc.getDescriptor();
InterfaceSourceCodeGeneratorFactory iscgf =
new InterfaceSourceCodeGeneratorFactory(it,ctrlDesc,membraneDesc,jc);
ProxyClassGenerator pcg = iscgf.getInterfaceSourceCodeGenerator();
return pcg;
}
/**
* Generate the source code of component interfaces associated with the
* specified interface type.
......@@ -203,7 +215,9 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
Callback annot = cl.getAnnotation(Callback.class);
if( annot != null ) {
Class<?> cbcl = annot.value();
InterfaceType cbit = new BasicInterfaceType("callback",cbcl.getName(),false,false,false);
InterfaceType cbit =
new BasicInterfaceType(
"callback", cbcl.getName(), false, false, false );
cg = new CallableReferenceClassGenerator(cbit,null,false,jc);
jc.generateSourceCode(cg);
......
......@@ -23,9 +23,7 @@
package org.ow2.frascati.tinfi.juliac;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Utils;
import org.objectweb.fractal.juliac.proxy.ProxyClassGenerator;
import org.objectweb.fractal.juliac.visit.MethodSourceCodeVisitor;
/**
......@@ -40,20 +38,6 @@ import org.objectweb.fractal.juliac.visit.MethodSourceCodeVisitor;
public class InitializerOOCtrlClassGenerator
extends org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator {
/**
* Return the source code generator for interfaces.
*/
@Override
protected ProxyClassGenerator getInterfaceSourceCodeGenerator(
InterfaceType it ) {
String ctrlDesc = membraneDesc.getDescriptor();
InterfaceSourceCodeGeneratorFactory iscgf =
new InterfaceSourceCodeGeneratorFactory(it,ctrlDesc,membraneDesc,jc);
ProxyClassGenerator pcg = iscgf.getInterfaceSourceCodeGenerator();
return pcg;
}
@Override
protected void generateNewFcContentMethod( MethodSourceCodeVisitor mv ) {
mv.visitln(" return null;");
......
......@@ -30,7 +30,7 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.julia.ComponentInterface;
import org.objectweb.fractal.julia.type.BasicInterfaceType;
import org.objectweb.fractal.juliac.ClassGenerator;
import org.objectweb.fractal.juliac.JuliacItf;
import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.Utils;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
......@@ -66,7 +66,7 @@ extends AbstractProxyClassGenerator {
public ServiceReferenceClassGenerator(
InterfaceType it, MembraneDesc membraneDesc, boolean mergeable,
JuliacItf jc ) {
Juliac jc ) {
super(it,membraneDesc,mergeable,jc);
}
......
......@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>juliac-membranes-julia-oo</artifactId>
<artifactId>juliac-julia-membranes-oo</artifactId>
<version>${juliac.version}</version>
</dependency>
<dependency>
......
......@@ -14,7 +14,7 @@
<properties>
<julia.version>2.5.2</julia.version>
<juliac.version>2.1.4</juliac.version>
<juliac.version>2.1.5</juliac.version>
</properties>
<modules>
......
Markdown is supported
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