X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FClassConfiguration.java;h=a686f88cec94cd57f187e3c3ca26eed80fa93a22;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=a4114175340495ca81740a6073851df7aed2aec7;hpb=8c1a962fa34da530f9933ab7743607fefcea9871;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java b/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
index a4114175..a686f88c 100644
--- a/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
+++ b/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
@@ -32,8 +32,8 @@ import org.wamblee.system.core.Scope;
 public class ClassConfiguration {
 
 	private Class _class; 
-	private ConstructorConfiguration _constructorConfig;
-	private SetterConfiguration _setterConfig; 
+	private ConstructorConfiguration constructorConfig;
+	private ObjectConfiguration objectConfig; 
 	
 	/**
 	 * Constructs the configuration. By default no constructor is selected and 
@@ -43,16 +43,16 @@ public class ClassConfiguration {
 	 */
 	public ClassConfiguration(Class aClass) {
 		_class = aClass; 
-		_constructorConfig = new ConstructorConfiguration(aClass);
-		_setterConfig = new SetterConfiguration(aClass);
+		constructorConfig = new ConstructorConfiguration(aClass);
+		objectConfig = new ObjectConfiguration(aClass);
 	}
 	
 	public ConstructorConfiguration getConstructorConfig() {
-		return _constructorConfig;
+		return constructorConfig;
 	}
 	
-	public SetterConfiguration getSetterConfiguration() { 
-	    return _setterConfig; 
+	public ObjectConfiguration getObjectConfig() { 
+	    return objectConfig; 
 	}
 
 	/**
@@ -61,7 +61,7 @@ public class ClassConfiguration {
 	 * @return object. 
 	 */
 	public Object create(Scope aScope) {
-		return _constructorConfig.create(aScope);
+		return constructorConfig.create(aScope);
 	}
 	
 	/**
@@ -70,7 +70,7 @@ public class ClassConfiguration {
 	 * @param aScope Scope in which injection takes place. 
 	 */
 	public void inject(Scope aScope, Object aObject) { 
-	    _setterConfig.invoke(aScope, aObject);
+	    objectConfig.inject(aScope, aObject);
 	}
 	
 	public List<ProvidedInterface> getProvidedInterfaces() {
@@ -81,8 +81,8 @@ public class ClassConfiguration {
 	
 	public List<RequiredInterface> getRequiredInterfaces() { 
 	    List<RequiredInterface> result = new ArrayList<RequiredInterface>();
-	    result.addAll(_constructorConfig.getRequiredInterfaces());
-	    result.addAll(_setterConfig.getRequiredInterfaces());
+	    result.addAll(constructorConfig.getRequiredInterfaces());
+	    result.addAll(objectConfig.getRequiredInterfaces());
 	    return result; 
 	}
 }