- Revision
- 482
- Author
- mward
- Date
- 2007-12-14 17:43:01 -0600 (Fri, 14 Dec 2007)
Log Message
minor refactoring (cleanup)
Modified Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java (481 => 482)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java 2007-12-14 23:42:17 UTC (rev 481) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java 2007-12-14 23:43:01 UTC (rev 482) @@ -84,6 +84,7 @@ MutablePicoContainer delegateContainer = (MutablePicoContainer) contextContainer.getDelegate(); Registrar registrar = new PicoRegistrar(delegateContainer, picoLifecycleStrategy, registrarMonitor); getContextMonitor().registrarCreated(registrar, registrarMonitor); + return registrar; }
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java (481 => 482)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java 2007-12-14 23:42:17 UTC (rev 481) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java 2007-12-14 23:43:01 UTC (rev 482) @@ -106,6 +106,10 @@ } private Parameter[] picoParameters(Object[] parameters) { + if(parameters.length == 0) { + return null; // pico expects a null when no parameters + } + Parameter[] picoParameters = new Parameter[parameters.length]; for (int i = 0; i < parameters.length; i++) { picoParameters[i] = new ConstantParameter(parameters[i]); @@ -114,22 +118,17 @@ } private ComponentAdapter buildComponentAdapter(Object key, Class<?> type, Object... parameters) { - ComponentAdapterFactory factory = null; + ComponentAdapterFactory componentAdapterFactory; if (injection == Injection.CONSTRUCTOR) { - factory = new ConstructorInjectionComponentAdapterFactory(false, lifecycleStrategy); + componentAdapterFactory = new ConstructorInjectionComponentAdapterFactory(false, lifecycleStrategy); } else if (injection == Injection.SETTER) { - factory = new SetterInjectionComponentAdapterFactory(false, lifecycleStrategy); + componentAdapterFactory = new SetterInjectionComponentAdapterFactory(false, lifecycleStrategy); } else { throw new IllegalArgumentException("Invalid injection " + injection); } - if (parameters.length == 0) { - return factory.createComponentAdapter(key, type, null); - } else { - return factory.createComponentAdapter(key, type, picoParameters(parameters)); - } - + return componentAdapterFactory.createComponentAdapter(key, type, picoParameters(parameters)); } public void application() {
To unsubscribe from this list please visit:
