[picocontainer-scm] [picocontainer] [3141] java/picocontainer/trunk/container/src/test/org/picocontainer/tck: Last one! Remove unused imports.

Revision

3141

Author

rimovm

Date

2006-12-19 19:36:40 -0600 (Tue, 19 Dec 2006)

Log Message

Last one! Remove unused imports.

Modified Paths

• java/picocontainer/trunk/container/src/java/org/picocontainer/defaults/DefaultPicoContainer.java
• java/picocontainer/trunk/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java

Diff

Modified: java/picocontainer/trunk/container/src/java/org/picocontainer/defaults/DefaultPicoContainer.java (3140 => 3141)

--- java/picocontainer/trunk/container/src/java/org/picocontainer/defaults/DefaultPicoContainer.java	2006-12-20 01:35:11 UTC (rev 3140)
+++ java/picocontainer/trunk/container/src/java/org/picocontainer/defaults/DefaultPicoContainer.java	2006-12-20 01:36:40 UTC (rev 3141)
@@ -27,7 +27,6 @@
 import org.picocontainer.Parameter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.PicoException;
-import org.picocontainer.PicoInitializationException;
 import org.picocontainer.PicoIntrospectionException;
 import org.picocontainer.PicoVerificationException;
 import org.picocontainer.PicoVisitor;
@@ -74,7 +73,7 @@
     // Keeps track of instantiation order.
     private List orderedComponentAdapters = new ArrayList();
 
-    // Keeps track of the container started status 
+    // Keeps track of the container started status
     private boolean started = false;
     // Keeps track of the container disposed status
     private boolean disposed = false;
@@ -113,7 +112,7 @@
      * </em>
      *
      * @param componentAdapterFactory the factory to use for creation of ComponentAdapters.
-     * @param lifecycleStrategyForInstanceRegistrations the lifecylce strategy chosen for regiered 
+     * @param lifecycleStrategyForInstanceRegistrations the lifecylce strategy chosen for regiered
      *          instance (not implementations!)
      * @param parent                  the parent container (used for component dependency lookups).
      */
@@ -465,8 +464,8 @@
 
     /**
      * Stop the components of this PicoContainer and all its logical child containers.
-     * The stopping of the child containers is only attempted for those that have been 
-     * started, possibly not successfully.  
+     * The stopping of the child containers is only attempted for those that have been
+     * started, possibly not successfully.
      * The lifecycle operation is delegated to the component adapter,
      * if it is an instance of {@link LifecycleManager lifecycle manager}.
      * The actual {@link LifecycleStrategy lifecycle strategy} supported
@@ -546,6 +545,7 @@
 
     public boolean removeChildContainer(PicoContainer child) {
         final boolean result = children.remove(child);
+        childrenStarted.remove(new Integer(child.hashCode()));
         return result;
     }
 
@@ -627,7 +627,7 @@
 
         /** List collecting the CAs which have been successfully started */
         private List startedComponentAdapters = new ArrayList();
-        
+
         /**
          * {@inheritDoc}
          * Loops over all component adapters and invokes

Modified: java/picocontainer/trunk/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java (3140 => 3141)

--- java/picocontainer/trunk/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java	2006-12-20 01:35:11 UTC (rev 3140)
+++ java/picocontainer/trunk/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTestCase.java	2006-12-20 01:36:40 UTC (rev 3141)
@@ -17,13 +17,11 @@
 import junit.framework.AssertionFailedError;
 
 import org.picocontainer.ComponentAdapter;
-import org.picocontainer.Disposable;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.PicoInitializationException;
 import org.picocontainer.PicoIntrospectionException;
-import org.picocontainer.Startable;
 import org.picocontainer.defaults.AbstractPicoVisitor;
 import org.picocontainer.defaults.ComponentAdapterFactory;
 import org.picocontainer.defaults.ConstantParameter;

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email