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/InternalFactoryToProviderAdapter.java b/src/com/google/inject/InternalFactoryToProviderAdapter.java
index 6b5fa95..6a21b40 100644
--- a/src/com/google/inject/InternalFactoryToProviderAdapter.java
+++ b/src/com/google/inject/InternalFactoryToProviderAdapter.java
@@ -17,8 +17,8 @@
package com.google.inject;
import com.google.inject.internal.ErrorMessages;
-import com.google.inject.internal.Objects;
import com.google.inject.spi.SourceProviders;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* @author crazybob@google.com (Bob Lee)
@@ -34,8 +34,8 @@
public InternalFactoryToProviderAdapter(
Provider<? extends T> provider, Object source) {
- this.provider = Objects.nonNull(provider, "provider");
- this.source = Objects.nonNull(source, "source");
+ this.provider = checkNotNull(provider, "provider");
+ this.source = checkNotNull(source, "source");
}
public T get(InternalContext context, InjectionPoint<?> injectionPoint) {