Move internal utility code to separate package.

These files have moved from c.g.i.internal to c.g.i.internal.util. Visibility has been increased when necessary.

AbstractIterator.java 
AbstractMapEntry.java 
AsynchronousComputationException.java 
Classes.java 
Collections2.java 
ComputationException.java 
CustomConcurrentHashMap.java 
ExpirationTimer.java 
FinalizablePhantomReference.java 
FinalizableReference.java 
FinalizableReferenceQueue.java 
FinalizableSoftReference.java 
FinalizableWeakReference.java 
Finalizer.java 
Function.java 
Hashing.java 
ImmutableCollection.java 
ImmutableEntry.java 
ImmutableList.java 
ImmutableMap.java 
ImmutableSet.java 
Iterables.java 
Iterators.java 
Join.java 
LineNumbers.java 
Lists.java 
MapMaker.java 
Maps.java 
NullOutputException.java 
ObjectArrays.java 
Objects.java 
Preconditions.java 
Sets.java 
SourceProvider.java 
StackTraceElements.java 
Stopwatch.java 
Strings.java 
ToStringBuilder.java 
UnmodifiableIterator.java 

The rest of this change is just imports changes. Thanks to Max Bowsher for the idea.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1185 d779f126-a31b-0410-b53b-1d3aecad763e

27 files changed, 53 insertions, 53 deletions

diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java
index b6024e25..78b79af2 100755
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/AssistedConstructor.java
@@ -18,7 +18,7 @@ package com.google.inject.assistedinject;
 
 import com.google.inject.Inject;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.Lists;
+import com.google.inject.internal.util.Lists;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java b/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java
index e33e6dba..3f8dedbd 100644
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/BindingCollector.java
@@ -18,8 +18,8 @@ package com.google.inject.assistedinject;
 import com.google.inject.ConfigurationException;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Maps;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Maps;
 import com.google.inject.spi.Message;
 import java.util.Collections;
 import java.util.Map;
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
index deab85ff..8b336eed 100755
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
@@ -26,10 +26,10 @@ import static com.google.inject.internal.Annotations.getKey;
 import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.Errors;
 import com.google.inject.internal.ErrorsException;
-import com.google.inject.internal.ImmutableMap;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Lists;
-import com.google.inject.internal.Maps;
+import com.google.inject.internal.util.ImmutableMap;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Lists;
+import com.google.inject.internal.util.Maps;
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.HasDependencies;
 import com.google.inject.spi.Message;
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
index 282c9ca9..101f7987 100644
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
@@ -31,14 +31,14 @@ import static com.google.inject.internal.Annotations.getKey;
 import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.Errors;
 import com.google.inject.internal.ErrorsException;
-import com.google.inject.internal.ImmutableList;
-import com.google.inject.internal.ImmutableMap;
-import com.google.inject.internal.Iterables;
-import com.google.inject.internal.ToStringBuilder;
-
-import static com.google.inject.internal.Iterables.getOnlyElement;
-import com.google.inject.internal.Lists;
-import static com.google.inject.internal.Preconditions.checkState;
+import com.google.inject.internal.util.ImmutableList;
+import com.google.inject.internal.util.ImmutableMap;
+import com.google.inject.internal.util.Iterables;
+import com.google.inject.internal.util.ToStringBuilder;
+
+import static com.google.inject.internal.util.Iterables.getOnlyElement;
+import com.google.inject.internal.util.Lists;
+import static com.google.inject.internal.util.Preconditions.checkState;
 
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.InjectionPoint;
diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
index 42626154..dfb830d2 100755
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
@@ -21,7 +21,7 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.internal.Annotations;
-import static com.google.inject.internal.Preconditions.checkArgument;
+import static com.google.inject.internal.util.Preconditions.checkArgument;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java
index 2227b0f7..27abb789 100644
--- a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java
+++ b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryModuleBuilderTest.java
@@ -24,7 +24,7 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.Iterables;
+import com.google.inject.internal.util.Iterables;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.google.inject.spi.Message;
diff --git a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java
index cc770013..e3abf7c5 100755
--- a/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java
+++ b/extensions/assistedinject/test/com/google/inject/assistedinject/FactoryProviderTest.java
@@ -27,7 +27,7 @@ import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.ImmutableSet;
+import com.google.inject.internal.util.ImmutableSet;
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.google.inject.spi.Dependency;
diff --git a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
index 85bb0adf..73098cb2 100644
--- a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
+++ b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
@@ -20,7 +20,7 @@ import com.google.inject.Binding;
 import com.google.inject.Inject;
 import com.google.inject.Key;
 import com.google.inject.Provider;
-import com.google.inject.internal.Lists;
+import com.google.inject.internal.util.Lists;
 import com.google.inject.internal.Nullable;
 import com.google.inject.spi.BindingTargetVisitor;
 import com.google.inject.spi.ConstructorBinding;
