commit a2915a9855e2d110c708425ec44854587e419790
author kevinb9n <kevinb9n@d779f126-a31b-0410-b53b-1d3aecad763e> Wed Feb 28 06:20:30 2007 +0000
committer kevinb9n <kevinb9n@d779f126-a31b-0410-b53b-1d3aecad763e> Wed Feb 28 06:20:30 2007 +0000
tree 23c1734b22fdc8c4cc48506a3c5d8be4455033d0
parent 393515b433e78c541e137765a7acbf971096c2a2

Container -> Injector; container scope -> singleton scope

git-svn-id: https://google-guice.googlecode.com/svn/trunk@240 d779f126-a31b-0410-b53b-1d3aecad763e

src/com/google/inject/Scopes.java

diff --git a/src/com/google/inject/Scopes.java b/src/com/google/inject/Scopes.java
index c1f7558..73214cd 100644
--- a/src/com/google/inject/Scopes.java
+++ b/src/com/google/inject/Scopes.java
@@ -16,9 +16,9 @@
 
 package com.google.inject;
 
+import com.google.inject.util.StackTraceElements;
 import java.lang.annotation.Annotation;
 import java.util.Map;
-import com.google.inject.util.StackTraceElements;
 
 /**
  * Built in scope implementations.
@@ -30,9 +30,9 @@
   private Scopes() {}
 
   /**
-   * One instance per container. Also see {@code @}{@link ContainerScoped}.
+   * One instance per Injector. Also see {@code @}{@link Singleton}.
    */
-  public static final Scope CONTAINER = new Scope() {
+  public static final Scope SINGLETON = new Scope() {
     public <T> Provider<T> scope(Key<T> key, final Provider<T> creator) {
       return new Provider<T>() {
 
@@ -48,7 +48,7 @@
              * Maybe one of these days we will identify independent graphs of
              * objects and offer to load them in parallel.
              */
-            synchronized (Container.class) {
+            synchronized (Injector.class) {
               if (instance == null) {
                 instance = creator.get();
               }
@@ -64,7 +64,7 @@
     }
 
     public String toString() {
-      return "Scopes.CONTAINER";
+      return "Scopes.SINGLETON";
     }
   };
 
@@ -110,14 +110,14 @@
    * Scopes an internal factory.
    */
   static <T> InternalFactory<? extends T> scope(Key<T> key,
-      ContainerImpl container, InternalFactory<? extends T> creator,
+      InjectorImpl injector, InternalFactory<? extends T> creator,
       Scope scope) {
     // No scope does nothing.
     if (scope == null) {
       return creator;
     }
     Provider<T> scoped = scope.scope(key,
-        new ProviderToInternalFactoryAdapter<T>(container, creator));
+        new ProviderToInternalFactoryAdapter<T>(injector, creator));
     return new InternalFactoryToProviderAdapter<T>(scoped);
   }
 }