[picocontainer-scm] [5559] java/2.x/trunk/pico/container/src/test/org/picocontainer: chg isLazy to component adapter - with non raw type

Revision 5559
Author paul
Date 2009-11-02 07:25:49 -0600 (Mon, 02 Nov 2009)

Log Message

chg isLazy to component adapter - with non raw type

Modified Paths

- 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

Diff

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/LifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/LifecycleStrategy.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -61,5 +61,5 @@
* @param adapter
* @return true if lazy, false if not lazy
*/
- boolean isLazy(ComponentAdapter adapter);
+ boolean isLazy(ComponentAdapter<?> adapter);
}

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/adapters/InstanceAdapter.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -122,7 +122,7 @@
return lifecycleStrategy.hasLifecycle(type);
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/behaviors/AbstractBehavior.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -199,7 +199,7 @@
return delegate instanceof LifecycleStrategy && ((LifecycleStrategy) delegate).hasLifecycle(type);
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -145,7 +145,7 @@
return lifecycleStrategy.hasLifecycle(type);
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/AbstractMonitoringLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/AbstractMonitoringLifecycleStrategy.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -52,7 +52,7 @@
return componentMonitor;
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/CompositeLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/CompositeLifecycleStrategy.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -52,7 +52,7 @@
return false;
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/NullLifecycleStrategy.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/lifecycle/NullLifecycleStrategy.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -42,7 +42,7 @@
return false;
}

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

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

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

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

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

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

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

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

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

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java 2009-11-02 13:10:05 UTC (rev 5558)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/lifecycle/LazyLifecycleStrategyTestCase.java 2009-11-02 13:25:49 UTC (rev 5559)
@@ -15,7 +15,7 @@
final StringBuilder sb = new StringBuilder();
MutablePicoContainer pico = new DefaultPicoContainer(new StartableLifecycleStrategy(new NullComponentMonitor()) {
@Override
- public boolean isLazy(ComponentAdapter adapter) {
+ 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(ComponentAdapter adapter) {
+ public boolean isLazy(ComponentAdapter<?> adapter) {
return true;
}
}, new EmptyPicoContainer());
@@ -56,7 +56,7 @@
final StringBuilder sb = new StringBuilder();
MutablePicoContainer pico = new DefaultPicoContainer(new StartableLifecycleStrategy(new NullComponentMonitor()) {
@Override
- public boolean isLazy(ComponentAdapter adapter) {
+ public boolean isLazy(ComponentAdapter<?> adapter) {
return adapter.getComponentImplementation() == MyStartableComp.class;
}
}, new EmptyPicoContainer());

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

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

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

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email