diff --git a/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java b/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java
index 6782f2af..c6a8fb01 100644
--- a/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java
+++ b/extensions/grapher/src/com/google/inject/grapher/InjectorGrapher.java
@@ -21,7 +21,7 @@ import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.internal.Sets;
+import com.google.inject.internal.util.Sets;
 import com.google.inject.spi.BindingTargetVisitor;
 import java.io.IOException;
 import java.util.Collection;
diff --git a/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java b/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java
index 396691eb..83c145a9 100644
--- a/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java
+++ b/extensions/grapher/src/com/google/inject/grapher/ShortNameFactory.java
@@ -18,10 +18,10 @@ package com.google.inject.grapher;
 
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.Join;
-import com.google.inject.internal.Lists;
+import com.google.inject.internal.util.Join;
+import com.google.inject.internal.util.Lists;
 import com.google.inject.internal.ProviderMethod;
-import com.google.inject.internal.StackTraceElements;
+import com.google.inject.internal.util.StackTraceElements;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
diff --git a/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java b/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java
index f7badaee..62dcdd20 100644
--- a/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java
+++ b/extensions/grapher/src/com/google/inject/grapher/TransitiveDependencyVisitor.java
@@ -17,8 +17,8 @@
 package com.google.inject.grapher;
 
 import com.google.inject.Key;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Sets;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Sets;
 import com.google.inject.spi.BindingTargetVisitor;
 import com.google.inject.spi.ConstructorBinding;
 import com.google.inject.spi.ConvertedConstantBinding;
diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java
index 4c065099..68d61e7e 100644
--- a/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java
+++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/BindingEdgeFactory.java
@@ -18,7 +18,7 @@ package com.google.inject.grapher.graphviz;
 
 import com.google.inject.Inject;
 import com.google.inject.grapher.BindingEdge;
