commit bd9544e08ba5d41995024e7e301faf465457e593
author crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> Sun Feb 25 20:32:11 2007 +0000
committer crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> Sun Feb 25 20:32:11 2007 +0000
tree 00a8e4b2fc112990a02803078f185cbbfeae278a
parent 0b3189c21a68ffc7c53be3259d1602b42636ec65

Renamed Locator to Provider.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@214 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 a59066a..c1f7558 100644
--- a/src/com/google/inject/Scopes.java
+++ b/src/com/google/inject/Scopes.java
@@ -17,8 +17,6 @@
 package com.google.inject;
 
 import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.util.Map;
 import com.google.inject.util.StackTraceElements;
 
@@ -35,8 +33,8 @@
    * One instance per container. Also see {@code @}{@link ContainerScoped}.
    */
   public static final Scope CONTAINER = new Scope() {
-    public <T> Locator<T> scope(Key<T> key, final Locator<T> creator) {
-      return new Locator<T>() {
+    public <T> Provider<T> scope(Key<T> key, final Provider<T> creator) {
+      return new Provider<T>() {
 
         private volatile T instance;
 
@@ -118,8 +116,8 @@
     if (scope == null) {
       return creator;
     }
-    Locator<T> scoped = scope.scope(key,
-        new LocatorToInternalFactoryAdapter<T>(container, creator));
-    return new InternalFactoryToLocatorAdapter<T>(scoped);
+    Provider<T> scoped = scope.scope(key,
+        new ProviderToInternalFactoryAdapter<T>(container, creator));
+    return new InternalFactoryToProviderAdapter<T>(scoped);
   }
 }