Commit db9e9386 authored by Lionel Seinturier's avatar Lionel Seinturier

Update to match recent changes in Juliac.

parent c0566ad7
...@@ -28,8 +28,8 @@ import java.io.IOException; ...@@ -28,8 +28,8 @@ import java.io.IOException;
import org.objectweb.fractal.api.Type; import org.objectweb.fractal.api.Type;
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.ProxyClassGeneratorItf; import org.objectweb.fractal.juliac.api.generator.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.osgi.FCOOCtrlGenerator; import org.objectweb.fractal.juliac.osgi.FCOOCtrlGenerator;
/** /**
......
...@@ -66,7 +66,7 @@ import org.objectweb.fractal.api.type.InterfaceType; ...@@ -66,7 +66,7 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory; import org.objectweb.fractal.api.type.TypeFactory;
import org.objectweb.fractal.julia.type.BasicComponentType; import org.objectweb.fractal.julia.type.BasicComponentType;
import org.objectweb.fractal.julia.type.BasicInterfaceType; import org.objectweb.fractal.julia.type.BasicInterfaceType;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.commons.lang.StringHelper; import org.objectweb.fractal.juliac.commons.lang.StringHelper;
import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.desc.AbstractADLSupportImpl; import org.objectweb.fractal.juliac.desc.AbstractADLSupportImpl;
......
...@@ -31,10 +31,10 @@ import org.junit.Assert; ...@@ -31,10 +31,10 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.ADLParserSupportItf;
import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.desc.AttributeDesc; import org.objectweb.fractal.juliac.desc.AttributeDesc;
import org.objectweb.fractal.juliac.desc.ComponentDesc; import org.objectweb.fractal.juliac.desc.ComponentDesc;
import org.objectweb.fractal.juliac.module.ADLParserSupportItf;
/** /**
* Class for testing the functionalities of the {@link EMFParserSupportImpl} * Class for testing the functionalities of the {@link EMFParserSupportImpl}
......
...@@ -32,15 +32,15 @@ import org.objectweb.fractal.api.type.ComponentType; ...@@ -32,15 +32,15 @@ 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.julia.type.BasicInterfaceType; import org.objectweb.fractal.julia.type.BasicInterfaceType;
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.generator.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.api.JuliacModuleItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.MembraneLoaderItf;
import org.objectweb.fractal.juliac.api.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; 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.JulietLoader; import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException; import org.objectweb.fractal.juliac.desc.NoSuchControllerDescriptorException;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.module.JuliacModuleItf;
import org.objectweb.fractal.juliac.module.MembraneLoaderItf;
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.opt.comp.CompBasedMembraneDesc;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator; import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
......
...@@ -27,9 +27,9 @@ import org.objectweb.fractal.api.Interface; ...@@ -27,9 +27,9 @@ import org.objectweb.fractal.api.Interface;
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.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.opt.comp.CompBasedMembraneDesc; import org.objectweb.fractal.juliac.opt.comp.CompBasedMembraneDesc;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
/** /**
......
...@@ -29,10 +29,10 @@ import java.lang.reflect.Modifier; ...@@ -29,10 +29,10 @@ import java.lang.reflect.Modifier;
import org.objectweb.fractal.api.Component; import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.Type; import org.objectweb.fractal.api.Type;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.desc.MembraneDesc; import org.objectweb.fractal.juliac.api.desc.MembraneDesc;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator; import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.EndsConversation;
import org.ow2.frascati.tinfi.TinfiComponentCBInterface; import org.ow2.frascati.tinfi.TinfiComponentCBInterface;
......
...@@ -29,10 +29,10 @@ import java.lang.reflect.Modifier; ...@@ -29,10 +29,10 @@ import java.lang.reflect.Modifier;
import org.oasisopen.sca.ServiceReference; import org.oasisopen.sca.ServiceReference;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentOutInterface; import org.ow2.frascati.tinfi.TinfiComponentOutInterface;
/** /**
......
...@@ -31,13 +31,13 @@ import org.objectweb.fractal.api.type.ComponentType; ...@@ -31,13 +31,13 @@ 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.julia.type.BasicInterfaceType; import org.objectweb.fractal.julia.type.BasicInterfaceType;
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.generator.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.api.ProxyClassGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; 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.JulietLoader; import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator; import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
/** /**
......
...@@ -27,10 +27,10 @@ import org.objectweb.fractal.api.factory.InstantiationException; ...@@ -27,10 +27,10 @@ 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.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
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.module.FCSourceCodeGeneratorItf;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
/** /**
......
...@@ -25,10 +25,10 @@ package org.ow2.frascati.tinfi.opt.oo; ...@@ -25,10 +25,10 @@ package org.ow2.frascati.tinfi.opt.oo;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper; import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
/** /**
* This class generates interceptor classes. This generator differs from {@link * This class generates interceptor classes. This generator differs from {@link
......
...@@ -25,10 +25,10 @@ package org.ow2.frascati.tinfi.opt.oo; ...@@ -25,10 +25,10 @@ package org.ow2.frascati.tinfi.opt.oo;
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.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
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.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
/** /**
......
...@@ -27,10 +27,10 @@ package org.ow2.frascati.tinfi.opt.oo; ...@@ -27,10 +27,10 @@ package org.ow2.frascati.tinfi.opt.oo;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.api.desc.MembraneDesc;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator; import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.EndsConversation;
/** /**
......
...@@ -29,13 +29,13 @@ import java.lang.reflect.Modifier; ...@@ -29,13 +29,13 @@ import java.lang.reflect.Modifier;
import org.objectweb.fractal.api.Interface; import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.api.desc.MembraneDesc;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper; import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper;
import org.objectweb.fractal.juliac.commons.lang.reflect.MethodHelper; import org.objectweb.fractal.juliac.commons.lang.reflect.MethodHelper;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator; import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.IntentJoinPointImpl; import org.ow2.frascati.tinfi.IntentJoinPointImpl;
import org.ow2.frascati.tinfi.TinfiRuntimeException; import org.ow2.frascati.tinfi.TinfiRuntimeException;
import org.ow2.frascati.tinfi.api.IntentHandler; import org.ow2.frascati.tinfi.api.IntentHandler;
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
package org.ow2.frascati.tinfi.opt.oo; package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.api.desc.MembraneDesc;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator; import org.objectweb.fractal.juliac.proxy.AbstractInterceptorSourceCodeGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterceptor; import org.ow2.frascati.tinfi.TinfiComponentInterceptor;
/** /**
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
package org.ow2.frascati.tinfi.opt.oo; package org.ow2.frascati.tinfi.opt.oo;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator; import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiComponentInterface; import org.ow2.frascati.tinfi.TinfiComponentInterface;
/** /**
......
...@@ -33,16 +33,16 @@ import org.objectweb.fractal.api.Component; ...@@ -33,16 +33,16 @@ import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.type.InterfaceType; import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.julia.ComponentInterface; import org.objectweb.fractal.julia.ComponentInterface;
import org.objectweb.fractal.julia.type.BasicInterfaceType; import org.objectweb.fractal.julia.type.BasicInterfaceType;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.desc.MembraneDesc;
import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper; import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper;
import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper; import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper;
import org.objectweb.fractal.juliac.commons.lang.reflect.AnnotatedElementHelper; import org.objectweb.fractal.juliac.commons.lang.reflect.AnnotatedElementHelper;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.helper.InterfaceTypeHelper; import org.objectweb.fractal.juliac.helper.InterfaceTypeHelper;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator; import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.osoa.sca.annotations.Conversational; import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation; import org.osoa.sca.annotations.EndsConversation;
import org.ow2.frascati.tinfi.TinfiRuntimeException; import org.ow2.frascati.tinfi.TinfiRuntimeException;
......
...@@ -27,9 +27,9 @@ import java.io.IOException; ...@@ -27,9 +27,9 @@ import java.io.IOException;
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.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData; import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData;
/** /**
......
...@@ -34,13 +34,13 @@ import org.objectweb.fractal.julia.factory.ChainedInstantiationException; ...@@ -34,13 +34,13 @@ import org.objectweb.fractal.julia.factory.ChainedInstantiationException;
import org.objectweb.fractal.julia.loader.Initializable; import org.objectweb.fractal.julia.loader.Initializable;
import org.objectweb.fractal.julia.loader.Tree; import org.objectweb.fractal.julia.loader.Tree;
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.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.desc.ControllerDesc; import org.objectweb.fractal.juliac.desc.ControllerDesc;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; 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.module.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.TinfiRuntimeException; import org.ow2.frascati.tinfi.TinfiRuntimeException;
import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData; import org.ow2.frascati.tinfi.control.content.IllegalContentClassMetaData;
import org.ow2.frascati.tinfi.control.content.SCAExtendedContentController; import org.ow2.frascati.tinfi.control.content.SCAExtendedContentController;
......
...@@ -25,7 +25,7 @@ package org.ow2.frascati.tinfi.opt.oo.light; ...@@ -25,7 +25,7 @@ package org.ow2.frascati.tinfi.opt.oo.light;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
/** /**
* This class generates interceptor classes. This generator differs from {@link * This class generates interceptor classes. This generator differs from {@link
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
package org.ow2.frascati.tinfi.opt.oo.light; package org.ow2.frascati.tinfi.opt.oo.light;
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.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc; import org.objectweb.fractal.juliac.desc.SimpleMembraneDesc;
import org.objectweb.fractal.juliac.module.FCSourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator; import org.objectweb.fractal.juliac.opt.oo.InitializerOOCtrlClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
/** /**
* Generator for object-oriented control membrane initializer. An membrane * Generator for object-oriented control membrane initializer. An membrane
......
...@@ -52,7 +52,11 @@ import org.objectweb.fractal.api.type.InterfaceType; ...@@ -52,7 +52,11 @@ import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.fraclet.types.Contingency; import org.objectweb.fractal.fraclet.types.Contingency;
import org.objectweb.fractal.julia.InitializationContext; import org.objectweb.fractal.julia.InitializationContext;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.CatchSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.api.visit.ThenSourceCodeVisitor;
import org.objectweb.fractal.juliac.commons.ipf.CompositeInjectionPointHashMap; import org.objectweb.fractal.juliac.commons.ipf.CompositeInjectionPointHashMap;
import org.objectweb.fractal.juliac.commons.ipf.InjectionPoint; import org.objectweb.fractal.juliac.commons.ipf.InjectionPoint;
import org.objectweb.fractal.juliac.commons.ipf.InjectionPointFieldImpl; import org.objectweb.fractal.juliac.commons.ipf.InjectionPointFieldImpl;
...@@ -62,10 +66,6 @@ import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper; ...@@ -62,10 +66,6 @@ import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper;
import org.objectweb.fractal.juliac.commons.lang.reflect.MemberHelper; import org.objectweb.fractal.juliac.commons.lang.reflect.MemberHelper;
import org.objectweb.fractal.juliac.conf.Constants; import org.objectweb.fractal.juliac.conf.Constants;
import org.objectweb.fractal.juliac.opt.ClassGenerator; import org.objectweb.fractal.juliac.opt.ClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.CatchSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ThenSourceCodeVisitor;
import org.ow2.frascati.tinfi.CallbackManager; import org.ow2.frascati.tinfi.CallbackManager;
import org.ow2.frascati.tinfi.TinfiRuntimeException; import org.ow2.frascati.tinfi.TinfiRuntimeException;
import org.ow2.frascati.tinfi.api.control.ContentInstantiationException; import org.ow2.frascati.tinfi.api.control.ContentInstantiationException;
......
...@@ -28,9 +28,9 @@ import java.lang.reflect.Modifier; ...@@ -28,9 +28,9 @@ import java.lang.reflect.Modifier;
import org.objectweb.fractal.api.control.IllegalLifeCycleException; import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.objectweb.fractal.api.control.LifeCycleController; import org.objectweb.fractal.api.control.LifeCycleController;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ThenSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.ThenSourceCodeVisitor;
import org.ow2.frascati.tinfi.api.control.ContentInstantiationException; import org.ow2.frascati.tinfi.api.control.ContentInstantiationException;
import org.ow2.frascati.tinfi.control.content.ContentClassMetaData; import org.ow2.frascati.tinfi.control.content.ContentClassMetaData;
......
...@@ -27,8 +27,8 @@ import java.lang.reflect.Modifier; ...@@ -27,8 +27,8 @@ import java.lang.reflect.Modifier;
import java.util.Vector; import java.util.Vector;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.ClassSourceCodeVisitor; import org.objectweb.fractal.juliac.api.visit.ClassSourceCodeVisitor;
import org.ow2.frascati.tinfi.control.content.ContentClassMetaData; import org.ow2.frascati.tinfi.control.content.ContentClassMetaData;
/** /**
......
...@@ -40,16 +40,16 @@ import org.objectweb.fractal.fraclet.types.Constants; ...@@ -40,16 +40,16 @@ import org.objectweb.fractal.fraclet.types.Constants;
import org.objectweb.fractal.julia.type.BasicComponentType; import org.objectweb.fractal.julia.type.BasicComponentType;
import org.objectweb.fractal.julia.type.BasicInterfaceType; import org.objectweb.fractal.julia.type.BasicInterfaceType;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.ADLParserSupportItf;
import org.objectweb.fractal.juliac.api.MembraneLoaderItf;
import org.objectweb.fractal.juliac.api.RuntimeClassNotFoundException; import org.objectweb.fractal.juliac.api.RuntimeClassNotFoundException;
import org.objectweb.fractal.juliac.api.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf;
import org.objectweb.fractal.juliac.commons.lang.ClassHelper; import org.objectweb.fractal.juliac.commons.lang.ClassHelper;
import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper; import org.objectweb.fractal.juliac.commons.lang.GenericClassHelper;
import org.objectweb.fractal.juliac.commons.lang.reflect.FieldHelper; import org.objectweb.fractal.juliac.commons.lang.reflect.FieldHelper;
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.ComponentDesc;
import org.objectweb.fractal.juliac.helper.MembraneHelper; import org.objectweb.fractal.juliac.helper.MembraneHelper;
import org.objectweb.fractal.juliac.module.ADLParserSupportItf;
import org.objectweb.fractal.juliac.module.MembraneLoaderItf;
/** /**
* <p> * <p>
......
...@@ -27,8 +27,8 @@ import java.io.IOException; ...@@ -27,8 +27,8 @@ import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.objectweb.fractal.juliac.Juliac; import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.api.JuliacModuleItf;
import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.module.JuliacModuleItf;
/** /**
......
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