Commit 7c15f3c2 authored by Lionel Seinturier's avatar Lionel Seinturier
Browse files

Split the Util class in different Helper classes with more relevant names.

parent 6d8123da
......@@ -33,7 +33,7 @@ import org.objectweb.fractal.juliac.api.ClassGeneratorItf;
import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.conf.JulietLoader;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.ipf.Util;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.proxy.InterfaceImplementationClassGenerator;
import org.objectweb.fractal.juliac.proxy.ProxyClassGeneratorItf;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
......@@ -197,7 +197,8 @@ extends org.objectweb.fractal.juliac.opt.oo.FCOOCtrlSourceCodeGenerator {
Callback.class.getName(),
"org.osoa.sca.annotations.Callback");
if( annot != null ) {
Class<?> cbcl = Util.getAnnotationParamValue(annot,"value");
Class<?> cbcl =
AnnotationHelper.getAnnotationParamValue(annot,"value");
InterfaceType cbit =
new BasicInterfaceType(
"callback", cbcl.getName(), false, false, false );
......
......@@ -36,7 +36,7 @@ import org.objectweb.fractal.juliac.Juliac;
import org.objectweb.fractal.juliac.Utils;
import org.objectweb.fractal.juliac.api.ClassGeneratorItf;
import org.objectweb.fractal.juliac.desc.MembraneDesc;
import org.objectweb.fractal.juliac.ipf.Util;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.proxy.AbstractProxyClassGenerator;
import org.objectweb.fractal.juliac.ucf.UnifiedClass;
import org.objectweb.fractal.juliac.ucf.UnifiedClassHelper;
......@@ -201,7 +201,7 @@ extends AbstractProxyClassGenerator {
Callback.class.getName(),
"org.osoa.sca.annotations.Callback");
if( callback != null ) {
callbackClass = Util.getAnnotationParamValue(callback,"value");
callbackClass = AnnotationHelper.getAnnotationParamValue(callback,"value");
}
// OneWay method
......
......@@ -56,11 +56,11 @@ import org.objectweb.fractal.juliac.api.ClassGeneratorItf;
import org.objectweb.fractal.juliac.api.JuliacRuntimeException;
import org.objectweb.fractal.juliac.conf.Constants;
import org.objectweb.fractal.juliac.conf.JuliacConfig;
import org.objectweb.fractal.juliac.ipf.AnnotationHelper;
import org.objectweb.fractal.juliac.ipf.CompositeInjectionPointHashMap;
import org.objectweb.fractal.juliac.ipf.InjectionPoint;
import org.objectweb.fractal.juliac.ipf.InjectionPointFieldImpl;
import org.objectweb.fractal.juliac.ipf.InjectionPointMethodImpl;
import org.objectweb.fractal.juliac.ipf.Util;
import org.objectweb.fractal.juliac.opt.ClassGenerator;
import org.objectweb.fractal.juliac.visit.BlockSourceCodeVisitor;
import org.objectweb.fractal.juliac.visit.CatchSourceCodeVisitor;
......@@ -340,7 +340,7 @@ extends ClassGenerator {
Annotation annot = ip.getAnnotation();
Class<?> type = ip.getType();
String name = Util.getAnnotationParamValue(annot,"name");
String name = AnnotationHelper.getAnnotationParamValue(annot,"name");
/*
* Do not try to optimize by taking the value of the weaveableC
......@@ -1358,7 +1358,7 @@ extends ClassGenerator {
boolean isRequired = false;
try {
isRequired = // <Boolean> for compilation with javac
Util.<Boolean>getAnnotationParamValue(annot,"required");
AnnotationHelper.<Boolean>getAnnotationParamValue(annot,"required");
}
catch( NullPointerException npe ) {
/*
......@@ -1369,7 +1369,7 @@ extends ClassGenerator {
* parameter.
*/
Contingency contingency =
Util.getAnnotationParamValue(annot,"contingency");
AnnotationHelper.getAnnotationParamValue(annot,"contingency");
if( contingency == null ) {
/*
* Shouldn't occur. The annotation is either SCA style with a
......
Supports Markdown
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