move Functions to internal/util. it was missed during the initial sweep in r1185.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1197 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/internal/BytecodeGen.java b/src/com/google/inject/internal/BytecodeGen.java
index 2c61232..d83ebd6 100644
--- a/src/com/google/inject/internal/BytecodeGen.java
+++ b/src/com/google/inject/internal/BytecodeGen.java
@@ -16,6 +16,7 @@
package com.google.inject.internal;
+import com.google.inject.internal.util.Function;
import com.google.inject.internal.util.ImmutableMap;
import com.google.inject.internal.util.MapMaker;
import java.lang.reflect.Constructor;
diff --git a/src/com/google/inject/internal/FailableCache.java b/src/com/google/inject/internal/FailableCache.java
index eca27e4..2d7f885 100644
--- a/src/com/google/inject/internal/FailableCache.java
+++ b/src/com/google/inject/internal/FailableCache.java
@@ -16,6 +16,7 @@
package com.google.inject.internal;
+import com.google.inject.internal.util.Function;
import com.google.inject.internal.util.MapMaker;
import java.util.Map;
diff --git a/src/com/google/inject/internal/util/CustomConcurrentHashMap.java b/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
index cb65dc0..c099488 100644
--- a/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
+++ b/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import com.google.inject.internal.Nullable;
import java.io.IOException;
import java.io.Serializable;
@@ -43,7 +42,7 @@
* provides the surrounding concurrent data structure which implements {@link
* ConcurrentMap}. Additionally supports implementing maps where {@link
* Map#get} atomically computes values on demand (see {@link
- * Builder#buildComputingMap(ComputingStrategy, com.google.inject.internal.Function)}).
+ * Builder#buildComputingMap(ComputingStrategy, com.google.inject.internal.util.Function)}).
*
* <p>The resulting hash table supports full concurrency of retrievals and
* adjustable expected concurrency for updates. Even though all operations are
diff --git a/src/com/google/inject/internal/Function.java b/src/com/google/inject/internal/util/Function.java
similarity index 96%
rename from src/com/google/inject/internal/Function.java
rename to src/com/google/inject/internal/util/Function.java
index f6e9893..ce4a80c 100644
--- a/src/com/google/inject/internal/Function.java
+++ b/src/com/google/inject/internal/util/Function.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package com.google.inject.internal;
+package com.google.inject.internal.util;
+
+import com.google.inject.internal.Nullable;
/**
* A transformation from one object to another. For example, a
diff --git a/src/com/google/inject/internal/util/Iterables.java b/src/com/google/inject/internal/util/Iterables.java
index 5af7413..ab2835d 100644
--- a/src/com/google/inject/internal/util/Iterables.java
+++ b/src/com/google/inject/internal/util/Iterables.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/src/com/google/inject/internal/util/Iterators.java b/src/com/google/inject/internal/util/Iterators.java
index 993c1ea..2ffbe1b 100644
--- a/src/com/google/inject/internal/util/Iterators.java
+++ b/src/com/google/inject/internal/util/Iterators.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import com.google.inject.internal.Nullable;
import java.util.Arrays;
import java.util.Collection;
diff --git a/src/com/google/inject/internal/util/MapMaker.java b/src/com/google/inject/internal/util/MapMaker.java
index 9ea17b3..284337c 100644
--- a/src/com/google/inject/internal/util/MapMaker.java
+++ b/src/com/google/inject/internal/util/MapMaker.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import com.google.inject.internal.util.CustomConcurrentHashMap.ComputingStrategy;
import com.google.inject.internal.util.CustomConcurrentHashMap.Internals;
import java.io.IOException;
diff --git a/src/com/google/inject/internal/util/StackTraceElements.java b/src/com/google/inject/internal/util/StackTraceElements.java
index f121a08..f96f492 100644
--- a/src/com/google/inject/internal/util/StackTraceElements.java
+++ b/src/com/google/inject/internal/util/StackTraceElements.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import com.google.inject.internal.MoreTypes;
import java.io.IOException;
import java.lang.reflect.Constructor;
diff --git a/test/com/google/inject/internal/util/MapMakerTestSuite.java b/test/com/google/inject/internal/util/MapMakerTestSuite.java
index 2f14af2..d0c828c 100644
--- a/test/com/google/inject/internal/util/MapMakerTestSuite.java
+++ b/test/com/google/inject/internal/util/MapMakerTestSuite.java
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Function;
import com.google.inject.internal.Nullable;
import com.google.inject.internal.util.ComputationException;
import com.google.inject.internal.util.CustomConcurrentHashMap.Impl;
