8 files changed, 26 insertions, 17 deletions
diff --git a/src/com/google/inject/Binder.java b/src/com/google/inject/Binder.java
index a3fcecb8..7bc637cc 100644
--- a/src/com/google/inject/Binder.java
+++ b/src/com/google/inject/Binder.java
@@ -9,9 +9,7 @@ import java.lang.reflect.Method;
 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 2f0cbee3..4d0fd9c5 100644
--- a/src/com/google/inject/Guice.java
+++ b/src/com/google/inject/Guice.java
@@ -3,23 +3,34 @@ package com.google.inject;
 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 2e05dded..7d1c5fd9 100644
--- a/src/com/google/inject/tools/jmx/Manager.java
+++ b/src/com/google/inject/tools/jmx/Manager.java
@@ -101,7 +101,7 @@ public class Manager {
     }
 
     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 1d62b9f1..f882ef4f 100644
--- a/test/com/google/inject/ContainerTest.java
+++ b/test/com/google/inject/ContainerTest.java
@@ -83,7 +83,7 @@ public class ContainerTest extends TestCase {
   }
 
   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 c7f8d278..eb8e5208 100644
--- a/test/com/google/inject/ErrorHandlingTest.java
+++ b/test/com/google/inject/ErrorHandlingTest.java
@@ -28,7 +28,7 @@ import java.util.List;
 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 87f787fa..566acb8a 100644
--- a/test/com/google/inject/ImplicitBindingTest.java
+++ b/test/com/google/inject/ImplicitBindingTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 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 9ab639d6..39a92394 100644
--- a/test/com/google/inject/NotRequiredTest.java
+++ b/test/com/google/inject/NotRequiredTest.java
@@ -33,7 +33,7 @@ public class NotRequiredTest extends TestCase {
   }
 
   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 433c8227..606f620f 100644
--- a/test/com/google/inject/PerformanceComparison.java
+++ b/test/com/google/inject/PerformanceComparison.java
@@ -96,7 +96,7 @@ public class PerformanceComparison {
     {
       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);