Commit 59815ce8 authored by Lionel Seinturier's avatar Lionel Seinturier

Cosmetic.

parent 012f3de1
...@@ -68,7 +68,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -68,7 +68,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
* *
* Use JulietLoader as the service type, instead of MembraneLoaderItf, * Use JulietLoader as the service type, instead of MembraneLoaderItf,
* since we really want an instance of JulietLoader, not of e.g. * since we really want an instance of JulietLoader, not of e.g.
* MembraneLoader which would be the case when e.g. the OO mode is * MembraneLoader that would be the case when e.g. the OO mode is
* registered before the current one (see the associated JUnit test). * registered before the current one (see the associated JUnit test).
*/ */
...@@ -127,20 +127,18 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -127,20 +127,18 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
else { else {
if( it.isFcClientItf() ) { if( it.isFcClientItf() ) {
/* /*
* In theory we should be returning here two interface source * We should be returning here two interface source code
* code generators since the client interface class extends the * generators since the client interface class extends the
* server one corresponding to the same type. However, the * server one corresponding to the same type. However, the
* current method is mainly used for retrieving the name of the * current method is mainly used for retrieving the name of the
* generated interface class (such as in initializer source code * generated interface class (such as in initializer source code
* generators.) It is then sufficient to return only the class * generators.) It is then sufficient to return only the class
* which corresponds to the real implementation. * that corresponds to the real implementation.
*/ */
pcg = pcg = new ClientInterfaceClassGenerator(it,cl,pkgRoot,false);
new ClientInterfaceClassGenerator(it,cl,pkgRoot,false);
} }
else { else {
pcg = pcg = new ServerInterfaceClassGenerator(it,cl,pkgRoot,false);
new ServerInterfaceClassGenerator(it,cl,pkgRoot,false);
} }
} }
...@@ -165,11 +163,10 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -165,11 +163,10 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
/* /*
* Control interfaces. * Control interfaces.
* *
* It seems to be wiser to keep * Keep InterfaceImplementationClassGenerator as a source code
* InterfaceImplementationClassGenerator as a source code generator * generator for control interfaces even though
* for control interfaces even though ServerInterfaceClassGenerator * ServerInterfaceClassGenerator could be used. This allows reusing
* could be used. This allows reusing pre-generated implementations * pre-generated implementations for Julia control interfaces.
* for Julia control interfaces.
*/ */
SourceCodeGeneratorItf cg = SourceCodeGeneratorItf cg =
new InterfaceImplementationClassGenerator(it,cl,pkgRoot,false); new InterfaceImplementationClassGenerator(it,cl,pkgRoot,false);
...@@ -198,8 +195,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { ...@@ -198,8 +195,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
} }
// ServiceReference implementation // ServiceReference implementation
cg = new ServiceReferenceClassGenerator( cg = new ServiceReferenceClassGenerator(it,cl,pkgRoot,null,false);
it,cl,pkgRoot,null,false);
jc.generateSourceCode(cg); jc.generateSourceCode(cg);
// ServiceReference and input interface implementations for callbacks // ServiceReference and input interface implementations for callbacks
......
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