X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FClassConfiguration.java;h=1c8760bb8ae77fd08c54bfbdbb433b6ef4c72693;hb=ddd261f331280640c5b53c7128230b629ebcd268;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..1c8760bb 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,74 +15,110 @@
  */
 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;
 import org.wamblee.system.core.Scope;
 
+import java.util.ArrayList;
+import java.util.List;
+
+
 /**
- * The class configuration encapsulates the knowledge of how to wrap a class as a component.
- * 
- * @author Erik Brakkee
+ * The class configuration encapsulates the knowledge of how to wrap a
+ * class as a component.
  *
+ * @author Erik Brakkee
  */
 public class ClassConfiguration {
+    /**
+     * DOCUMENT ME!
+     */
+    private Class _class;
+
+    /**
+     * DOCUMENT ME!
+     */
+    private ConstructorConfiguration constructorConfig;
+
+    /**
+     * DOCUMENT ME!
+     */
+    private ObjectConfiguration objectConfig;
+
+/**
+         * Constructs the configuration. By default no constructor is selected and 
+         * one of {@link #select(Class...)} or 
+         * {@link #greedy()} must be called.  
+         * @param aClass Class to construct. 
+         */
+    public ClassConfiguration(Class aClass) {
+        _class                = aClass;
+        constructorConfig     = new ConstructorConfiguration(aClass);
+        objectConfig          = new ObjectConfiguration(aClass);
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public ConstructorConfiguration getConstructorConfig() {
+        return constructorConfig;
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public ObjectConfiguration getObjectConfig() {
+        return objectConfig;
+    }
+
+    /**
+     * Creates the object in the given scope.
+     *
+     * @param aScope Scope containing required interfaces for this object.
+     *
+     * @return object.
+     */
+    public Object create(Scope aScope) {
+        return constructorConfig.create(aScope);
+    }
+
+    /**
+     * Injects required interfaces through the setters
+     *
+     * @param aScope Scope in which injection takes place.
+     * @param aObject Object to inject into.
+     */
+    public void inject(Scope aScope, Object aObject) {
+        objectConfig.inject(aScope, aObject);
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public List<ProvidedInterface> getProvidedInterfaces() {
+        List<ProvidedInterface> result = new ArrayList<ProvidedInterface>();
+        result.add(new DefaultProvidedInterface("provided", _class));
+
+        return result;
+    }
 
-	private Class _class; 
-	private ConstructorConfiguration _constructorConfig;
-	private SetterConfiguration _setterConfig; 
-	
-	/**
-	 * Constructs the configuration. By default no constructor is selected and 
-	 * one of {@link #select(Class...)} or 
-	 * {@link #greedy()} must be called.  
-	 * @param aClass Class to construct. 
-	 */
-	public ClassConfiguration(Class aClass) {
-		_class = aClass; 
-		_constructorConfig = new ConstructorConfiguration(aClass);
-		_setterConfig = new SetterConfiguration(aClass);
-	}
-	
-	public ConstructorConfiguration getConstructorConfig() {
-		return _constructorConfig;
-	}
-	
-	public SetterConfiguration getSetterConfiguration() { 
-	    return _setterConfig; 
-	}
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public List<RequiredInterface> getRequiredInterfaces() {
+        List<RequiredInterface> result = new ArrayList<RequiredInterface>();
+        result.addAll(constructorConfig.getRequiredInterfaces());
+        result.addAll(objectConfig.getRequiredInterfaces());
 
-	/**
-	 * Creates the object in the given scope. 
-	 * @param aScope Scope containing required interfaces for this object. 
-	 * @return object. 
-	 */
-	public Object create(Scope aScope) {
-		return _constructorConfig.create(aScope);
-	}
-	
-	/**
-	 * 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) { 
-	    _setterConfig.invoke(aScope, aObject);
-	}
-	
-	public List<ProvidedInterface> getProvidedInterfaces() {
-	    List<ProvidedInterface> result = new ArrayList<ProvidedInterface>();
-	    result.add(new DefaultProvidedInterface("provided", _class));	
-	    return result;
-	}
-	
-	public List<RequiredInterface> getRequiredInterfaces() { 
-	    List<RequiredInterface> result = new ArrayList<RequiredInterface>();
-	    result.addAll(_constructorConfig.getRequiredInterfaces());
-	    result.addAll(_setterConfig.getRequiredInterfaces());
-	    return result; 
-	}
+        return result;
+    }
 }