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/RuntimeReflectionFactory.java b/src/com/google/inject/RuntimeReflectionFactory.java
index 0bd7b2b..f7ba25e 100644
--- a/src/com/google/inject/RuntimeReflectionFactory.java
+++ b/src/com/google/inject/RuntimeReflectionFactory.java
@@ -18,7 +18,7 @@
 package com.google.inject;
 
 import com.google.inject.internal.*;
-import static com.google.inject.internal.Objects.nonNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.lang.reflect.Constructor;
 
@@ -37,8 +37,8 @@
 
     private RuntimeReflection(ErrorHandler errorHandler,
         ConstructionProxyFactory constructionProxyFactory) {
-      this.errorHandler = nonNull(errorHandler, "errorHandler");
-      this.constructionProxyFactory = nonNull(constructionProxyFactory, "constructionProxyFatory");
+      this.errorHandler = checkNotNull(errorHandler, "errorHandler");
+      this.constructionProxyFactory = checkNotNull(constructionProxyFactory, "constructionProxyFatory");
     }
 
     public <T> ConstructionProxy<T> getConstructionProxy(Class<T> implementation) {