Overdue update to fix the no-AOP build of Guice to compile.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@931 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/EncounterImpl.java b/src/com/google/inject/EncounterImpl.java
index 33f462e..3963009 100644
--- a/src/com/google/inject/EncounterImpl.java
+++ b/src/com/google/inject/EncounterImpl.java
@@ -27,7 +27,6 @@
import com.google.inject.spi.TypeEncounter;
import java.lang.reflect.Method;
import java.util.List;
-import org.aopalliance.intercept.MethodInterceptor;
/**
* @author jessewilson@google.com (Jesse Wilson)
@@ -38,7 +37,9 @@
private final Lookups lookups;
private List<MembersInjector<? super T>> membersInjectors; // lazy
private List<InjectionListener<? super T>> injectionListeners; // lazy
+ /*if[AOP]*/
private List<MethodAspect> aspects; // lazy
+ /*end[AOP]*/
private boolean valid = true;
public EncounterImpl(Errors errors, Lookups lookups) {
@@ -50,12 +51,26 @@
valid = false;
}
+ /*if[AOP]*/
public ImmutableList<MethodAspect> getAspects() {
return aspects == null
? ImmutableList.<MethodAspect>of()
: ImmutableList.copyOf(aspects);
}
+ public void bindInterceptor(Matcher<? super Method> methodMatcher,
+ org.aopalliance.intercept.MethodInterceptor... interceptors) {
+ checkState(valid, "Encounters may not be used after hear() returns.");
+
+ // make sure the applicable aspects is mutable
+ if (aspects == null) {
+ aspects = Lists.newArrayList();
+ }
+
+ aspects.add(new MethodAspect(Matchers.any(), methodMatcher, interceptors));
+ }
+ /*end[AOP]*/
+
public ImmutableList<MembersInjector<? super T>> getMembersInjectors() {
return membersInjectors == null
? ImmutableList.<MembersInjector<? super T>>of()
@@ -88,18 +103,6 @@
injectionListeners.add(injectionListener);
}
- public void bindInterceptor(Matcher<? super Method> methodMatcher,
- MethodInterceptor... interceptors) {
- checkState(valid, "Encounters may not be used after hear() returns.");
-
- // make sure the applicable aspects is mutable
- if (aspects == null) {
- aspects = Lists.newArrayList();
- }
-
- aspects.add(new MethodAspect(Matchers.any(), methodMatcher, interceptors));
- }
-
public void addError(String message, Object... arguments) {
checkState(valid, "Encounters may not be used after hear() returns.");
errors.addMessage(message, arguments);