-import com.google.inject.internal.ImmutableList;
+import com.google.inject.internal.util.ImmutableList;
 
 /**
  * Graphviz-specific implementation of {@link BindingEdge.Factory}. Uses a
diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java
index 008cea88..ca82c92f 100644
--- a/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java
+++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/DependencyEdgeFactory.java
@@ -18,7 +18,7 @@ package com.google.inject.grapher.graphviz;
 
 import com.google.inject.Inject;
 import com.google.inject.grapher.DependencyEdge;
-import com.google.inject.internal.ImmutableList;
+import com.google.inject.internal.util.ImmutableList;
 import com.google.inject.spi.InjectionPoint;
 
 /**
diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java
index 0692e34d..aab1cb84 100644
--- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java
+++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizEdge.java
@@ -16,7 +16,7 @@
 
 package com.google.inject.grapher.graphviz;
 
-import com.google.inject.internal.ImmutableList;
+import com.google.inject.internal.util.ImmutableList;
 import java.util.List;
 
 /**
diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java
index a8c0d869..9b06ba69 100644
--- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java
+++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizNode.java
@@ -16,9 +16,9 @@
 
 package com.google.inject.grapher.graphviz;
 
-import com.google.inject.internal.ImmutableList;
-import com.google.inject.internal.ImmutableMap;
-import com.google.inject.internal.Maps;
+import com.google.inject.internal.util.ImmutableList;
+import com.google.inject.internal.util.ImmutableMap;
+import com.google.inject.internal.util.Maps;
 import java.util.List;
 import java.util.Map;
 
diff --git a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java
index 09185276..7d01f5fb 100644
--- a/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java
+++ b/extensions/grapher/src/com/google/inject/grapher/graphviz/GraphvizRenderer.java
@@ -19,9 +19,9 @@ package com.google.inject.grapher.graphviz;
 import com.google.inject.grapher.ImplementationNode;
 import com.google.inject.grapher.NodeAliasFactory;
 import com.google.inject.grapher.Renderer;
-import com.google.inject.internal.Join;
-import com.google.inject.internal.Lists;
-import com.google.inject.internal.Maps;
+import com.google.inject.internal.util.Join;
+import com.google.inject.internal.util.Lists;
+import com.google.inject.internal.util.Maps;
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Map;
diff --git a/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java b/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java
index 8450a383..8b4ce452 100644
--- a/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java
+++ b/extensions/grapher/test/com/google/inject/grapher/GraphingVisitorTest.java
@@ -21,8 +21,8 @@ import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Lists;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Lists;
 import com.google.inject.spi.ConstructorBinding;
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.HasDependencies;
diff --git a/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java b/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java
index 8907ee3b..97772d27 100644
--- a/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java
+++ b/extensions/grapher/test/com/google/inject/grapher/ShortNameFactoryTest.java
@@ -27,7 +27,7 @@ import com.google.inject.Provider;
 import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 import com.google.inject.internal.ProviderMethod;
-import com.google.inject.internal.StackTraceElements;
+import com.google.inject.internal.util.StackTraceElements;
 import com.google.inject.name.Names;
 import com.google.inject.spi.DefaultBindingTargetVisitor;
 import com.google.inject.spi.ProviderInstanceBinding;
diff --git a/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java b/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java
index e124e628..8e896f7e 100644
--- a/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java
+++ b/extensions/grapher/test/com/google/inject/grapher/TransitiveDependencyVisitorTest.java
@@ -24,7 +24,7 @@ import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.ImmutableSet;
+import com.google.inject.internal.util.ImmutableSet;
 import com.google.inject.name.Names;
 import com.google.inject.spi.ConstructorBinding;
 import com.google.inject.spi.ConvertedConstantBinding;
diff --git a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java
index 6c9993f1..072996a1 100644
--- a/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java
+++ b/extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java
@@ -24,8 +24,8 @@ import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.binder.LinkedBindingBuilder;
-import com.google.inject.internal.ImmutableMap;
-import com.google.inject.internal.ImmutableSet;
+import com.google.inject.internal.util.ImmutableMap;
+import com.google.inject.internal.util.ImmutableSet;
 import com.google.inject.multibindings.Multibinder.RealMultibinder;
 import static com.google.inject.multibindings.Multibinder.checkConfiguration;
 import static com.google.inject.multibindings.Multibinder.checkNotNull;
diff --git a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
index b846e042..bc011343 100644
--- a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
+++ b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
@@ -29,10 +29,11 @@ import com.google.inject.TypeLiteral;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.internal.Annotations;
 import com.google.inject.internal.Errors;
-import com.google.inject.internal.ImmutableList;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Lists;
+import com.google.inject.internal.util.ImmutableList;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Lists;
 import static com.google.inject.name.Names.named;
+
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.HasDependencies;
 import com.google.inject.spi.Message;
diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
index 3ba12521..36acb199 100644
--- a/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
+++ b/extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
@@ -34,8 +34,8 @@ import com.google.inject.Provider;
 import com.google.inject.ProvisionException;
 import com.google.inject.Stage;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Maps;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Maps;
 import com.google.inject.name.Names;
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.HasDependencies;
diff --git a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
index 0cab9266..47a6ead7 100644
--- a/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
+++ b/extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
@@ -19,7 +19,6 @@ package com.google.inject.multibindings;
 import com.google.inject.AbstractModule;
 import static com.google.inject.Asserts.assertContains;
 
-import com.google.inject.Binder;
 import com.google.inject.Binding;
 import com.google.inject.BindingAnnotation;
 import com.google.inject.CreationException;
@@ -32,9 +31,9 @@ import com.google.inject.Provider;
 import com.google.inject.ProvisionException;
 import com.google.inject.Stage;
 import com.google.inject.TypeLiteral;
-import com.google.inject.internal.ImmutableList;
-import com.google.inject.internal.ImmutableSet;
-import com.google.inject.internal.Sets;
+import com.google.inject.internal.util.ImmutableList;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.internal.util.Sets;
 import com.google.inject.name.Names;
 import static com.google.inject.name.Names.named;
 import com.google.inject.spi.Dependency;
diff --git a/extensions/persist/src/com/google/inject/persist/PersistModule.java b/extensions/persist/src/com/google/inject/persist/PersistModule.java
index d8d5956b..409d3b60 100644
--- a/extensions/persist/src/com/google/inject/persist/PersistModule.java
+++ b/extensions/persist/src/com/google/inject/persist/PersistModule.java
@@ -2,7 +2,7 @@ package com.google.inject.persist;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.BindingAnnotation;
-import com.google.inject.internal.Preconditions;
+import com.google.inject.internal.util.Preconditions;
 import com.google.inject.persist.jpa.InternalJpaModule;
 import com.google.inject.servlet.ServletModule;
 import java.lang.annotation.Retention;
diff --git a/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerFactoryProvider.java b/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerFactoryProvider.java
index 8aed0f27..738ad9f2 100644
--- a/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerFactoryProvider.java
+++ b/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerFactoryProvider.java
@@ -20,7 +20,7 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;

 import com.google.inject.Singleton;

 import com.google.inject.internal.Nullable;

-import com.google.inject.internal.Preconditions;

+import com.google.inject.internal.util.Preconditions;

 import com.google.inject.persist.PersistModule;

 import com.google.inject.persist.PersistenceService;

 import java.util.Properties;

diff --git a/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerProvider.java b/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerProvider.java
index 7644a3ac..82f71f4d 100644
--- a/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerProvider.java
+++ b/extensions/persist/src/com/google/inject/persist/jpa/EntityManagerProvider.java
@@ -19,7 +19,7 @@ package com.google.inject.persist.jpa;
 import com.google.inject.Inject;

 import com.google.inject.Provider;

 import com.google.inject.Singleton;

-import com.google.inject.internal.Preconditions;

+import com.google.inject.internal.util.Preconditions;

 import com.google.inject.persist.WorkManager;

 import javax.persistence.EntityManager;

 import javax.persistence.EntityManagerFactory;

diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java
index c23d7677..4eadf1eb 100644
--- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java
+++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java
@@ -23,7 +23,7 @@ import com.google.inject.Key;
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.binder.ScopedBindingBuilder;
-import static com.google.inject.internal.Preconditions.checkNotNull;
+import static com.google.inject.internal.util.Preconditions.checkNotNull;
 import com.google.inject.internal.UniqueAnnotations;
 import com.google.inject.util.Types;
 import java.lang.annotation.Annotation;