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/commands/CommandReplayer.java b/src/com/google/inject/commands/CommandReplayer.java
index f1a1b28..96f3f7a 100644
--- a/src/com/google/inject/commands/CommandReplayer.java
+++ b/src/com/google/inject/commands/CommandReplayer.java
@@ -23,8 +23,8 @@
 import com.google.inject.binder.ConstantBindingBuilder;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.binder.ScopedBindingBuilder;
-import com.google.inject.internal.Objects;
 import com.google.inject.spi.SourceProviders;
+import static com.google.common.base.Preconditions.checkNotNull;
 import org.aopalliance.intercept.MethodInterceptor;
 
 import java.util.List;
@@ -52,8 +52,8 @@
    * Replays {@code commands} against {@code binder}.
    */
   public final void replay(final Binder binder, Iterable<Command> commands) {
-    Objects.nonNull(binder, "binder");
-    Objects.nonNull(commands, "commands");
+    checkNotNull(binder, "binder");
+    checkNotNull(commands, "commands");
 
     Command.Visitor<Void> visitor = new Command.Visitor<Void>() {
       public Void visitAddMessageError(AddMessageErrorCommand command) {