[picocontainer-scm] [5637] java/2.x/trunk/pico/container/src/java/org/picocontainer: PICO-369 potentially fixed

Revision 5637
Author paul
Date 2010-02-22 22:22:46 -0600 (Mon, 22 Feb 2010)

Log Message

PICO-369 potentially fixed

Modified Paths

- java/2.x/trunk/pico/container/src/java/org/picocontainer/ComponentAdapter.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/AbstractAdapter.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjectionFactory.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/FactoryInjector.java

- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/adapters/DelegateMethodAdapter.java

- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/behaviors/Assimilated.java

- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/jndi/JNDIProvided.java

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/ComponentAdapter.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/ComponentAdapter.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/ComponentAdapter.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -47,7 +47,7 @@
* @return the component's implementation class. Should normally be a concrete class (ie, a class that can be
* instantiated).
*/
- Class<T> getComponentImplementation();
+ Class<? extends T> getComponentImplementation();

/**
* Retrieve the component instance. This method will usually create a new instance each time it is called, but that

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -328,7 +328,7 @@
return ca.getComponentKey();
}

- public Class getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return ca.getComponentImplementation();
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/AbstractAdapter.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/AbstractAdapter.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -82,7 +82,7 @@
* {@inheritDoc}
* @see org.picocontainer.ComponentAdapter#getComponentImplementation()
*/
- public Class<T> getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return componentImplementation;
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -10,17 +10,17 @@

package org.picocontainer.behaviors;

-import java.io.Serializable;
-import java.lang.reflect.Type;
-
import org.picocontainer.ComponentAdapter;
import org.picocontainer.ComponentMonitor;
+import org.picocontainer.ComponentMonitorStrategy;
+import org.picocontainer.LifecycleStrategy;
+import org.picocontainer.PicoCompositionException;
import org.picocontainer.PicoContainer;
-import org.picocontainer.PicoCompositionException;
import org.picocontainer.PicoVisitor;
-import org.picocontainer.ComponentMonitorStrategy;
-import org.picocontainer.LifecycleStrategy;

+import java.io.Serializable;
+import java.lang.reflect.Type;
+
/**
* <p>
* Component adapter which decorates another adapter.
@@ -52,7 +52,7 @@
return delegate.getComponentKey();
}

- public Class<T> getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return delegate.getComponentImplementation();
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjectionFactory.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjectionFactory.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjectionFactory.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -1,8 +1,14 @@
package org.picocontainer.injectors;

-import org.picocontainer.*;
+import org.picocontainer.ComponentAdapter;
+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.ComponentMonitorStrategy;
+import org.picocontainer.InjectionFactory;
import org.picocontainer.Injector;
-import org.picocontainer.lifecycle.AbstractMonitoringLifecycleStrategy;
+import org.picocontainer.LifecycleStrategy;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoContainer;
+import org.picocontainer.PicoVisitor;
import org.picocontainer.lifecycle.NullLifecycleStrategy;

import java.io.Serializable;

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -10,24 +10,32 @@

package org.picocontainer.injectors;

-import org.picocontainer.*;
-import org.picocontainer.containers.ImmutablePicoContainer;
-import org.picocontainer.lifecycle.NullLifecycleStrategy;
+import org.picocontainer.ComponentAdapter;
+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.Emjection;
+import org.picocontainer.NameBinding;
+import org.picocontainer.Parameter;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoContainer;
import org.picocontainer.monitors.NullComponentMonitor;

-import java.lang.reflect.*;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;

/**
* Injection will happen through a constructor for the component.
@@ -95,7 +103,7 @@
this.rememberChosenConstructor = rememberChosenCtor;
}

- private CtorAndAdapters<T> getGreediestSatisfiableConstructor(PicoContainer guardedContainer, @SuppressWarnings("unused") Class<T> componentImplementation) {
+ private CtorAndAdapters<T> getGreediestSatisfiableConstructor(PicoContainer guardedContainer, @SuppressWarnings("unused") Class<? extends T> componentImplementation) {
CtorAndAdapters<T> ctor = null;
try {
if (chosenConstructor == null) {

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/FactoryInjector.java (5636 => 5637)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/FactoryInjector.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/FactoryInjector.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -8,22 +8,22 @@
*****************************************************************************/
package org.picocontainer.injectors;

+import org.picocontainer.ComponentAdapter;
+import org.picocontainer.Injector;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoContainer;
+import org.picocontainer.PicoVisitor;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
import java.lang.reflect.TypeVariable;
-import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;

-import org.picocontainer.ComponentAdapter;
-import org.picocontainer.Injector;
-import org.picocontainer.PicoCompositionException;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.PicoVisitor;
-
/**
* <p>
* An Injector which provides an custom instance in a factory style
@@ -122,7 +122,7 @@
return key;
}

- public Class<T> getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return key;
}

Modified: java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/adapters/DelegateMethodAdapter.java (5636 => 5637)

--- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/adapters/DelegateMethodAdapter.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/adapters/DelegateMethodAdapter.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -170,7 +170,7 @@

/** {@inheritDoc} **/
@SuppressWarnings("unchecked")
- public Class<T> getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return this.factoryMethod.getReturnType();
}

Modified: java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/behaviors/Assimilated.java (5636 => 5637)

--- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/behaviors/Assimilated.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/behaviors/Assimilated.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -132,7 +132,7 @@
* @see AbstractBehavior#getComponentImplementation()
*/
@Override
- public Class<T> getComponentImplementation() {
+ public Class<? extends T> getComponentImplementation() {
return isCompatible ? super.getComponentImplementation() : type;
}

Modified: java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/jndi/JNDIProvided.java (5636 => 5637)

--- java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/jndi/JNDIProvided.java 2010-02-21 16:18:57 UTC (rev 5636)
+++ java/2.x/trunk/pico/gems/src/java/org/picocontainer/gems/jndi/JNDIProvided.java 2010-02-23 04:22:46 UTC (rev 5637)
@@ -70,8 +70,8 @@
}

@SuppressWarnings("unchecked")
- public Class getComponentImplementation() {
- return jndiReference.get().getClass();
+ public Class<? extends T> getComponentImplementation() {
+ return (Class<? extends T>) jndiReference.get().getClass();
}

public T getComponentInstance(final PicoContainer container) throws PicoCompositionException {

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email