Guice.newContainer() -> createContainer() and overload to allow Stage to be specified.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@194 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/Binder.java b/src/com/google/inject/Binder.java
index a3fcecb..7bc637c 100644
--- a/src/com/google/inject/Binder.java
+++ b/src/com/google/inject/Binder.java
@@ -9,9 +9,7 @@
import org.aopalliance.intercept.MethodInterceptor;
/**
- * Javadoc.
- *
- * @author Kevin Bourrillion (kevinb9n@gmail.com)
+ * TODO
*/
public interface Binder {
diff --git a/src/com/google/inject/Guice.java b/src/com/google/inject/Guice.java
index 2f0cbee..4d0fd9c 100644
--- a/src/com/google/inject/Guice.java
+++ b/src/com/google/inject/Guice.java
@@ -3,23 +3,34 @@
import java.util.Arrays;
/**
- * Javadoc.
- *
- * @author Kevin Bourrillion (kevinb9n@gmail.com)
+ * TODO
*/
-public class Guice {
+public final class Guice {
- public static Container newContainer(Module... modules)
+ public static Container createContainer(Module... modules)
throws CreationException {
- return newContainer(Arrays.asList(modules));
+ return createContainer(Arrays.asList(modules));
}
- public static Container newContainer(Iterable<Module> modules)
+ public static Container createContainer(Iterable<Module> modules)
throws CreationException {
- BinderImpl binder = new BinderImpl();
+ return createContainer(Stage.DEVELOPMENT, modules);
+ }
+
+ public static Container createContainer(Stage stage, Module... modules)
+ throws CreationException {
+ return createContainer(stage, Arrays.asList(modules));
+ }
+
+ public static Container createContainer(Stage stage, Iterable<Module> modules)
+ throws CreationException {
+ BinderImpl binder = new BinderImpl(stage);
for (Module module : modules) {
binder.install(module);
}
return binder.createContainer();
+
}
+
+ private Guice() {}
}
diff --git a/src/com/google/inject/tools/jmx/Manager.java b/src/com/google/inject/tools/jmx/Manager.java
index 2e05dde..7d1c5fd 100644
--- a/src/com/google/inject/tools/jmx/Manager.java
+++ b/src/com/google/inject/tools/jmx/Manager.java
@@ -101,7 +101,7 @@
}
Module module = (Module) Class.forName(args[0]).newInstance();
- Container container = Guice.newContainer(module);
+ Container container = Guice.createContainer(module);
manage(args[0], container);
diff --git a/test/com/google/inject/ContainerTest.java b/test/com/google/inject/ContainerTest.java
index 1d62b9f..f882ef4 100644
--- a/test/com/google/inject/ContainerTest.java
+++ b/test/com/google/inject/ContainerTest.java
@@ -83,7 +83,7 @@
}
private Container createFooContainer() throws CreationException {
- return Guice.newContainer(new AbstractModule() {
+ return Guice.createContainer(new AbstractModule() {
protected void configure() {
bind(Bar.class).to(BarImpl.class);
bind(Tee.class).to(TeeImpl.class);
diff --git a/test/com/google/inject/ErrorHandlingTest.java b/test/com/google/inject/ErrorHandlingTest.java
index c7f8d27..eb8e520 100644
--- a/test/com/google/inject/ErrorHandlingTest.java
+++ b/test/com/google/inject/ErrorHandlingTest.java
@@ -28,7 +28,7 @@
public class ErrorHandlingTest {
public static void main(String[] args) throws CreationException {
- Guice.newContainer(new MyModule());
+ Guice.createContainer(new MyModule());
}
@Inject @Named("missing")
diff --git a/test/com/google/inject/ImplicitBindingTest.java b/test/com/google/inject/ImplicitBindingTest.java
index 87f787f..566acb8 100644
--- a/test/com/google/inject/ImplicitBindingTest.java
+++ b/test/com/google/inject/ImplicitBindingTest.java
@@ -24,7 +24,7 @@
public class ImplicitBindingTest extends TestCase {
public void testCircularDependency() throws CreationException {
- Container container = Guice.newContainer();
+ Container container = Guice.createContainer();
Foo foo = container.getInstance(Foo.class);
assertSame(foo, foo.bar.foo);
}
diff --git a/test/com/google/inject/NotRequiredTest.java b/test/com/google/inject/NotRequiredTest.java
index 9ab639d..39a9239 100644
--- a/test/com/google/inject/NotRequiredTest.java
+++ b/test/com/google/inject/NotRequiredTest.java
@@ -33,7 +33,7 @@
}
public void testNotProvided() throws CreationException {
- Container c = Guice.newContainer();
+ Container c = Guice.createContainer();
Foo foo = c.getLocator(Foo.class).get();
assertNull(foo.bar);
assertNull(foo.fromMethod);
diff --git a/test/com/google/inject/PerformanceComparison.java b/test/com/google/inject/PerformanceComparison.java
index 433c822..606f620 100644
--- a/test/com/google/inject/PerformanceComparison.java
+++ b/test/com/google/inject/PerformanceComparison.java
@@ -96,7 +96,7 @@
{
Container container;
try {
- container = Guice.newContainer(new AbstractModule() {
+ container = Guice.createContainer(new AbstractModule() {
protected void configure() {
bind(Tee.class).to(TeeImpl.class);
bind(Bar.class).to(BarImpl.class);
