Commit 883bd1f0 authored by seinturi's avatar seinturi

Refactor: change the type of the genericity parameter from the controller...

Refactor: change the type of the genericity parameter from the controller descriptor to the membrane descriptor.
parent ab51d04e
...@@ -40,10 +40,9 @@ import org.objectweb.fractal.juliac.commons.lang.ClassHelper; ...@@ -40,10 +40,9 @@ import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper; import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper;
import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.conf.JulietLoader; import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.objectweb.fractal.juliac.desc.ComponentDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException; import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException;
import org.objectweb.fractal.juliac.opt.InitializerClassGenerator; import org.objectweb.fractal.juliac.opt.InitializerClassGenerator;
import org.objectweb.fractal.juliac.opt.comp.CompBasedMembraneDesc;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator; import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf; import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf;
import org.ow2.frascati.tinfi.opt.oo.CallBackInterfaceClassGenerator; import org.ow2.frascati.tinfi.opt.oo.CallBackInterfaceClassGenerator;
...@@ -110,10 +109,10 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator { ...@@ -110,10 +109,10 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator {
* with this component source code generator. * with this component source code generator.
*/ */
@Override @Override
protected InitializerClassGenerator<ComponentDesc> protected InitializerClassGenerator<CompBasedMembraneDesc>
getInitializerClassGenerator( getInitializerClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<ComponentDesc> fcscg, Juliac jc, FCSourceCodeGeneratorItf<CompBasedMembraneDesc> fcscg,
MembraneDesc<ComponentDesc> membraneDesc, ComponentType ct, CompBasedMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
return new InitializerCompCtrlClassGenerator( return new InitializerCompCtrlClassGenerator(
......
...@@ -28,8 +28,7 @@ import org.objectweb.fractal.api.type.ComponentType; ...@@ -28,8 +28,7 @@ import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ComponentDesc; import org.objectweb.fractal.juliac.opt.comp.CompBasedMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
...@@ -46,8 +45,8 @@ public class InitializerCompCtrlClassGenerator ...@@ -46,8 +45,8 @@ public class InitializerCompCtrlClassGenerator
extends org.objectweb.fractal.juliac.opt.comp.InitializerCompCtrlClassGenerator { extends org.objectweb.fractal.juliac.opt.comp.InitializerCompCtrlClassGenerator {
public InitializerCompCtrlClassGenerator( public InitializerCompCtrlClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<ComponentDesc> fcscg, Juliac jc, FCSourceCodeGeneratorItf<CompBasedMembraneDesc> fcscg,
MembraneDesc<ComponentDesc> membraneDesc, ComponentType ct, CompBasedMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
super(jc,fcscg,membraneDesc,ct,contentDesc); super(jc,fcscg,membraneDesc,ct,contentDesc);
......
...@@ -25,7 +25,6 @@ package org.ow2.frascati.tinfi.opt.oo; ...@@ -25,7 +25,6 @@ package org.ow2.frascati.tinfi.opt.oo;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.List;
import org.oasisopen.sca.annotation.Callback; import org.oasisopen.sca.annotation.Callback;
import org.objectweb.fractal.api.type.ComponentType; import org.objectweb.fractal.api.type.ComponentType;
...@@ -38,8 +37,7 @@ import org.objectweb.fractal.juliac.commons.lang.ClassHelper; ...@@ -38,8 +37,7 @@ import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper; import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper;
import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.conf.JulietLoader; import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator; import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf; import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf;
...@@ -96,8 +94,8 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -96,8 +94,8 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
*/ */
@Override @Override
protected InitializerOOCtrlClassGenerator getInitializerClassGenerator( protected InitializerOOCtrlClassGenerator getInitializerClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
return new InitializerOOCtrlClassGenerator( return new InitializerOOCtrlClassGenerator(
......
...@@ -23,15 +23,12 @@ ...@@ -23,15 +23,12 @@
package org.ow2.frascati.tinfi.opt.oo; package org.ow2.frascati.tinfi.opt.oo;
import java.util.List;
import org.objectweb.fractal.api.factory.InstantiationException; import org.objectweb.fractal.api.factory.InstantiationException;
import org.objectweb.fractal.api.type.ComponentType; import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.JuliacHelper; import org.objectweb.fractal.juliac.helper.JuliacHelper;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
...@@ -49,8 +46,8 @@ public class InitializerOOCtrlClassGenerator ...@@ -49,8 +46,8 @@ public class InitializerOOCtrlClassGenerator
extends org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator { extends org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator {
public InitializerOOCtrlClassGenerator( public InitializerOOCtrlClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
super(jc,fcscg,membraneDesc,ct,contentDesc); super(jc,fcscg,membraneDesc,ct,contentDesc);
......
...@@ -23,14 +23,11 @@ ...@@ -23,14 +23,11 @@
package org.ow2.frascati.tinfi.opt.oo; package org.ow2.frascati.tinfi.opt.oo;
import java.util.List;
import org.objectweb.fractal.api.type.ComponentType; import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator; import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
...@@ -47,9 +44,9 @@ public class MembraneInitializerOOCtrlClassGenerator ...@@ -47,9 +44,9 @@ public class MembraneInitializerOOCtrlClassGenerator
extends org.objectweb.fractal.juliac.opt.oo.MembraneInitializerOOCtrlClassGenerator { extends org.objectweb.fractal.juliac.opt.oo.MembraneInitializerOOCtrlClassGenerator {
public MembraneInitializerOOCtrlClassGenerator( public MembraneInitializerOOCtrlClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
InitializerOOCtrlClassGenerator icg, InitializerOOCtrlClassGenerator icg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
super(jc,fcscg,icg,membraneDesc,ct,contentDesc); super(jc,fcscg,icg,membraneDesc,ct,contentDesc);
......
...@@ -24,14 +24,12 @@ ...@@ -24,14 +24,12 @@
package org.ow2.frascati.tinfi.opt.oo.light; package org.ow2.frascati.tinfi.opt.oo.light;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import org.objectweb.fractal.api.type.ComponentType; import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData; import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData;
/** /**
...@@ -67,7 +65,7 @@ extends org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -67,7 +65,7 @@ extends org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator {
* @return data about the membrane implementation * @return data about the membrane implementation
*/ */
@Override @Override
public MembraneDesc<List<ControllerDesc>> generateMembraneImpl( public SimpleMembraneDesc generateMembraneImpl(
ComponentType ct, String ctrldesc, String contentClassName ) ComponentType ct, String ctrldesc, String contentClassName )
throws IOException { throws IOException {
...@@ -82,8 +80,8 @@ extends org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -82,8 +80,8 @@ extends org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator {
@Override @Override
protected InitializerOOCtrlClassGenerator getInitializerClassGenerator( protected InitializerOOCtrlClassGenerator getInitializerClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
return new InitializerOOCtrlClassGenerator( return new InitializerOOCtrlClassGenerator(
......
...@@ -37,7 +37,7 @@ import org.objectweb.fractal.juliac.Juliac; ...@@ -37,7 +37,7 @@ import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.ControllerDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.helper.TreeHelper; import org.objectweb.fractal.juliac.helper.TreeHelper;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
...@@ -59,8 +59,8 @@ public class InitializerOOCtrlClassGenerator ...@@ -59,8 +59,8 @@ public class InitializerOOCtrlClassGenerator
extends org.ow2.frascati.tinfi.opt.oo.InitializerOOCtrlClassGenerator { extends org.ow2.frascati.tinfi.opt.oo.InitializerOOCtrlClassGenerator {
public InitializerOOCtrlClassGenerator( public InitializerOOCtrlClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
super(jc,fcscg,membraneDesc,ct,contentDesc); super(jc,fcscg,membraneDesc,ct,contentDesc);
......
...@@ -23,13 +23,10 @@ ...@@ -23,13 +23,10 @@
package org.ow2.frascati.tinfi.opt.oo.light; package org.ow2.frascati.tinfi.opt.oo.light;
import java.util.List;
import org.objectweb.fractal.api.type.ComponentType; import org.objectweb.fractal.api.type.ComponentType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator; import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
...@@ -45,9 +42,9 @@ public class MembraneInitializerOOCtrlClassGenerator ...@@ -45,9 +42,9 @@ public class MembraneInitializerOOCtrlClassGenerator
extends org.ow2.frascati.tinfi.opt.oo.MembraneInitializerOOCtrlClassGenerator { extends org.ow2.frascati.tinfi.opt.oo.MembraneInitializerOOCtrlClassGenerator {
public MembraneInitializerOOCtrlClassGenerator( public MembraneInitializerOOCtrlClassGenerator(
Juliac jc, FCSourceCodeGeneratorItf<List<ControllerDesc>> fcscg, Juliac jc, FCSourceCodeGeneratorItf<SimpleMembraneDesc> fcscg,
InitializerOOCtrlClassGenerator icg, InitializerOOCtrlClassGenerator icg,
MembraneDesc<List<ControllerDesc>> membraneDesc, ComponentType ct, SimpleMembraneDesc membraneDesc, ComponentType ct,
Object contentDesc ) { Object contentDesc ) {
super(jc,fcscg,icg,membraneDesc,ct,contentDesc); super(jc,fcscg,icg,membraneDesc,ct,contentDesc);
......
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