Adopt latest google collections snapshot (partially); some style cleanup
git-svn-id: https://google-guice.googlecode.com/svn/trunk@504 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/ScopesCommandProcessor.java b/src/com/google/inject/ScopesCommandProcessor.java
index a19fd05..87c0ce7 100644
--- a/src/com/google/inject/ScopesCommandProcessor.java
+++ b/src/com/google/inject/ScopesCommandProcessor.java
@@ -20,8 +20,8 @@
import com.google.inject.internal.Annotations;
import com.google.inject.internal.ErrorHandler;
import com.google.inject.internal.ErrorMessages;
-import static com.google.inject.internal.Objects.nonNull;
import com.google.inject.internal.StackTraceElements;
+import static com.google.common.base.Preconditions.checkNotNull;
import java.lang.annotation.Annotation;
import java.util.Map;
@@ -58,12 +58,12 @@
// Go ahead and bind anyway so we don't get collateral errors.
}
- Scope existing = scopes.get(nonNull(annotationType, "annotation type"));
+ Scope existing = scopes.get(checkNotNull(annotationType, "annotation type"));
if (existing != null) {
addError(command.getSource(), ErrorMessages.DUPLICATE_SCOPES, existing,
annotationType, scope);
} else {
- scopes.put(annotationType, nonNull(scope, "scope"));
+ scopes.put(annotationType, checkNotNull(scope, "scope"));
}
return true;