[waffle-scm] [472] trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java: Avoid code repetition.

[mauro]

Title: [waffle-scm] [472] trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java: Avoid code repetition.

Revision

472

Author

mauro

Date

2007-12-12 09:35:19 -0600 (Wed, 12 Dec 2007)

Log Message

Avoid code repetition.

Modified Paths

• trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java

Diff

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java (471 => 472)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java	2007-12-12 15:21:59 UTC (rev 471)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java	2007-12-12 15:35:19 UTC (rev 472)
@@ -17,6 +17,7 @@
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
 import org.picocontainer.defaults.CachingComponentAdapter;
+import org.picocontainer.defaults.ComponentAdapterFactory;
 import org.picocontainer.defaults.ConstantParameter;
 import org.picocontainer.defaults.ConstructorInjectionComponentAdapterFactory;
 import org.picocontainer.defaults.LifecycleStrategy;
@@ -113,26 +114,20 @@
     }
 
     private ComponentAdapter buildComponentAdapter(Object key, Class<?> type, Object... parameters) {
-        if (injection == Injection.CONSTRUCTOR) {
-            ConstructorInjectionComponentAdapterFactory factory
-                    = new ConstructorInjectionComponentAdapterFactory(false, lifecycleStrategy);
+        ComponentAdapterFactory factory = null;
 
-            if (parameters.length == 0) {
-                return factory.createComponentAdapter(key, type, null);
-            } else {
-                return factory.createComponentAdapter(key, type, picoParameters(parameters));
-            }
+        if (injection == Injection.CONSTRUCTOR) {
+            factory = new ConstructorInjectionComponentAdapterFactory(false, lifecycleStrategy);
+        } else if (injection == Injection.SETTER) {
+            factory = new SetterInjectionComponentAdapterFactory(false, lifecycleStrategy);
+        } else {
+            throw new IllegalArgumentException("Invalid injection " + injection);
         }
 
-        // handle Setter Injection...
-        SetterInjectionComponentAdapterFactory factory
-                = new SetterInjectionComponentAdapterFactory(false, lifecycleStrategy);
-
         if (parameters.length == 0) {
             return factory.createComponentAdapter(key, type, null);
         } else {
             return factory.createComponentAdapter(key, type, picoParameters(parameters));
-
         }
 
     }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email