Fix for last commit.

tinfi/runtime/oo/src/main/java/org/ow2/frascati/tinfi/control/content/ContentClassMetaData.java

@@ -217,7 +217,7 @@ public class ContentClassMetaData {
     			"org.osoa.sca.annotations.EagerInit");
         if(eagerinit) {
             if( scope==null || !scope.equals("COMPOSITE") ) {
-                String msg =
+            	final String msg =
                     "Class "+fcContentClass+
                     " annotated with @EagerInit should be composite-scoped";
                 throw new IllegalContentClassMetaData(msg);
@@ -251,7 +251,7 @@ public class ContentClassMetaData {
     			"org.osoa.sca.annotations.Constructor");
         Constructor<?>[] ctors = Filters.filter(constructors,filter);
         if( ctors.length > 1 ) {
-            String msg =
+        	final String msg =
             	"Only one constructor should be annotated with @Constructor";
             throw new IllegalContentClassMetaData(msg);
         }
@@ -489,7 +489,8 @@ public class ContentClassMetaData {
 			}
 		}
         
-    	String msg = ao.toString()+" should be injectable with "+type.getName();
+    	final String msg =
+			ao.toString()+" should be injectable with "+type.getName();
     	throw new IllegalContentClassMetaData(msg);
     }
 
@@ -518,7 +519,7 @@ public class ContentClassMetaData {
         if( ! method.getReturnType().equals(void.class) ||
             method.getParameterTypes().length != 0 ) {
             String str = Arrays.deepToString(names);
-            String msg =
+            final String msg =
                 "The signature of the @"+str+" annotated method ("+
                 method.getName()+") should be ():void";
             throw new IllegalContentClassMetaData(msg);
@@ -555,7 +556,7 @@ public class ContentClassMetaData {
         if( ! fcContentClass.isAssignableFrom(rtype) ||
             method.getParameterTypes().length != 0 ) {
             String str = Arrays.deepToString(names);
-            String msg =
+            final String msg =
                 "The signature of the @"+str+" annotated method ("+
                 method.getName()+") should be ():"+fcContentClass.getName();
             throw new IllegalContentClassMetaData(msg);
@@ -584,7 +585,7 @@ public class ContentClassMetaData {
         
         if( methods.length > 1 ) {
             String str = Arrays.deepToString(names);
-        	String msg =
+        	final String msg =
                 "More than one method annotated with @"+str+" in "+
                 fcContentClass.getName();
             throw new IllegalContentClassMetaData(msg);
@@ -606,19 +607,19 @@ public class ContentClassMetaData {
         
         int space = duration.indexOf(' ');
         if( space == -1 ) {
-            String msg = "No space in duration string: "+duration;
+            final String msg = "No space in duration string: "+duration;
             throw new IllegalContentClassMetaData(msg);
         }
         
         String numberStr = duration.substring(0,space);
         int number = Integer.parseInt(numberStr);
         if( number < 0 ) {
-            String msg = "Negative duration: "+duration;
+        	final String msg = "Negative duration: "+duration;
             throw new IllegalContentClassMetaData(msg);
         }
         
         if( space+1 == duration.length() ) {
-            String msg = "No time unit in: "+duration;
+        	final String msg = "No time unit in: "+duration;
             throw new IllegalContentClassMetaData(msg);
         }
         
@@ -630,7 +631,7 @@ public class ContentClassMetaData {
         else if( unit.equals("days") )    { l *= 24*60*60*1000; }
         else if( unit.equals("years") )   { l *= 365*24*60*60*1000; }
         else {
-            String msg = "Unsupported time unit in: "+duration;
+        	final String msg = "Unsupported time unit in: "+duration;
             throw new IllegalContentClassMetaData(msg);
         }
         

tinfi/runtime/oo/src/main/java/org/ow2/frascati/tinfi/control/content/scope/AbstractScopeManager.java

@@ -50,7 +50,7 @@ import org.objectweb.fractal.julia.Interceptor;
 import org.objectweb.fractal.juliac.commons.ipf.InjectionPoint;
 import org.objectweb.fractal.juliac.commons.ipf.InjectionPointFieldImpl;
 import org.objectweb.fractal.juliac.commons.lang.annotation.AnnotationHelper;
-import org.objectweb.fractal.juliac.commons.lang.reflect.SetterMethodFilter;
+import org.objectweb.fractal.juliac.commons.lang.reflect.MethodHelper;
 import org.ow2.frascati.tinfi.CallbackManager;
 import org.ow2.frascati.tinfi.TinfiComponentOutInterface;
 import org.ow2.frascati.tinfi.TinfiRuntimeException;
@@ -380,13 +380,13 @@ public abstract class AbstractScopeManager implements ScopeManager {
 		        InterfaceType it = ct.getFcInterfaceType(name);
 		        // Should we test that this is a client interface?
 		        Object sr = getServiceReference(it);
-		        SetterMethodFilter.invokeSetter(content,setter,sr);
+		        MethodHelper.invokeSetter(content,setter,sr);
 			}
 			catch( NoSuchInterfaceException nsie ) {
 				// Check whether this is a property
 				if( scapc.containsPropertyName(name) ) {
 		            Object value = scapc.getValue(name);
-			        SetterMethodFilter.invokeSetter(content,setter,value);
+			        MethodHelper.invokeSetter(content,setter,value);
 				}
 				/*
 				 * Else, this is neither a reference, nor a property. We do not