LAST move of the visitors. I moved BindTargetVisitor to BindingTargetVisitor and Element.Visitor to ElementVisitor
git-svn-id: https://google-guice.googlecode.com/svn/trunk@584 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/spi/BindScopingVisitor.java b/src/com/google/inject/spi/BindScopingVisitor.java
deleted file mode 100644
index 1c76ae0..0000000
--- a/src/com/google/inject/spi/BindScopingVisitor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject.spi;
-
-import com.google.inject.Scope;
-import java.lang.annotation.Annotation;
-
-/**
- * Visits each of the strategies used to scope an injection.
- *
- * @param <V> any type to be returned by the visit method. Use {@link Void} with
- * {@code return null} if no return type is needed.
- */
-public interface BindScopingVisitor<V> {
-
- /**
- * Visit an eager singleton or single instance. This scope strategy is found on both module and
- * injector bindings.
- */
- V visitEagerSingleton();
-
- /**
- * Visit a scope instance. This scope strategy is found on both module and injector bindings.
- */
- V visitScope(Scope scope);
-
- /**
- * Visit a scope annotation. This scope strategy is found only on module bindings. The instance
- * that implements this scope is registered by {@link com.google.inject.Binder#bindScope(Class,
- * Scope) Binder.bindScope()}.
- */
- V visitScopeAnnotation(Class<? extends Annotation> scopeAnnotation);
-
- /**
- * Visit an unspecified or unscoped strategy. On a module, this strategy indicates that the
- * injector should use scoping annotations to find a scope. On an injector, it indicates that
- * no scope is applied to the binding. An unscoped binding will behave like a scoped one when it
- * is linked to a scoped binding.
- */
- V visitNoScoping();
-}
diff --git a/src/com/google/inject/spi/BindTargetVisitor.java b/src/com/google/inject/spi/BindTargetVisitor.java
deleted file mode 100644
index e7dc547..0000000
--- a/src/com/google/inject/spi/BindTargetVisitor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject.spi;
-
-import com.google.inject.Key;
-import com.google.inject.Provider;
-import java.lang.reflect.Constructor;
-
-/**
- * Visits each of the strategies used to find an instance to satisfy an injection.
- *
- * @param <V> any type to be returned by the visit method. Use {@link Void} with
- * {@code return null} if no return type is needed.
- */
-public interface BindTargetVisitor<T, V> {
-
- /**
- * Visit a instance binding. The same instance is returned for every injection. This target is
- * found in both module and injector bindings.
- *
- * @param instance the user-supplied value
- */
- V visitInstance(T instance);
-
- /**
- * Visit a provider instance binding. The provider's {@code get} method is invoked to resolve
- * injections. This target is found in both module and injector bindings.
- *
- * @param provider the user-supplied, unscoped provider
- */
- V visitProvider(Provider<? extends T> provider);
-
- /**
- * Visit a provider key binding. To resolve injections, the provider injection is first
- * resolved, then that provider's {@code get} method is invoked. This target is found in both
- * module and injector bindings.
- *
- * @param providerKey the key used to resolve the provider's binding. That binding can be
- * retrieved from an injector using {@link com.google.inject.Injector#getBinding(Key)
- * Injector.getBinding(providerKey)}
- */
- V visitProviderKey(Key<? extends Provider<? extends T>> providerKey);
-
- /**
- * Visit a linked key binding. The other key's binding is used to resolve injections. This
- * target is found in both module and injector bindings.
- *
- * @param key the linked key used to resolve injections. That binding can be retrieved from an
- * injector using {@link com.google.inject.Injector#getBinding(Key) Injector.getBinding(key)}
- */
- V visitKey(Key<? extends T> key);
-
- /**
- * Visit an untargetted binding. This target is found only on module bindings. It indicates
- * that the injector should use its implicit binding strategies to resolve injections.
- */
- V visitUntargetted();
-
- /**
- * Visit a constructor binding. To resolve injections, an instance is instantiated by invoking
- * {@code constructor}. This target is found only on injector bindings.
- *
- * @param constructor the {@link com.google.inject.Inject annotated} or default constructor that
- * is invoked for creating values
- */
- V visitConstructor(Constructor<? extends T> constructor);
-
- /**
- * Visit a binding created from converting a bound instance to a new type. The source binding
- * has the same binding annotation but a different type. This target is found only on injector
- * bindings.
- *
- * @param value the converted value
- */
- V visitConvertedConstant(T value);
-
- /**
- * Visit a binding to a {@link com.google.inject.Provider} that delegates to the binding for the
- * provided type. This target is found only on injector bindings.
- *
- * @param provided the key whose binding is used to {@link com.google.inject.Provider#get provide
- * instances}. That binding can be retrieved from an injector using {@link
- * com.google.inject.Injector#getBinding(Key) Injector.getBinding(provided)}
- */
- V visitProviderBinding(Key<?> provided);
-}
diff --git a/src/com/google/inject/spi/DefaultBindTargetVisitor.java b/src/com/google/inject/spi/DefaultBindTargetVisitor.java
deleted file mode 100644
index 03e4a6b..0000000
--- a/src/com/google/inject/spi/DefaultBindTargetVisitor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject.spi;
-
-import com.google.inject.Key;
-import com.google.inject.Provider;
-import java.lang.reflect.Constructor;
-
-/**
- * No-op visitor for subclassing.
- *
- * @author jessewilson@google.com (Jesse Wilson)
- */
-public class DefaultBindTargetVisitor<T, V> implements BindTargetVisitor<T, V> {
-
- protected V visitOther() {
- return null;
- }
-
- public V visitInstance(T instance) {
- return visitOther();
- }
-
- public V visitProvider(Provider<? extends T> provider) {
- return visitOther();
- }
-
- public V visitProviderKey(Key<? extends Provider<? extends T>> providerKey) {
- return visitOther();
- }
-
- public V visitKey(Key<? extends T> key) {
- return visitOther();
- }
-
- public V visitUntargetted() {
- return visitOther();
- }
-
- public V visitConstructor(Constructor<? extends T> constructor) {
- return visitOther();
- }
-
- public V visitConvertedConstant(T value) {
- return visitOther();
- }
-
- public V visitProviderBinding(Key<?> provided) {
- return visitOther();
- }
-}
diff --git a/test/com/google/inject/spi/FailingBindScopingVisitor.java b/test/com/google/inject/spi/FailingBindScopingVisitor.java
deleted file mode 100644
index 22721d1..0000000
--- a/test/com/google/inject/spi/FailingBindScopingVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject.spi;
-
-import com.google.inject.Scope;
-import java.lang.annotation.Annotation;
-import junit.framework.AssertionFailedError;
-
-class FailingBindScopingVisitor implements BindScopingVisitor<Void> {
-
- public Void visitEagerSingleton() {
- throw new AssertionFailedError();
- }
-
- public Void visitScope(Scope scope) {
- throw new AssertionFailedError();
- }
-
- public Void visitScopeAnnotation(Class<? extends Annotation> scopeAnnotation) {
- throw new AssertionFailedError();
- }
-
- public Void visitNoScoping() {
- throw new AssertionFailedError();
- }
-}
\ No newline at end of file
