diff options
Diffstat (limited to 'luni/src/main/java')
75 files changed, 79 insertions, 91 deletions
diff --git a/luni/src/main/java/java/beans/PropertyChangeSupport.java b/luni/src/main/java/java/beans/PropertyChangeSupport.java index 8c09689..04f8155 100644 --- a/luni/src/main/java/java/beans/PropertyChangeSupport.java +++ b/luni/src/main/java/java/beans/PropertyChangeSupport.java @@ -28,7 +28,7 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import libcore.base.Objects; +import libcore.util.Objects; /** * Manages a list of listeners to be notified when a property changes. Listeners diff --git a/luni/src/main/java/java/io/DataInputStream.java b/luni/src/main/java/java/io/DataInputStream.java index 935867a..adf226f 100644 --- a/luni/src/main/java/java/io/DataInputStream.java +++ b/luni/src/main/java/java/io/DataInputStream.java @@ -19,7 +19,7 @@ package java.io; import java.nio.ByteOrder; import java.nio.charset.ModifiedUtf8; -import libcore.base.Streams; +import libcore.io.Streams; import libcore.io.SizeOf; import org.apache.harmony.luni.platform.OSMemory; diff --git a/luni/src/main/java/java/io/FilePermission.java b/luni/src/main/java/java/io/FilePermission.java index e77c424..94263f1 100644 --- a/luni/src/main/java/java/io/FilePermission.java +++ b/luni/src/main/java/java/io/FilePermission.java @@ -21,7 +21,7 @@ import java.security.Permission; import java.security.PermissionCollection; import java.security.PrivilegedAction; import java.util.Locale; -import libcore.base.Objects; +import libcore.util.Objects; /** * A permission for accessing a file or directory. The FilePermission is made up diff --git a/luni/src/main/java/java/io/InputStream.java b/luni/src/main/java/java/io/InputStream.java index f2b4bfa..6718395 100644 --- a/luni/src/main/java/java/io/InputStream.java +++ b/luni/src/main/java/java/io/InputStream.java @@ -18,7 +18,7 @@ package java.io; import java.util.Arrays; -import libcore.base.Streams; +import libcore.io.Streams; /** * The base class for all input streams. An input stream is a means of reading diff --git a/luni/src/main/java/java/io/LineNumberInputStream.java b/luni/src/main/java/java/io/LineNumberInputStream.java index f8b1006..4d1cf14 100644 --- a/luni/src/main/java/java/io/LineNumberInputStream.java +++ b/luni/src/main/java/java/io/LineNumberInputStream.java @@ -18,7 +18,7 @@ package java.io; import java.util.Arrays; -import libcore.base.Streams; +import libcore.io.Streams; /** * Wraps an existing {@link InputStream} and counts the line terminators diff --git a/luni/src/main/java/java/io/ObjectInputStream.java b/luni/src/main/java/java/io/ObjectInputStream.java index 38b7db6..f50f4e7 100644 --- a/luni/src/main/java/java/io/ObjectInputStream.java +++ b/luni/src/main/java/java/io/ObjectInputStream.java @@ -20,19 +20,16 @@ package java.io; import dalvik.system.VMStack; import java.io.EmulatedFields.ObjectSlot; import java.lang.reflect.Array; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * A specialized {@link InputStream} that is able to read (deserialize) Java diff --git a/luni/src/main/java/java/io/ObjectOutputStream.java b/luni/src/main/java/java/io/ObjectOutputStream.java index 30a4c9e..4172f4d 100644 --- a/luni/src/main/java/java/io/ObjectOutputStream.java +++ b/luni/src/main/java/java/io/ObjectOutputStream.java @@ -24,7 +24,7 @@ import java.lang.reflect.Proxy; import java.nio.ByteOrder; import java.nio.charset.ModifiedUtf8; import java.util.List; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import libcore.io.SizeOf; import org.apache.harmony.luni.platform.OSMemory; diff --git a/luni/src/main/java/java/io/ObjectStreamClass.java b/luni/src/main/java/java/io/ObjectStreamClass.java index 3868100..37a576d 100644 --- a/luni/src/main/java/java/io/ObjectStreamClass.java +++ b/luni/src/main/java/java/io/ObjectStreamClass.java @@ -32,7 +32,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.WeakHashMap; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.luni.platform.OSMemory; /** diff --git a/luni/src/main/java/java/io/RandomAccessFile.java b/luni/src/main/java/java/io/RandomAccessFile.java index 7aaf5df..20f706c 100644 --- a/luni/src/main/java/java/io/RandomAccessFile.java +++ b/luni/src/main/java/java/io/RandomAccessFile.java @@ -23,7 +23,6 @@ import java.nio.NioUtils; import java.nio.channels.FileChannel; import java.nio.charset.ModifiedUtf8; import java.util.Arrays; -import libcore.base.Streams; import libcore.io.IoUtils; import libcore.io.SizeOf; import org.apache.harmony.luni.platform.IFileSystem; diff --git a/luni/src/main/java/java/lang/AbstractStringBuilder.java b/luni/src/main/java/java/lang/AbstractStringBuilder.java index b711342..f36ea10 100644 --- a/luni/src/main/java/java/lang/AbstractStringBuilder.java +++ b/luni/src/main/java/java/lang/AbstractStringBuilder.java @@ -19,7 +19,7 @@ package java.lang; import java.io.InvalidObjectException; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * A modifiable {@link CharSequence sequence of characters} for use in creating diff --git a/luni/src/main/java/java/lang/ClassMembers.java b/luni/src/main/java/java/lang/ClassMembers.java index 465c168..5660544 100644 --- a/luni/src/main/java/java/lang/ClassMembers.java +++ b/luni/src/main/java/java/lang/ClassMembers.java @@ -27,7 +27,7 @@ import java.util.Comparator; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import libcore.base.BasicLruCache; +import libcore.util.BasicLruCache; import org.apache.harmony.kernel.vm.LangAccess; import org.apache.harmony.kernel.vm.ReflectionAccess; diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java index a69b350..c2d360e 100644 --- a/luni/src/main/java/java/lang/String.java +++ b/luni/src/main/java/java/lang/String.java @@ -28,7 +28,7 @@ import java.util.Comparator; import java.util.Formatter; import java.util.Locale; import java.util.regex.Pattern; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * An immutable sequence of characters/code units ({@code char}s). A diff --git a/luni/src/main/java/java/lang/ThreadGroup.java b/luni/src/main/java/java/lang/ThreadGroup.java index 621a832..d0e593f 100644 --- a/luni/src/main/java/java/lang/ThreadGroup.java +++ b/luni/src/main/java/java/lang/ThreadGroup.java @@ -21,7 +21,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import libcore.base.CollectionUtils; +import libcore.util.CollectionUtils; /** * {@code ThreadGroup} is a means of organizing threads into a hierarchical structure. diff --git a/luni/src/main/java/java/lang/Void.java b/luni/src/main/java/java/lang/Void.java index 2794bee..1773d43 100644 --- a/luni/src/main/java/java/lang/Void.java +++ b/luni/src/main/java/java/lang/Void.java @@ -18,7 +18,7 @@ package java.lang; import java.lang.reflect.Method; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Placeholder class for the Java keyword {@code void}. diff --git a/luni/src/main/java/java/lang/reflect/Constructor.java b/luni/src/main/java/java/lang/reflect/Constructor.java index 2a29822..0b587c9 100644 --- a/luni/src/main/java/java/lang/reflect/Constructor.java +++ b/luni/src/main/java/java/lang/reflect/Constructor.java @@ -32,9 +32,8 @@ package java.lang.reflect; -import dalvik.system.VMStack; import java.lang.annotation.Annotation; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.kernel.vm.StringUtils; import org.apache.harmony.luni.lang.reflect.GenericSignatureParser; import org.apache.harmony.luni.lang.reflect.ListOfTypes; diff --git a/luni/src/main/java/java/lang/reflect/Method.java b/luni/src/main/java/java/lang/reflect/Method.java index 2e2c03f..d54ed1a 100644 --- a/luni/src/main/java/java/lang/reflect/Method.java +++ b/luni/src/main/java/java/lang/reflect/Method.java @@ -34,7 +34,7 @@ package java.lang.reflect; import java.lang.annotation.Annotation; import java.util.Comparator; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.kernel.vm.StringUtils; import org.apache.harmony.luni.lang.reflect.GenericSignatureParser; import org.apache.harmony.luni.lang.reflect.ListOfTypes; diff --git a/luni/src/main/java/java/net/HttpCookie.java b/luni/src/main/java/java/net/HttpCookie.java index cdbe3e2..88fcccb 100644 --- a/luni/src/main/java/java/net/HttpCookie.java +++ b/luni/src/main/java/java/net/HttpCookie.java @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Set; -import libcore.base.Objects; +import libcore.util.Objects; /** * An opaque key-value value pair held by an HTTP client to permit a stateful diff --git a/luni/src/main/java/java/net/Inet6Address.java b/luni/src/main/java/java/net/Inet6Address.java index 1f8e83b..8c99326 100644 --- a/luni/src/main/java/java/net/Inet6Address.java +++ b/luni/src/main/java/java/net/Inet6Address.java @@ -23,7 +23,7 @@ import java.io.ObjectOutputStream; import java.io.ObjectStreamField; import java.util.Arrays; import java.util.Enumeration; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * An IPv6 address. See {@link InetAddress}. diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java index d6ffaf6..6ef248f 100644 --- a/luni/src/main/java/java/net/NetworkInterface.java +++ b/luni/src/main/java/java/net/NetworkInterface.java @@ -24,7 +24,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class is used to represent a network interface of the local device. An diff --git a/luni/src/main/java/java/net/URLStreamHandler.java b/luni/src/main/java/java/net/URLStreamHandler.java index 664485a..193ac00 100644 --- a/luni/src/main/java/java/net/URLStreamHandler.java +++ b/luni/src/main/java/java/net/URLStreamHandler.java @@ -19,7 +19,8 @@ package java.net; import java.io.IOException; import java.nio.charset.Charsets; -import libcore.base.Objects; +import java.util.Locale; +import libcore.util.Objects; import org.apache.harmony.luni.util.URLUtil; /** diff --git a/luni/src/main/java/java/nio/DatagramChannelImpl.java b/luni/src/main/java/java/nio/DatagramChannelImpl.java index 35c24dd..df5e1f7 100644 --- a/luni/src/main/java/java/nio/DatagramChannelImpl.java +++ b/luni/src/main/java/java/nio/DatagramChannelImpl.java @@ -35,10 +35,9 @@ import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.NotYetConnectedException; import java.nio.channels.spi.SelectorProvider; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.luni.net.PlainDatagramSocketImpl; import org.apache.harmony.luni.platform.FileDescriptorHandler; -import org.apache.harmony.luni.platform.INetworkSystem; import org.apache.harmony.luni.platform.Platform; /* diff --git a/luni/src/main/java/java/nio/SelectorImpl.java b/luni/src/main/java/java/nio/SelectorImpl.java index 733bb34..67429b9 100644 --- a/luni/src/main/java/java/nio/SelectorImpl.java +++ b/luni/src/main/java/java/nio/SelectorImpl.java @@ -35,7 +35,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.luni.platform.FileDescriptorHandler; import org.apache.harmony.luni.platform.Platform; diff --git a/luni/src/main/java/java/security/Identity.java b/luni/src/main/java/java/security/Identity.java index 5af063c..6e5b8a3 100644 --- a/luni/src/main/java/java/security/Identity.java +++ b/luni/src/main/java/java/security/Identity.java @@ -20,7 +20,7 @@ package java.security; import java.io.Serializable; import java.util.Arrays; import java.util.Vector; -import libcore.base.Objects; +import libcore.util.Objects; /** * {@code Identity} represents an identity like a person or a company. diff --git a/luni/src/main/java/java/security/cert/X509CertSelector.java b/luni/src/main/java/java/security/cert/X509CertSelector.java index 9454050..2981f63 100644 --- a/luni/src/main/java/java/security/cert/X509CertSelector.java +++ b/luni/src/main/java/java/security/cert/X509CertSelector.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import javax.security.auth.x500.X500Principal; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.security.asn1.ASN1OctetString; import org.apache.harmony.security.utils.Array; import org.apache.harmony.security.x509.AlgorithmIdentifier; diff --git a/luni/src/main/java/java/text/ChoiceFormat.java b/luni/src/main/java/java/text/ChoiceFormat.java index b594efc..e0a1239 100644 --- a/luni/src/main/java/java/text/ChoiceFormat.java +++ b/luni/src/main/java/java/text/ChoiceFormat.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Returns a fixed string based on a numeric value. The class can be used in diff --git a/luni/src/main/java/java/text/MessageFormat.java b/luni/src/main/java/java/text/MessageFormat.java index 6841fa8..da4c932 100644 --- a/luni/src/main/java/java/text/MessageFormat.java +++ b/luni/src/main/java/java/text/MessageFormat.java @@ -18,7 +18,6 @@ package java.text; import java.io.IOException; -import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamField; @@ -28,8 +27,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Locale; -import libcore.base.EmptyArray; -import libcore.base.Objects; +import java.util.Vector; +import libcore.util.EmptyArray; /** * Produces concatenated messages in language-neutral way. New code diff --git a/luni/src/main/java/java/util/ArrayList.java b/luni/src/main/java/java/util/ArrayList.java index 70a88bf..5f848fc 100644 --- a/luni/src/main/java/java/util/ArrayList.java +++ b/luni/src/main/java/java/util/ArrayList.java @@ -23,7 +23,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Array; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * ArrayList is an implementation of {@link List}, backed by an array. diff --git a/luni/src/main/java/java/util/HashMap.java b/luni/src/main/java/java/util/HashMap.java index f7edbbb..7ff759d 100644 --- a/luni/src/main/java/java/util/HashMap.java +++ b/luni/src/main/java/java/util/HashMap.java @@ -23,7 +23,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamField; import java.io.Serializable; -import libcore.base.Objects; +import libcore.util.Objects; /** * HashMap is an implementation of {@link Map}. All optional operations are supported. diff --git a/luni/src/main/java/java/util/TreeMap.java b/luni/src/main/java/java/util/TreeMap.java index 59f240c..8d878cd 100644 --- a/luni/src/main/java/java/util/TreeMap.java +++ b/luni/src/main/java/java/util/TreeMap.java @@ -24,7 +24,7 @@ import java.io.ObjectStreamException; import java.io.Serializable; import static java.util.TreeMap.Bound.*; import static java.util.TreeMap.Relation.*; -import libcore.base.Objects; +import libcore.util.Objects; /** * A map whose entries are sorted by their keys. All optional operations such as diff --git a/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java index 2aa375a..acf2597 100644 --- a/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java +++ b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; import java.util.RandomAccess; -import libcore.base.EmptyArray; -import libcore.base.Objects; +import libcore.util.EmptyArray; +import libcore.util.Objects; /** * A thread-safe random-access list. diff --git a/luni/src/main/java/java/util/concurrent/SynchronousQueue.java b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java index 4bd2360..51d40c0 100644 --- a/luni/src/main/java/java/util/concurrent/SynchronousQueue.java +++ b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java @@ -7,9 +7,8 @@ package java.util.concurrent; import java.util.concurrent.locks.*; -import java.util.concurrent.atomic.*; import java.util.*; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; // BEGIN android-note // removed link to collections framework docs diff --git a/luni/src/main/java/java/util/jar/JarFile.java b/luni/src/main/java/java/util/jar/JarFile.java index ed39f67..6ec24c6 100644 --- a/luni/src/main/java/java/util/jar/JarFile.java +++ b/luni/src/main/java/java/util/jar/JarFile.java @@ -26,7 +26,7 @@ import java.util.Enumeration; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import libcore.base.Streams; +import libcore.io.Streams; import org.apache.harmony.archive.util.Util; /** diff --git a/luni/src/main/java/java/util/jar/Manifest.java b/luni/src/main/java/java/util/jar/Manifest.java index 289032f..9145688 100644 --- a/luni/src/main/java/java/util/jar/Manifest.java +++ b/luni/src/main/java/java/util/jar/Manifest.java @@ -18,7 +18,6 @@ package java.util.jar; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -28,11 +27,10 @@ import java.nio.CharBuffer; import java.nio.charset.CharsetEncoder; import java.nio.charset.Charsets; import java.nio.charset.CoderResult; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import libcore.base.Streams; +import libcore.io.Streams; /** * The {@code Manifest} class is used to obtain attribute information for a diff --git a/luni/src/main/java/java/util/logging/Level.java b/luni/src/main/java/java/util/logging/Level.java index 0818590..d4cc82f 100644 --- a/luni/src/main/java/java/util/logging/Level.java +++ b/luni/src/main/java/java/util/logging/Level.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import libcore.base.Objects; +import libcore.util.Objects; /** * {@code Level} objects are used to indicate the level of logging. There are a diff --git a/luni/src/main/java/java/util/prefs/AbstractPreferences.java b/luni/src/main/java/java/util/prefs/AbstractPreferences.java index 1ae2565..06bef54 100644 --- a/luni/src/main/java/java/util/prefs/AbstractPreferences.java +++ b/luni/src/main/java/java/util/prefs/AbstractPreferences.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; import org.apache.harmony.luni.util.Base64; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This abstract class is a partial implementation of the abstract class diff --git a/luni/src/main/java/java/util/prefs/XMLParser.java b/luni/src/main/java/java/util/prefs/XMLParser.java index 2cd69f5..388d747 100644 --- a/luni/src/main/java/java/util/prefs/XMLParser.java +++ b/luni/src/main/java/java/util/prefs/XMLParser.java @@ -35,6 +35,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; +import libcore.util.EmptyArray; import libcore.io.IoUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/luni/src/main/java/java/util/zip/CheckedInputStream.java b/luni/src/main/java/java/util/zip/CheckedInputStream.java index f2f3407..454098b 100644 --- a/luni/src/main/java/java/util/zip/CheckedInputStream.java +++ b/luni/src/main/java/java/util/zip/CheckedInputStream.java @@ -19,7 +19,7 @@ package java.util.zip; import java.io.IOException; import java.io.InputStream; -import libcore.base.Streams; +import libcore.io.Streams; /** * The {@code CheckedInputStream} class is used to maintain a checksum at the diff --git a/luni/src/main/java/java/util/zip/Deflater.java b/luni/src/main/java/java/util/zip/Deflater.java index bb0d228..319c5ce 100644 --- a/luni/src/main/java/java/util/zip/Deflater.java +++ b/luni/src/main/java/java/util/zip/Deflater.java @@ -19,7 +19,7 @@ package java.util.zip; import dalvik.system.CloseGuard; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class compresses data using the <i>DEFLATE</i> algorithm (see <a diff --git a/luni/src/main/java/java/util/zip/DeflaterInputStream.java b/luni/src/main/java/java/util/zip/DeflaterInputStream.java index 71c5483..5ee1002 100644 --- a/luni/src/main/java/java/util/zip/DeflaterInputStream.java +++ b/luni/src/main/java/java/util/zip/DeflaterInputStream.java @@ -21,7 +21,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import libcore.base.Streams; +import libcore.io.Streams; /** * An {@code InputStream} filter to compress data. Callers read diff --git a/luni/src/main/java/java/util/zip/InflaterInputStream.java b/luni/src/main/java/java/util/zip/InflaterInputStream.java index 242e538..99fe8af 100644 --- a/luni/src/main/java/java/util/zip/InflaterInputStream.java +++ b/luni/src/main/java/java/util/zip/InflaterInputStream.java @@ -22,7 +22,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import libcore.base.Streams; +import libcore.io.Streams; /** * This class provides an implementation of {@code FilterInputStream} that diff --git a/luni/src/main/java/java/util/zip/ZipEntry.java b/luni/src/main/java/java/util/zip/ZipEntry.java index b7bde59..988bd2c 100644 --- a/luni/src/main/java/java/util/zip/ZipEntry.java +++ b/luni/src/main/java/java/util/zip/ZipEntry.java @@ -17,16 +17,14 @@ package java.util.zip; -import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import java.io.RandomAccessFile; import java.nio.ByteOrder; import java.nio.charset.Charsets; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import libcore.base.Streams; +import libcore.io.Streams; import libcore.io.BufferIterator; import libcore.io.HeapBufferIterator; diff --git a/luni/src/main/java/java/util/zip/ZipInputStream.java b/luni/src/main/java/java/util/zip/ZipInputStream.java index 1ca8982..560a221 100644 --- a/luni/src/main/java/java/util/zip/ZipInputStream.java +++ b/luni/src/main/java/java/util/zip/ZipInputStream.java @@ -17,7 +17,6 @@ package java.util.zip; -import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; @@ -26,7 +25,7 @@ import java.nio.charset.ModifiedUtf8; import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.Arrays; -import libcore.base.Streams; +import libcore.io.Streams; import org.apache.harmony.luni.platform.OSMemory; /** diff --git a/luni/src/main/java/javax/crypto/CipherInputStream.java b/luni/src/main/java/javax/crypto/CipherInputStream.java index fa6040f..8ad0b84 100644 --- a/luni/src/main/java/javax/crypto/CipherInputStream.java +++ b/luni/src/main/java/javax/crypto/CipherInputStream.java @@ -21,7 +21,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; -import libcore.base.Streams; +import libcore.io.Streams; /** * This class wraps an {@code InputStream} and a cipher so that {@code read()} diff --git a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java index c84cdcb..e1f0d96 100644 --- a/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java +++ b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java @@ -19,7 +19,7 @@ package javax.crypto.spec; import java.security.spec.KeySpec; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * The key specification for a <i>password based encryption</i> key. diff --git a/luni/src/main/java/javax/crypto/spec/PSource.java b/luni/src/main/java/javax/crypto/spec/PSource.java index 5f520f3..0efa1e9 100644 --- a/luni/src/main/java/javax/crypto/spec/PSource.java +++ b/luni/src/main/java/javax/crypto/spec/PSource.java @@ -17,7 +17,7 @@ package javax.crypto.spec; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * The source of the label <code>L</code> as specified in <a diff --git a/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java b/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java index 267648c..f070e6b 100644 --- a/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java +++ b/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; import java.net.SocketException; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Default inoperative implementation of javax.net.ssl.SSLServerSocketFactory diff --git a/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java index 5b5025d..5bfd74b8 100644 --- a/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java +++ b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java @@ -22,7 +22,7 @@ import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; import java.net.UnknownHostException; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Default inoperative implementation of javax.net.ssl.SSLSocketFactory diff --git a/luni/src/main/java/libcore/icu/CharsetDecoderICU.java b/luni/src/main/java/libcore/icu/CharsetDecoderICU.java index d42368e..e4371ba 100644 --- a/luni/src/main/java/libcore/icu/CharsetDecoderICU.java +++ b/luni/src/main/java/libcore/icu/CharsetDecoderICU.java @@ -20,7 +20,7 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CoderResult; import java.nio.charset.CodingErrorAction; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; public final class CharsetDecoderICU extends CharsetDecoder { private static final int MAX_CHARS_PER_BYTE = 2; diff --git a/luni/src/main/java/libcore/icu/CharsetEncoderICU.java b/luni/src/main/java/libcore/icu/CharsetEncoderICU.java index 15b2788..563f68e 100644 --- a/luni/src/main/java/libcore/icu/CharsetEncoderICU.java +++ b/luni/src/main/java/libcore/icu/CharsetEncoderICU.java @@ -22,7 +22,7 @@ import java.nio.charset.CoderResult; import java.nio.charset.CodingErrorAction; import java.util.HashMap; import java.util.Map; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; public final class CharsetEncoderICU extends CharsetEncoder { private static final Map<String, byte[]> DEFAULT_REPLACEMENTS = new HashMap<String, byte[]>(); diff --git a/luni/src/main/java/libcore/base/Streams.java b/luni/src/main/java/libcore/io/Streams.java index 6471941..6771369 100644 --- a/luni/src/main/java/libcore/base/Streams.java +++ b/luni/src/main/java/libcore/io/Streams.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.base; +package libcore.io; import java.io.ByteArrayOutputStream; import java.io.EOFException; diff --git a/luni/src/main/java/libcore/base/BasicLruCache.java b/luni/src/main/java/libcore/util/BasicLruCache.java index 58bce24..7364bf0 100644 --- a/luni/src/main/java/libcore/base/BasicLruCache.java +++ b/luni/src/main/java/libcore/util/BasicLruCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.base; +package libcore.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/luni/src/main/java/libcore/base/CollectionUtils.java b/luni/src/main/java/libcore/util/CollectionUtils.java index 322cc9e..884609c 100644 --- a/luni/src/main/java/libcore/base/CollectionUtils.java +++ b/luni/src/main/java/libcore/util/CollectionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.base; +package libcore.util; import java.lang.ref.Reference; import java.util.Iterator; diff --git a/luni/src/main/java/libcore/base/EmptyArray.java b/luni/src/main/java/libcore/util/EmptyArray.java index 6e97876..d2ee4cf 100644 --- a/luni/src/main/java/libcore/base/EmptyArray.java +++ b/luni/src/main/java/libcore/util/EmptyArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.base; +package libcore.util; public final class EmptyArray { private EmptyArray() {} diff --git a/luni/src/main/java/libcore/base/Objects.java b/luni/src/main/java/libcore/util/Objects.java index 22bad9c..7817316 100644 --- a/luni/src/main/java/libcore/base/Objects.java +++ b/luni/src/main/java/libcore/util/Objects.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.base; +package libcore.util; public final class Objects { private Objects() {} diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java index 54e074f..ddd1dec 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java @@ -32,7 +32,7 @@ import java.net.URI; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import libcore.base.Objects; +import libcore.util.Objects; import libcore.io.IoUtils; import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl; diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java index fc0d224..d9976bc 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java @@ -48,7 +48,7 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; import java.util.zip.GZIPInputStream; -import libcore.base.Streams; +import libcore.io.Streams; import org.apache.harmony.luni.util.Base64; /** diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java index 78e5440..89125b0 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfo.java @@ -16,13 +16,11 @@ package org.apache.harmony.luni.internal.util; -import java.nio.charset.Charsets; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.Formatter; import java.util.TimeZone; -import libcore.base.Objects; final class ZoneInfo extends TimeZone { diff --git a/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java b/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java index f6481e3..a8b0691 100644 --- a/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java +++ b/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java @@ -29,7 +29,7 @@ import java.net.NetworkInterface; import java.net.SocketAddress; import java.net.SocketException; import java.net.UnknownHostException; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; import org.apache.harmony.luni.platform.Platform; /** diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Base64.java b/luni/src/main/java/org/apache/harmony/luni/util/Base64.java index 3521b2d..af35e03 100644 --- a/luni/src/main/java/org/apache/harmony/luni/util/Base64.java +++ b/luni/src/main/java/org/apache/harmony/luni/util/Base64.java @@ -22,7 +22,7 @@ package org.apache.harmony.luni.util; import java.nio.charset.Charset; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class implements Base64 encoding/decoding functionality diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java index 92636b9..a1ac7b6 100644 --- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java +++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java @@ -23,7 +23,7 @@ package org.apache.harmony.security.asn1; import java.io.IOException; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class represents ASN.1 Bitstring type. diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java index d4c04c5..e9c4ab7 100644 --- a/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java +++ b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java @@ -22,7 +22,7 @@ package org.apache.harmony.security.asn1; -import libcore.base.Objects; +import libcore.util.Objects; /** diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java index b99bd0f..cd9da59 100644 --- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java +++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java @@ -24,7 +24,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.security.InvalidParameterException; import java.security.SecureRandomSpi; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class extends the SecureRandomSpi class implementing all its abstract methods. <BR> diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java index 5a043cc..289aef7 100644 --- a/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java +++ b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java @@ -18,7 +18,7 @@ package org.apache.harmony.xml.dom; import java.util.ArrayList; import java.util.List; -import libcore.base.Objects; +import libcore.util.Objects; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Element; diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java index ba4b6e3..418789d 100644 --- a/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java +++ b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java @@ -18,7 +18,7 @@ package org.apache.harmony.xml.dom; import java.util.ArrayList; import java.util.List; -import libcore.base.Objects; +import libcore.util.Objects; import org.w3c.dom.DOMException; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java index b39b9e4..5fcbba5 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java @@ -20,7 +20,7 @@ package org.apache.harmony.xnet.provider.jsse; import java.io.IOException; import java.security.SecureRandom; import java.util.Arrays; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Represents Client Hello message diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java index 3f2daeb..bfe2bd0 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java @@ -19,7 +19,7 @@ package org.apache.harmony.xnet.provider.jsse; import java.io.IOException; import java.math.BigInteger; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Represents client key exchange message diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java index a100513..af12bb3 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java @@ -30,7 +30,7 @@ import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.net.ssl.SSLException; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * This class represents Signature type, as described in TLS v 1.0 Protocol diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java index 502f504..261f3c7 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java @@ -29,7 +29,7 @@ import java.security.cert.CertificateException; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactorySpi; import javax.net.ssl.ManagerFactoryParameters; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * KeyManagerFactory implementation. diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java index 75a0cb7..a2688e2 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java @@ -19,7 +19,9 @@ package org.apache.harmony.xnet.provider.jsse; import java.io.PrintStream; import java.util.Locale; -import libcore.base.EmptyArray; +import java.security.AccessController; +import java.security.PrivilegedAction; +import libcore.util.EmptyArray; /** * This class provides debug logging for JSSE provider implementation diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java index 4bf6834..42d7f0e 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java @@ -33,7 +33,7 @@ import javax.net.ssl.SSLSessionBindingEvent; import javax.net.ssl.SSLSessionBindingListener; import javax.net.ssl.SSLSessionContext; import javax.security.cert.CertificateException; -import libcore.base.Objects; +import libcore.util.Objects; import org.apache.harmony.luni.util.TwoKeyHashMap; /** diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java index 1899342..fa001b2 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java @@ -22,7 +22,7 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.security.KeyManagementException; import javax.net.ssl.SSLServerSocketFactory; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Implementation of SSLServerSocketFactory. diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java index 2e2ea7c..65b8fce 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java @@ -33,8 +33,8 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSessionBindingEvent; import javax.net.ssl.SSLSessionBindingListener; import javax.net.ssl.SSLSessionContext; -import libcore.base.EmptyArray; -import libcore.base.Objects; +import libcore.util.EmptyArray; +import libcore.util.Objects; /** * diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java index 9cd9eeb..be9a7fc 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java @@ -23,7 +23,7 @@ import java.net.Socket; import java.net.UnknownHostException; import java.security.KeyManagementException; import javax.net.ssl.SSLSocketFactory; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * Implementation of SSLSocketFactory. diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java index 6778be9..fef4f5f 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java @@ -18,7 +18,6 @@ package org.apache.harmony.xnet.provider.jsse; import java.io.BufferedInputStream; -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; @@ -31,7 +30,7 @@ import java.security.cert.CertificateException; import javax.net.ssl.ManagerFactoryParameters; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactorySpi; -import libcore.base.EmptyArray; +import libcore.util.EmptyArray; /** * diff --git a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java index 9492218..52fa1e5 100644 --- a/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java +++ b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java @@ -5,9 +5,9 @@ package org.xml.sax.ext; +import libcore.util.EmptyArray; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; -import libcore.base.EmptyArray; /** * SAX2 extension helper for additional Attributes information, |