X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FClassConfiguration.java;h=0fee7aca4d37a4eee5564c5226611dbdfb19cec3;hb=f0181a0f88c8e0cccd71024d0eddd6a74589d890;hp=96d976d32972642de93a1d840f265fc9e20be796;hpb=dd469a1a73acbfa4dc5377d67cecf7bdd4e9e1b4;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 96d976d3..0fee7aca 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
@@ -15,6 +15,9 @@
  */
 package org.wamblee.system.adapters;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
@@ -29,7 +32,8 @@ import org.wamblee.system.core.Scope;
 public class ClassConfiguration {
 
 	private Class _class; 
-	private ConstructorConfiguration _constructorConfig; 
+	private ConstructorConfiguration _constructorConfig;
+	private ObjectConfiguration _objectConfig; 
 	
 	/**
 	 * Constructs the configuration. By default no constructor is selected and 
@@ -39,12 +43,17 @@ public class ClassConfiguration {
 	 */
 	public ClassConfiguration(Class aClass) {
 		_class = aClass; 
-		_constructorConfig = new ConstructorConfiguration(aClass);  
+		_constructorConfig = new ConstructorConfiguration(aClass);
+		_objectConfig = new ObjectConfiguration(aClass);
 	}
 	
 	public ConstructorConfiguration getConstructorConfig() {
 		return _constructorConfig;
 	}
+	
+	public ObjectConfiguration getObjectConfig() { 
+	    return _objectConfig; 
+	}
 
 	/**
 	 * Creates the object in the given scope. 
@@ -55,13 +64,25 @@ public class ClassConfiguration {
 		return _constructorConfig.create(aScope);
 	}
 	
-	public ProvidedInterface[] getProvidedInterfaces() { 
-		return new ProvidedInterface[] { 
-			new DefaultProvidedInterface("provided", _class)	
-		};
+	/**
+	 * Injects required interfaces through the setters 
+	 * @param aObject Object to inject into. 
+	 * @param aScope Scope in which injection takes place. 
+	 */
+	public void inject(Scope aScope, Object aObject) { 
+	    _objectConfig.inject(aScope, aObject);
+	}
+	
+	public List<ProvidedInterface> getProvidedInterfaces() {
+	    List<ProvidedInterface> result = new ArrayList<ProvidedInterface>();
+	    result.add(new DefaultProvidedInterface("provided", _class));	
+	    return result;
 	}
 	
-	public RequiredInterface[] getRequiredInterface() { 
-		return _constructorConfig.getRequiredInterfaces().toArray(new RequiredInterface[0]);
+	public List<RequiredInterface> getRequiredInterfaces() { 
+	    List<RequiredInterface> result = new ArrayList<RequiredInterface>();
+	    result.addAll(_constructorConfig.getRequiredInterfaces());
+	    result.addAll(_objectConfig.getRequiredInterfaces());
+	    return result; 
 	}
 }