[picocontainer-scm] [5624] java/2.x/trunk/pico/container/src/java/org/picocontainer: move null obj to top level

Revision 5624
Author paul
Date 2010-02-19 15:42:23 -0600 (Fri, 19 Feb 2010)

Log Message

move null obj to top level

Modified Paths

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

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

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

Added Paths

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

Diff

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2010-02-19 21:32:37 UTC (rev 5623)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/DefaultPicoContainer.java 2010-02-19 21:42:23 UTC (rev 5624)
@@ -36,6 +36,7 @@
import org.picocontainer.containers.EmptyPicoContainer;
import org.picocontainer.containers.ImmutablePicoContainer;
import org.picocontainer.converters.BuiltInConverters;
+import org.picocontainer.converters.ConvertsNothing;
import org.picocontainer.injectors.AbstractInjector;
import org.picocontainer.injectors.AdaptingInjection;
import org.picocontainer.injectors.FactoryInjector;
@@ -1080,7 +1081,7 @@

public synchronized Converters getConverters() {
if (converters == null) {
- if (parent == null || (parent instanceof Converting && ((Converting) parent).getConverters() instanceof EmptyPicoContainer.NullConverter)) {
+ if (parent == null || (parent instanceof Converting && ((Converting) parent).getConverters() instanceof ConvertsNothing)) {
converters = new BuiltInConverters();
} else {
return ((Converting) parent).getConverters();

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/EmptyPicoContainer.java (5623 => 5624)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/EmptyPicoContainer.java 2010-02-19 21:32:37 UTC (rev 5623)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/EmptyPicoContainer.java 2010-02-19 21:42:23 UTC (rev 5624)
@@ -10,6 +10,7 @@
package org.picocontainer.containers;

import org.picocontainer.*;
+import org.picocontainer.converters.ConvertsNothing;

import java.io.Serializable;
import java.util.Collection;
@@ -105,17 +106,7 @@
}

public Converters getConverters() {
- return new NullConverter();
+ return new ConvertsNothing();
}

- @SuppressWarnings("unused")
- public static class NullConverter implements Converters {
- public boolean canConvert( Type type) {
- return false;
- }
-
- public Object convert(String paramValue, Type type) {
- return null;
- }
- }
}

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/ImmutablePicoContainer.java (5623 => 5624)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/ImmutablePicoContainer.java 2010-02-19 21:32:37 UTC (rev 5623)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/containers/ImmutablePicoContainer.java 2010-02-19 21:42:23 UTC (rev 5624)
@@ -10,6 +10,7 @@
package org.picocontainer.containers;

import org.picocontainer.*;
+import org.picocontainer.converters.ConvertsNothing;

import java.util.List;
import java.util.Collection;
@@ -111,6 +112,6 @@
if (delegate instanceof Converting) {
return ((Converting) delegate).getConverters();
}
- return new EmptyPicoContainer.NullConverter();
+ return new ConvertsNothing();
}
}

Added: java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/ConvertsNothing.java (0 => 5624)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/ConvertsNothing.java (rev 0)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/ConvertsNothing.java 2010-02-19 21:42:23 UTC (rev 5624)
@@ -0,0 +1,16 @@
+package org.picocontainer.converters;
+
+import org.picocontainer.Converters;
+
+import java.lang.reflect.Type;
+
+@SuppressWarnings("unused")
+public class ConvertsNothing implements Converters {
+ public boolean canConvert( Type type) {
+ return false;
+ }
+
+ public Object convert(String paramValue, Type type) {
+ return null;
+ }
+}

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email