From 0388f81f634b4b5ad26fb9399f35ed408dc711a2 Mon Sep 17 00:00:00 2001 From: Lionel Seinturier Date: Tue, 2 Jan 2018 13:44:21 +0000 Subject: [PATCH] Remove usage of JuliacConfig --- .../org/ow2/frascati/tinfi/emf/EMFParserSupportImpl.java | 7 ++----- .../frascati/tinfi/emf/EMFParserSupportImplTestCase.java | 2 -- .../tinfi/opt/comp/FCCompCtrlSourceCodeGenerator.java | 4 ++-- .../frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGenerator.java | 4 ++-- .../opt/oo/light/SCAContentControllerClassGenerator.java | 2 +- .../tinfi/opt/oo/FCOOCtrlSourceCodeGeneratorTestCase.java | 3 --- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/tinfi/module/adlparser-scaadl/src/main/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImpl.java b/tinfi/module/adlparser-scaadl/src/main/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImpl.java index cfd2cd1b8..9779a0175 100755 --- a/tinfi/module/adlparser-scaadl/src/main/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImpl.java +++ b/tinfi/module/adlparser-scaadl/src/main/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImpl.java @@ -68,7 +68,6 @@ import org.objectweb.fractal.julia.type.BasicComponentType; import org.objectweb.fractal.julia.type.BasicInterfaceType; import org.objectweb.fractal.juliac.api.generator.SourceCodeGeneratorItf; import org.objectweb.fractal.juliac.commons.lang.StringHelper; -import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.desc.AbstractADLSupportImpl; import org.objectweb.fractal.juliac.desc.AttributeDesc; import org.objectweb.fractal.juliac.desc.BindingDesc; @@ -106,8 +105,7 @@ public class EMFParserSupportImpl extends AbstractADLSupportImpl { * being null when the resource is stored in a jar file. */ String adlFileName = adl.replace('.','/')+".composite"; - JuliacConfig jconf = jc.getJuliacConfig(); - ClassLoader loader = jconf.getClassLoader(); + ClassLoader loader = jc.getClassLoader(); InputStream is = loader.getResourceAsStream(adlFileName); boolean exist = (is != null); return exist; @@ -148,8 +146,7 @@ public class EMFParserSupportImpl extends AbstractADLSupportImpl { protected Composite innerparse( String adl, Map context ) throws IOException { - JuliacConfig jconf = jc.getJuliacConfig(); - ClassLoader loader = jconf.getClassLoader(); + ClassLoader loader = jc.getClassLoader(); String adlFileName = adl.replace('.','/')+".composite"; URL url = loader.getResource(adlFileName); diff --git a/tinfi/module/adlparser-scaadl/src/test/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImplTestCase.java b/tinfi/module/adlparser-scaadl/src/test/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImplTestCase.java index dc6e87555..9233f3b4f 100644 --- a/tinfi/module/adlparser-scaadl/src/test/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImplTestCase.java +++ b/tinfi/module/adlparser-scaadl/src/test/java/org/ow2/frascati/tinfi/emf/EMFParserSupportImplTestCase.java @@ -31,7 +31,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.objectweb.fractal.juliac.Juliac; -import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.desc.AttributeDesc; import org.objectweb.fractal.juliac.desc.ComponentDesc; import org.objectweb.fractal.juliac.module.ADLParserSupportItf; @@ -51,7 +50,6 @@ public class EMFParserSupportImplTestCase { @Before public void setUp() throws IOException { jc = new Juliac(); - jc.setJuliacConfig(new JuliacConfig()); emfps = new EMFParserSupportImpl(); emfps.init(jc); } diff --git a/tinfi/module/opt-comp/core/src/main/java/org/ow2/frascati/tinfi/opt/comp/FCCompCtrlSourceCodeGenerator.java b/tinfi/module/opt-comp/core/src/main/java/org/ow2/frascati/tinfi/opt/comp/FCCompCtrlSourceCodeGenerator.java index 051798cd1..7dd8b0210 100644 --- a/tinfi/module/opt-comp/core/src/main/java/org/ow2/frascati/tinfi/opt/comp/FCCompCtrlSourceCodeGenerator.java +++ b/tinfi/module/opt-comp/core/src/main/java/org/ow2/frascati/tinfi/opt/comp/FCCompCtrlSourceCodeGenerator.java @@ -133,7 +133,7 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator { final String signature = it.getFcItfSignature(); final Class cl = jc.loadClass(signature); - final String pkgRoot = jc.getJuliacConfig().getPkgRoot(); + final String pkgRoot = jc.getPkgRoot(); if( itname.endsWith("-controller") || itname.equals("component") ) { pcg = @@ -172,7 +172,7 @@ extends org.objectweb.fractal.juliac.opt.comp.FCCompCtrlSourceCodeGenerator { final String signature = it.getFcItfSignature(); final Class cl = jc.loadClass(signature); - final String pkgRoot = jc.getJuliacConfig().getPkgRoot(); + final String pkgRoot = jc.getPkgRoot(); String itname = it.getFcItfName(); if( itname.endsWith("-controller") || itname.equals("component") ) { diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGenerator.java index ddae2a221..d8f7034a7 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGenerator.java @@ -108,7 +108,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { final String signature = it.getFcItfSignature(); final Class cl = jc.loadClass(signature); - final String pkgRoot = jc.getJuliacConfig().getPkgRoot(); + final String pkgRoot = jc.getPkgRoot(); ProxyClassGeneratorItf pcg = null; String itname = it.getFcItfName(); @@ -153,7 +153,7 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator { final String signature = it.getFcItfSignature(); final Class cl = jc.loadClass(signature); - final String pkgRoot = jc.getJuliacConfig().getPkgRoot(); + final String pkgRoot = jc.getPkgRoot(); String itname = it.getFcItfName(); if( itname.endsWith("-controller") || itname.equals("component") ) { diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/SCAContentControllerClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/SCAContentControllerClassGenerator.java index 35aa20d29..987d19275 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/SCAContentControllerClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/SCAContentControllerClassGenerator.java @@ -142,7 +142,7 @@ extends ClassGenerator { * Return the name of the class generated by this generator. */ public String getTargetTypeName() { - final String pkgRoot = jc.getJuliacConfig().getPkgRoot(); + final String pkgRoot = jc.getPkgRoot(); final String targetClassName = pkgRoot + contentClassName + SUFFIX; return targetClassName; } diff --git a/tinfi/module/opt-oo/core/src/test/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGeneratorTestCase.java b/tinfi/module/opt-oo/core/src/test/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGeneratorTestCase.java index 875bf3595..982f16261 100644 --- a/tinfi/module/opt-oo/core/src/test/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGeneratorTestCase.java +++ b/tinfi/module/opt-oo/core/src/test/java/org/ow2/frascati/tinfi/opt/oo/FCOOCtrlSourceCodeGeneratorTestCase.java @@ -27,7 +27,6 @@ import java.io.IOException; import org.junit.Test; import org.objectweb.fractal.juliac.Juliac; -import org.objectweb.fractal.juliac.conf.JuliacConfig; import org.objectweb.fractal.juliac.module.JuliacModuleItf; @@ -48,8 +47,6 @@ public class FCOOCtrlSourceCodeGeneratorTestCase { public void testTwoGenerators() throws IOException { Juliac jc = new Juliac(); - JuliacConfig jconf = new JuliacConfig(); - jc.setJuliacConfig(jconf); JuliacModuleItf oo = new org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator(); -- 2.21.0