[picocontainer-scm] [5558] java/2.x/trunk/pico/distribution/src/site/content: chg isLazy to component adapter

Revision 5558
Author paul
Date 2009-11-02 07:10:05 -0600 (Mon, 02 Nov 2009)

Log Message

chg isLazy to component adapter

Modified Paths

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

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

- java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.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/AbstractInjector.java

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

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

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

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

- java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTest.java

- java/2.x/trunk/pico/distribution/src/site/content/lifecycle.html

Diff

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -650,7 +650,7 @@
*/
protected Object decorateComponent(Object component, ComponentAdapter<?> componentAdapter) {
if (componentAdapter instanceof ComponentLifecycle<?>
- && lifecycleStrategy.isLazy(componentAdapter.getComponentImplementation()) // is Lazy
+ && lifecycleStrategy.isLazy(componentAdapter) // is Lazy
&& !((ComponentLifecycle<?>) componentAdapter).isStarted()) {
((ComponentLifecycle<?>)componentAdapter).start(this);
}
@@ -991,7 +991,7 @@

protected void potentiallyStartAdapter(ComponentAdapter<?> adapter) {
if (adapter instanceof ComponentLifecycle) {
- if (!lifecycleStrategy.isLazy(adapter.getComponentImplementation())) {
+ if (!lifecycleStrategy.isLazy(adapter)) {
((ComponentLifecycle<?>)adapter).start(this);
}
}
@@ -1009,7 +1009,7 @@
}

protected void instantiateComponentAsIsStartable(ComponentAdapter<?> adapter) {
- if (!lifecycleStrategy.isLazy(adapter.getComponentImplementation())) {
+ if (!lifecycleStrategy.isLazy(adapter)) {
adapter.getComponentInstance(DefaultPicoContainer.this, ComponentAdapter.NOTHING.class);
}
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/LifecycleStrategy.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/LifecycleStrategy.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/LifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -58,8 +58,8 @@
* or lazy (it will only start on first getComponent() ).
* The default is the first of those two.
*
- * @param type the component type in question
+ * @param adapter
* @return true if lazy, false if not lazy
*/
- boolean isLazy(Class<?> type);
+ boolean isLazy(ComponentAdapter adapter);
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -9,12 +9,7 @@
*****************************************************************************/
package org.picocontainer.adapters;

-import org.picocontainer.Behavior;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.LifecycleStrategy;
-import org.picocontainer.ComponentMonitor;
-import org.picocontainer.PicoCompositionException;
-import org.picocontainer.ComponentLifecycle;
+import org.picocontainer.*;
import org.picocontainer.adapters.AbstractAdapter;
import org.picocontainer.lifecycle.NullLifecycleStrategy;
import org.picocontainer.monitors.NullComponentMonitor;
@@ -127,7 +122,7 @@
return lifecycleStrategy.hasLifecycle(type);
}

- public boolean isLazy(Class<?> type) {
- return lifecycleStrategy.isLazy(type);
+ public boolean isLazy(ComponentAdapter adapter) {
+ return lifecycleStrategy.isLazy(adapter);
}
}

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -199,8 +199,8 @@
return delegate instanceof LifecycleStrategy && ((LifecycleStrategy) delegate).hasLifecycle(type);
}

- public boolean isLazy(Class<?> type) {
- return delegate instanceof LifecycleStrategy && ((LifecycleStrategy) delegate).isLazy(type);
+ public boolean isLazy(ComponentAdapter adapter) {
+ return delegate instanceof LifecycleStrategy && ((LifecycleStrategy) delegate).isLazy(adapter);
}

public String toString() {

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -145,8 +145,8 @@
return lifecycleStrategy.hasLifecycle(type);
}

- public boolean isLazy(Class<?> type) {
- return lifecycleStrategy.isLazy(type);
+ public boolean isLazy(ComponentAdapter adapter) {
+ return lifecycleStrategy.isLazy(adapter);
}

public String getDescriptor() {

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/AbstractMonitoringLifecycleStrategy.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/AbstractMonitoringLifecycleStrategy.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/AbstractMonitoringLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -9,6 +9,7 @@

import java.io.Serializable;

+import org.picocontainer.ComponentAdapter;
import org.picocontainer.ComponentMonitor;
import org.picocontainer.ComponentMonitorStrategy;
import org.picocontainer.LifecycleStrategy;
@@ -51,7 +52,7 @@
return componentMonitor;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/CompositeLifecycleStrategy.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/CompositeLifecycleStrategy.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/CompositeLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.picocontainer.lifecycle;

+import org.picocontainer.ComponentAdapter;
import org.picocontainer.LifecycleStrategy;

/**
@@ -51,9 +52,9 @@
return false;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
for (StartableLifecycleStrategy lifecycleStrategy : alternateStrategies) {
- if (lifecycleStrategy.isLazy(type)) {
+ if (lifecycleStrategy.isLazy(adapter)) {
return true;
}
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/NullLifecycleStrategy.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/NullLifecycleStrategy.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/NullLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -11,6 +11,7 @@

import java.io.Serializable;

+import org.picocontainer.ComponentAdapter;
import org.picocontainer.LifecycleStrategy;

/**
@@ -41,7 +42,7 @@
return false;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}
}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/DefaultPicoContainerTestCase.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -521,7 +521,7 @@
return true;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}
}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/defaults/DefaultPicoContainerLifecycleTestCase.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -324,7 +324,7 @@
return true;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}
};
@@ -361,7 +361,7 @@
return true;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}
};

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -15,7 +15,7 @@
final StringBuilder sb = new StringBuilder();
MutablePicoContainer pico = new DefaultPicoContainer(new StartableLifecycleStrategy(new NullComponentMonitor()) {
@Override
- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return true;
}
}, new EmptyPicoContainer());
@@ -37,7 +37,7 @@
final StringBuilder sb = new StringBuilder();
MutablePicoContainer pico = new DefaultPicoContainer(new StartableLifecycleStrategy(new NullComponentMonitor()) {
@Override
- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return true;
}
}, new EmptyPicoContainer());
@@ -56,8 +56,8 @@
final StringBuilder sb = new StringBuilder();
MutablePicoContainer pico = new DefaultPicoContainer(new StartableLifecycleStrategy(new NullComponentMonitor()) {
@Override
- public boolean isLazy(Class<?> type) {
- return type == MyStartableComp.class;
+ public boolean isLazy(ComponentAdapter adapter) {
+ return adapter.getComponentImplementation() == MyStartableComp.class;
}
}, new EmptyPicoContainer());
pico.addComponent(sb);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTest.java (5557 => 5558)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTest.java 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/tck/AbstractComponentAdapterTest.java 2009-11-02 13:10:05 UTC (rev 5558)
@@ -624,7 +624,7 @@
return true;
}

- public boolean isLazy(Class<?> type) {
+ public boolean isLazy(ComponentAdapter adapter) {
return false;
}

Modified: java/2.x/trunk/pico/distribution/src/site/content/lifecycle.html (5557 => 5558)

--- java/2.x/trunk/pico/distribution/src/site/content/lifecycle.html 2009-11-01 20:50:32 UTC (rev 5557)
+++ java/2.x/trunk/pico/distribution/src/site/content/lifecycle.html 2009-11-02 13:10:05 UTC (rev 5558)
@@ -138,13 +138,14 @@
<div class="source"><pre>
pico = new DefaultPicoContainer(new StartableLifecycleStrategy() {
@Override
- public boolean isLazy(Class&lt;?> type) {
+ public boolean isLazy(ComponentAdapter&lt;?> adapter) {
return true; // or something more conditional
}
});
pico.addComponent(Apple.class);
pico.start(); // start does not get called yet
Apple a = pico.getComponent(Apple.class); // start gets called now as part of getComponent(..)
+pico.stop(); // stop all components that are startable whether lazy or not
</pre>
</div>

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email