Sorting imports.
Change-Id: I8347bc625480a1c37a1ed9976193ddfedeb00bbc
diff --git a/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java b/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
index 91b5d152..98062fb 100644
--- a/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
+++ b/dalvik/src/main/java/dalvik/annotation/AnnotationDefault.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide the AnnotationDefault attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java b/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
index a15993a..2546c4c 100644
--- a/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/EnclosingClass.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide part of the InnerClasses attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java b/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
index 88d5e52..1a97155 100644
--- a/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
+++ b/dalvik/src/main/java/dalvik/annotation/EnclosingMethod.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide the EnclosingMethod attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/InnerClass.java b/dalvik/src/main/java/dalvik/annotation/InnerClass.java
index 02cf704..054842f 100644
--- a/dalvik/src/main/java/dalvik/annotation/InnerClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/InnerClass.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide part of the InnerClasses attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/MemberClasses.java b/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
index 5b201da..b213be7 100644
--- a/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
+++ b/dalvik/src/main/java/dalvik/annotation/MemberClasses.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide the MemberClasses list.
diff --git a/dalvik/src/main/java/dalvik/annotation/Signature.java b/dalvik/src/main/java/dalvik/annotation/Signature.java
index 86b22de..b96d7dd 100644
--- a/dalvik/src/main/java/dalvik/annotation/Signature.java
+++ b/dalvik/src/main/java/dalvik/annotation/Signature.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide the Signature attribute.
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
index 7d0f638..9144a41 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTargetClass.java
@@ -21,8 +21,6 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import dalvik.annotation.TestTargetNew;
-
/**
* Defines an annotation for test classes that allows to link them to the class
* that is being tested. The current assumption is that the test are somewhat
diff --git a/dalvik/src/main/java/dalvik/annotation/TestTargets.java b/dalvik/src/main/java/dalvik/annotation/TestTargets.java
index 8358561..207572c 100644
--- a/dalvik/src/main/java/dalvik/annotation/TestTargets.java
+++ b/dalvik/src/main/java/dalvik/annotation/TestTargets.java
@@ -21,8 +21,6 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import dalvik.annotation.TestTargetNew;
-
/**
* Defines an annotation for test classes that allows to link them to the class
* that is being tested. The current assumption is that the test are somewhat
diff --git a/dalvik/src/main/java/dalvik/annotation/Throws.java b/dalvik/src/main/java/dalvik/annotation/Throws.java
index 342d890..161116a 100644
--- a/dalvik/src/main/java/dalvik/annotation/Throws.java
+++ b/dalvik/src/main/java/dalvik/annotation/Throws.java
@@ -16,7 +16,10 @@
package dalvik.annotation;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A "system annotation" used to provide the Exceptions attribute.
diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java
index b3d5c90..233c0ee 100644
--- a/dalvik/src/main/java/dalvik/system/BlockGuard.java
+++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java
@@ -16,20 +16,16 @@
package dalvik.system;
-import org.apache.harmony.luni.platform.IFileSystem;
-import org.apache.harmony.luni.platform.INetworkSystem;
-
import java.io.FileDescriptor;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.IOException;
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.SocketException;
-import java.net.SocketOptions;
import java.net.SocketImpl;
-import java.net.UnknownHostException;
-import java.nio.channels.Channel;
+import java.net.SocketOptions;
+import org.apache.harmony.luni.platform.IFileSystem;
+import org.apache.harmony.luni.platform.INetworkSystem;
/**
* Mechanism to let threads set restrictions on what code is allowed
diff --git a/dalvik/src/main/java/dalvik/system/DexClassLoader.java b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
index 86f83c2..c6e13f8 100644
--- a/dalvik/src/main/java/dalvik/system/DexClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/DexClassLoader.java
@@ -18,11 +18,9 @@
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
/**
* Provides a simple {@link ClassLoader} implementation that operates on a
diff --git a/dalvik/src/main/java/dalvik/system/PathClassLoader.java b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
index b4b2fee..1bbcbc2 100644
--- a/dalvik/src/main/java/dalvik/system/PathClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/PathClassLoader.java
@@ -19,18 +19,16 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.RandomAccessFile;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.NoSuchElementException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
/**
* Provides a simple {@link ClassLoader} implementation that operates on a list
diff --git a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
index 1d88dd1..65d1762 100644
--- a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
+++ b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java
@@ -16,10 +16,10 @@
package dalvik.system;
-import java.util.logging.Logger;
-import java.io.DataInputStream;
import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
import java.io.IOException;
+import java.util.logging.Logger;
/**
* A sampling profiler.
diff --git a/dalvik/src/main/java/dalvik/system/TouchDex.java b/dalvik/src/main/java/dalvik/system/TouchDex.java
index 129dc708..0952e30 100644
--- a/dalvik/src/main/java/dalvik/system/TouchDex.java
+++ b/dalvik/src/main/java/dalvik/system/TouchDex.java
@@ -17,10 +17,10 @@
package dalvik.system;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.File;
import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
/**
* Induces optimization/verification of a set of DEX files.
diff --git a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
index 615fb24..3861791 100644
--- a/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
+++ b/dalvik/src/main/java/dalvik/system/TouchDexLoader.java
@@ -19,15 +19,13 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.RandomAccessFile;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import java.net.MalformedURLException;
-
-import dalvik.system.DexFile;
/**
* Cloned out of PathClassLoader for TouchDex. This could be made
diff --git a/json/src/main/java/org/json/JSONArray.java b/json/src/main/java/org/json/JSONArray.java
index 09d9725..a885125 100644
--- a/json/src/main/java/org/json/JSONArray.java
+++ b/json/src/main/java/org/json/JSONArray.java
@@ -16,9 +16,9 @@
package org.json;
-import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
// Note: this class was written without inspecting the non-free org.json sourcecode.
diff --git a/json/src/test/java/org/json/JSONArrayTest.java b/json/src/test/java/org/json/JSONArrayTest.java
index b3f95bb..97e0f6b 100644
--- a/json/src/test/java/org/json/JSONArrayTest.java
+++ b/json/src/test/java/org/json/JSONArrayTest.java
@@ -16,11 +16,10 @@
package org.json;
-import junit.framework.TestCase;
-
import java.util.Arrays;
-import java.util.List;
import java.util.Collections;
+import java.util.List;
+import junit.framework.TestCase;
/**
* This black box test was written without inspecting the non-free org.json sourcecode.
diff --git a/json/src/test/java/org/json/JSONObjectTest.java b/json/src/test/java/org/json/JSONObjectTest.java
index c2ae575..d84acfc 100644
--- a/json/src/test/java/org/json/JSONObjectTest.java
+++ b/json/src/test/java/org/json/JSONObjectTest.java
@@ -16,11 +16,17 @@
package org.json;
-import junit.framework.TestCase;
-
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import junit.framework.TestCase;
/**
* This black box test was written without inspecting the non-free org.json sourcecode.
diff --git a/json/src/test/java/org/json/JSONTokenerTest.java b/json/src/test/java/org/json/JSONTokenerTest.java
index 2ab2fcc..528022a 100644
--- a/json/src/test/java/org/json/JSONTokenerTest.java
+++ b/json/src/test/java/org/json/JSONTokenerTest.java
@@ -16,8 +16,8 @@
package org.json;
-import junit.framework.TestCase;
import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
/**
* This black box test was written without inspecting the non-free org.json sourcecode.
diff --git a/json/src/test/java/org/json/ParsingTest.java b/json/src/test/java/org/json/ParsingTest.java
index e2cb2c1..c38c367 100644
--- a/json/src/test/java/org/json/ParsingTest.java
+++ b/json/src/test/java/org/json/ParsingTest.java
@@ -16,10 +16,13 @@
package org.json;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-
-import java.util.*;
public class ParsingTest extends TestCase {
diff --git a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
index ad35613..f2d7889 100644
--- a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
@@ -15,17 +15,12 @@
package com.ibm.icu4jni.charset;
import com.ibm.icu4jni.common.ErrorCode;
-// BEGIN android-removed
-// import com.ibm.icu4jni.converters.NativeConverter;
-// END android-removed
-
-
+import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
-import java.nio.ByteBuffer;
public final class CharsetDecoderICU extends CharsetDecoder {
private static final int MAX_CHARS_PER_BYTE = 2;
diff --git a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
index fa623d8..cba44c7b 100644
--- a/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
@@ -14,6 +14,7 @@
*/
package com.ibm.icu4jni.charset;
+import com.ibm.icu4jni.common.ErrorCode;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -23,8 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import com.ibm.icu4jni.common.ErrorCode;
-
public final class CharsetEncoderICU extends CharsetEncoder {
private static final Map<String, byte[]> DEFAULT_REPLACEMENTS = new HashMap<String, byte[]>();
static {
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/Collator.java b/luni/src/main/java/com/ibm/icu4jni/text/Collator.java
index 9eb85ea..9c6ad3a 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/Collator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/Collator.java
@@ -10,7 +10,6 @@
package com.ibm.icu4jni.text;
-import com.ibm.icu4jni.text.RuleBasedCollator;
import java.util.Locale;
public abstract class Collator implements Cloneable {
diff --git a/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java b/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
index 8e048dd..c847bdb 100644
--- a/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
@@ -10,9 +10,9 @@
package com.ibm.icu4jni.text;
-import java.util.Locale;
import java.text.CharacterIterator;
import java.text.ParseException;
+import java.util.Locale;
/**
* Concrete implementation class for Collation.
diff --git a/luni/src/main/java/java/beans/PropertyChangeSupport.java b/luni/src/main/java/java/beans/PropertyChangeSupport.java
index 94bea92..487dcc6 100644
--- a/luni/src/main/java/java/beans/PropertyChangeSupport.java
+++ b/luni/src/main/java/java/beans/PropertyChangeSupport.java
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
diff --git a/luni/src/main/java/java/io/BufferedInputStream.java b/luni/src/main/java/java/io/BufferedInputStream.java
index 6e910bc..6f09132 100644
--- a/luni/src/main/java/java/io/BufferedInputStream.java
+++ b/luni/src/main/java/java/io/BufferedInputStream.java
@@ -17,8 +17,6 @@
package java.io;
-import java.util.logging.Logger;
-
/**
* Wraps an existing {@link InputStream} and <em>buffers</em> the input.
* Expensive interaction with the underlying input stream is minimized, since
diff --git a/luni/src/main/java/java/io/BufferedOutputStream.java b/luni/src/main/java/java/io/BufferedOutputStream.java
index 148e9d9..9937629 100644
--- a/luni/src/main/java/java/io/BufferedOutputStream.java
+++ b/luni/src/main/java/java/io/BufferedOutputStream.java
@@ -17,8 +17,6 @@
package java.io;
-import java.util.logging.Logger;
-
/**
* Wraps an existing {@link OutputStream} and <em>buffers</em> the output.
* Expensive interaction with the underlying input stream is minimized, since
diff --git a/luni/src/main/java/java/io/BufferedReader.java b/luni/src/main/java/java/io/BufferedReader.java
index 60a6ea1..cfe3b5e 100644
--- a/luni/src/main/java/java/io/BufferedReader.java
+++ b/luni/src/main/java/java/io/BufferedReader.java
@@ -17,8 +17,6 @@
package java.io;
-import java.util.logging.Logger;
-
/**
* Wraps an existing {@link Reader} and <em>buffers</em> the input. Expensive
* interaction with the underlying reader is minimized, since most (smaller)
diff --git a/luni/src/main/java/java/io/BufferedWriter.java b/luni/src/main/java/java/io/BufferedWriter.java
index 9a84fa7..a47a69c 100644
--- a/luni/src/main/java/java/io/BufferedWriter.java
+++ b/luni/src/main/java/java/io/BufferedWriter.java
@@ -18,7 +18,6 @@
package java.io;
import java.security.AccessController;
-import java.util.logging.Logger;
import org.apache.harmony.luni.util.PriviAction;
import org.apache.harmony.luni.util.SneakyThrow;
diff --git a/luni/src/main/java/java/io/Console.java b/luni/src/main/java/java/io/Console.java
index 4a001e8..d2f73e6 100644
--- a/luni/src/main/java/java/io/Console.java
+++ b/luni/src/main/java/java/io/Console.java
@@ -15,9 +15,6 @@
*/
package java.io;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
import java.util.Formatter;
/**
diff --git a/luni/src/main/java/java/io/File.java b/luni/src/main/java/java/io/File.java
index fe3c735..e94649e 100644
--- a/luni/src/main/java/java/io/File.java
+++ b/luni/src/main/java/java/io/File.java
@@ -30,9 +30,6 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.Charsets;
import java.security.AccessController;
import java.util.ArrayList;
import java.util.List;
diff --git a/luni/src/main/java/java/io/InputStreamReader.java b/luni/src/main/java/java/io/InputStreamReader.java
index d87a43d..1fc2745 100644
--- a/luni/src/main/java/java/io/InputStreamReader.java
+++ b/luni/src/main/java/java/io/InputStreamReader.java
@@ -21,15 +21,11 @@
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
-import java.nio.charset.Charsets;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import java.nio.charset.MalformedInputException;
import java.nio.charset.UnmappableCharacterException;
-import java.security.AccessController;
-
import org.apache.harmony.luni.util.HistoricalNamesUtil;
-import org.apache.harmony.luni.util.PriviAction;
/**
* A class for turning a byte stream into a character stream. Data read from the
diff --git a/luni/src/main/java/java/io/ObjectInputStream.java b/luni/src/main/java/java/io/ObjectInputStream.java
index 109342e..5835aca 100644
--- a/luni/src/main/java/java/io/ObjectInputStream.java
+++ b/luni/src/main/java/java/io/ObjectInputStream.java
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.harmony.kernel.vm.VM;
import org.apache.harmony.luni.util.PriviAction;
/**
diff --git a/luni/src/main/java/java/io/OutputStreamWriter.java b/luni/src/main/java/java/io/OutputStreamWriter.java
index a8f7b23..e1a515b 100644
--- a/luni/src/main/java/java/io/OutputStreamWriter.java
+++ b/luni/src/main/java/java/io/OutputStreamWriter.java
@@ -21,12 +21,9 @@
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import java.nio.charset.Charsets;
import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
-import java.security.AccessController;
import org.apache.harmony.luni.util.HistoricalNamesUtil;
-import org.apache.harmony.luni.util.PriviAction;
/**
* A class for turning a character stream into a byte stream. Data written to
diff --git a/luni/src/main/java/java/io/RandomAccessFile.java b/luni/src/main/java/java/io/RandomAccessFile.java
index aef129f..4813019 100644
--- a/luni/src/main/java/java/io/RandomAccessFile.java
+++ b/luni/src/main/java/java/io/RandomAccessFile.java
@@ -22,7 +22,6 @@
import libcore.io.IoUtils;
import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.luni.platform.Platform;
-
import org.apache.harmony.nio.FileChannelFactory;
/**
diff --git a/luni/src/main/java/java/lang/Class.java b/luni/src/main/java/java/lang/Class.java
index 15d3e9a..5d10fa4 100644
--- a/luni/src/main/java/java/lang/Class.java
+++ b/luni/src/main/java/java/lang/Class.java
@@ -33,13 +33,9 @@
package java.lang;
import dalvik.system.VMStack;
-
-import org.apache.harmony.kernel.vm.StringUtils;
-import org.apache.harmony.luni.lang.reflect.GenericSignatureParser;
-import org.apache.harmony.luni.lang.reflect.Types;
-
import java.io.InputStream;
import java.io.Serializable;
+import static java.lang.ClassCache.*;
import java.lang.annotation.Annotation;
import java.lang.annotation.Inherited;
import java.lang.ref.SoftReference;
@@ -53,15 +49,13 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
-import java.util.Collection;
-import java.util.HashMap;
import java.net.URL;
import java.security.ProtectionDomain;
-
-import static java.lang.ClassCache.REFLECT;
-import static java.lang.ClassCache.compareClassLists;
-import static java.lang.ClassCache.findMethodByName;
-import static java.lang.ClassCache.findFieldByName;
+import java.util.Collection;
+import java.util.HashMap;
+import org.apache.harmony.kernel.vm.StringUtils;
+import org.apache.harmony.luni.lang.reflect.GenericSignatureParser;
+import org.apache.harmony.luni.lang.reflect.Types;
/**
* The in-memory representation of a Java class. This representation serves as
diff --git a/luni/src/main/java/java/lang/ClassLoader.java b/luni/src/main/java/java/lang/ClassLoader.java
index c9dae53..d599508 100644
--- a/luni/src/main/java/java/lang/ClassLoader.java
+++ b/luni/src/main/java/java/lang/ClassLoader.java
@@ -32,6 +32,8 @@
package java.lang;
+import dalvik.system.PathClassLoader;
+import dalvik.system.VMStack;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -39,11 +41,8 @@
import java.security.ProtectionDomain;
import java.util.Collection;
import java.util.Enumeration;
-import java.util.Map;
import java.util.HashMap;
-
-import dalvik.system.PathClassLoader;
-import dalvik.system.VMStack;
+import java.util.Map;
/**
* Loads classes and resources from a repository. One or more class loaders are
diff --git a/luni/src/main/java/java/lang/Package.java b/luni/src/main/java/java/lang/Package.java
index b18c9a1..af96621 100644
--- a/luni/src/main/java/java/lang/Package.java
+++ b/luni/src/main/java/java/lang/Package.java
@@ -33,7 +33,6 @@
package java.lang;
import dalvik.system.VMStack;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.net.URL;
diff --git a/luni/src/main/java/java/lang/ProcessManager.java b/luni/src/main/java/java/lang/ProcessManager.java
index c2ca318..f54640a 100644
--- a/luni/src/main/java/java/lang/ProcessManager.java
+++ b/luni/src/main/java/java/lang/ProcessManager.java
@@ -25,11 +25,11 @@
import java.io.OutputStream;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import java.util.Arrays;
-import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.Logger;
import libcore.io.IoUtils;
/**
diff --git a/luni/src/main/java/java/lang/Runtime.java b/luni/src/main/java/java/lang/Runtime.java
index 7c7b2b3..45d5295 100644
--- a/luni/src/main/java/java/lang/Runtime.java
+++ b/luni/src/main/java/java/lang/Runtime.java
@@ -38,18 +38,18 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.Reader;
-import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charsets;
-import java.util.StringTokenizer;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
/**
* Allows Java applications to interface with the environment in which they are
diff --git a/luni/src/main/java/java/lang/SecurityManager.java b/luni/src/main/java/java/lang/SecurityManager.java
index a31b9b6..1daf1ac 100644
--- a/luni/src/main/java/java/lang/SecurityManager.java
+++ b/luni/src/main/java/java/lang/SecurityManager.java
@@ -18,9 +18,8 @@
package java.lang;
// BEGIN android-added
-import dalvik.system.VMStack;
-// END android-added
+import dalvik.system.VMStack;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FilePermission;
@@ -36,8 +35,6 @@
import java.security.Security;
import java.security.SecurityPermission;
import java.util.PropertyPermission;
-import java.util.StringTokenizer;
-
import org.apache.harmony.luni.util.PriviAction;
/**
diff --git a/luni/src/main/java/java/lang/StrictMath.java b/luni/src/main/java/java/lang/StrictMath.java
index 50c96f8..3d13e36 100644
--- a/luni/src/main/java/java/lang/StrictMath.java
+++ b/luni/src/main/java/java/lang/StrictMath.java
@@ -17,8 +17,6 @@
package java.lang;
-import java.util.Random;
-
/**
* Class StrictMath provides basic math constants and operations such as
* trigonometric functions, hyperbolic functions, exponential, logarithms, etc.
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 9abf1a7..db49b73 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -32,6 +32,7 @@
package java.lang;
+import dalvik.system.VMStack;
import java.io.Console;
import java.io.FileDescriptor;
import java.io.FileInputStream;
@@ -41,7 +42,6 @@
import java.io.PrintStream;
import java.nio.channels.Channel;
import java.nio.channels.spi.SelectorProvider;
-import java.security.SecurityPermission;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -49,8 +49,6 @@
import java.util.PropertyPermission;
import java.util.Set;
-import dalvik.system.VMStack;
-
/**
* Provides access to system-related information and resources including
* standard input and output. Enables clients to dynamically load native
diff --git a/luni/src/main/java/java/lang/Thread.java b/luni/src/main/java/java/lang/Thread.java
index 418065e..980c841 100644
--- a/luni/src/main/java/java/lang/Thread.java
+++ b/luni/src/main/java/java/lang/Thread.java
@@ -33,11 +33,9 @@
package java.lang;
import dalvik.system.VMStack;
-
import java.security.AccessController;
-import java.util.Map;
import java.util.HashMap;
-
+import java.util.Map;
import org.apache.harmony.security.fortress.SecurityUtils;
/**
diff --git a/luni/src/main/java/java/lang/ThreadLocal.java b/luni/src/main/java/java/lang/ThreadLocal.java
index 230c602..61e83b0 100644
--- a/luni/src/main/java/java/lang/ThreadLocal.java
+++ b/luni/src/main/java/java/lang/ThreadLocal.java
@@ -22,8 +22,8 @@
* http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/
*/
-import java.lang.ref.WeakReference;
import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
import java.util.concurrent.atomic.AtomicInteger;
/**
diff --git a/luni/src/main/java/java/lang/VMThread.java b/luni/src/main/java/java/lang/VMThread.java
index 6d7bef0..cd82838 100644
--- a/luni/src/main/java/java/lang/VMThread.java
+++ b/luni/src/main/java/java/lang/VMThread.java
@@ -16,8 +16,8 @@
package java.lang;
-import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.Logger;
class VMThread
{
diff --git a/luni/src/main/java/java/lang/reflect/AccessibleObject.java b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
index a0f289e..5d9e11c 100644
--- a/luni/src/main/java/java/lang/reflect/AccessibleObject.java
+++ b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
@@ -34,9 +34,8 @@
import java.lang.annotation.Annotation;
import java.util.Hashtable;
-
-import org.apache.harmony.kernel.vm.StringUtils;
import org.apache.harmony.kernel.vm.ReflectionAccess;
+import org.apache.harmony.kernel.vm.StringUtils;
/**
* {@code AccessibleObject} is the superclass of all member reflection classes
diff --git a/luni/src/main/java/java/lang/reflect/Constructor.java b/luni/src/main/java/java/lang/reflect/Constructor.java
index d8f2923..224d80ce 100644
--- a/luni/src/main/java/java/lang/reflect/Constructor.java
+++ b/luni/src/main/java/java/lang/reflect/Constructor.java
@@ -33,9 +33,7 @@
package java.lang.reflect;
import dalvik.system.VMStack;
-
import java.lang.annotation.Annotation;
-
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/Field.java b/luni/src/main/java/java/lang/reflect/Field.java
index efb316d..b92b45f 100644
--- a/luni/src/main/java/java/lang/reflect/Field.java
+++ b/luni/src/main/java/java/lang/reflect/Field.java
@@ -33,12 +33,10 @@
package java.lang.reflect;
import dalvik.system.VMStack;
-
import java.lang.annotation.Annotation;
-
+import org.apache.harmony.kernel.vm.StringUtils;
import org.apache.harmony.luni.lang.reflect.GenericSignatureParser;
import org.apache.harmony.luni.lang.reflect.Types;
-import org.apache.harmony.kernel.vm.StringUtils;
/**
* This class represents a field. Information about the field can be accessed,
diff --git a/luni/src/main/java/java/lang/reflect/Method.java b/luni/src/main/java/java/lang/reflect/Method.java
index f3d1760..9ea2131 100644
--- a/luni/src/main/java/java/lang/reflect/Method.java
+++ b/luni/src/main/java/java/lang/reflect/Method.java
@@ -33,9 +33,7 @@
package java.lang.reflect;
import dalvik.system.VMStack;
-
import java.lang.annotation.Annotation;
-
import java.util.Comparator;
import org.apache.harmony.kernel.vm.StringUtils;
import org.apache.harmony.luni.lang.reflect.GenericSignatureParser;
diff --git a/luni/src/main/java/java/math/BigInteger.java b/luni/src/main/java/java/math/BigInteger.java
index 8f5160c..18ee32e 100644
--- a/luni/src/main/java/java/math/BigInteger.java
+++ b/luni/src/main/java/java/math/BigInteger.java
@@ -26,8 +26,8 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.Random;
import java.io.Serializable;
+import java.util.Random;
/**
* This class represents immutable integer numbers of arbitrary length. Large
diff --git a/luni/src/main/java/java/net/AddressCache.java b/luni/src/main/java/java/net/AddressCache.java
index 54835a8..063c9e0 100644
--- a/luni/src/main/java/java/net/AddressCache.java
+++ b/luni/src/main/java/java/net/AddressCache.java
@@ -19,7 +19,6 @@
import java.security.AccessController;
import java.util.LinkedHashMap;
import java.util.Map;
-
import org.apache.harmony.luni.util.PriviAction;
/**
diff --git a/luni/src/main/java/java/net/DatagramSocket.java b/luni/src/main/java/java/net/DatagramSocket.java
index 04a69bc..532b53d 100644
--- a/luni/src/main/java/java/net/DatagramSocket.java
+++ b/luni/src/main/java/java/net/DatagramSocket.java
@@ -19,9 +19,7 @@
import java.io.IOException;
import java.nio.channels.DatagramChannel;
-
import org.apache.harmony.luni.net.PlainDatagramSocketImpl;
-import org.apache.harmony.luni.platform.Platform;
/**
* This class implements a UDP socket for sending and receiving {@code
diff --git a/luni/src/main/java/java/net/DatagramSocketImpl.java b/luni/src/main/java/java/net/DatagramSocketImpl.java
index 8ed4342..4468c42 100644
--- a/luni/src/main/java/java/net/DatagramSocketImpl.java
+++ b/luni/src/main/java/java/net/DatagramSocketImpl.java
@@ -19,8 +19,6 @@
import java.io.FileDescriptor;
import java.io.IOException;
-
-import org.apache.harmony.luni.net.NetUtil;
import org.apache.harmony.luni.platform.Platform;
/**
diff --git a/luni/src/main/java/java/net/Inet6Address.java b/luni/src/main/java/java/net/Inet6Address.java
index f465fc4..7585f29 100644
--- a/luni/src/main/java/java/net/Inet6Address.java
+++ b/luni/src/main/java/java/net/Inet6Address.java
@@ -22,7 +22,6 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.util.Enumeration;
-import org.apache.harmony.luni.util.Inet6Util;
/**
* An IPv6 address. See {@link InetAddress}.
diff --git a/luni/src/main/java/java/net/InetAddress.java b/luni/src/main/java/java/net/InetAddress.java
index 0cd9f14..00f62c4 100644
--- a/luni/src/main/java/java/net/InetAddress.java
+++ b/luni/src/main/java/java/net/InetAddress.java
@@ -18,7 +18,6 @@
package java.net;
import dalvik.system.BlockGuard;
-
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.ObjectInputStream;
diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index 4b77916..115e98a 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -18,14 +18,12 @@
package java.net;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
/**
* This class is used to represent a network interface of the local device. An
diff --git a/luni/src/main/java/java/net/ProxySelectorImpl.java b/luni/src/main/java/java/net/ProxySelectorImpl.java
index a83aebf..571f32b 100644
--- a/luni/src/main/java/java/net/ProxySelectorImpl.java
+++ b/luni/src/main/java/java/net/ProxySelectorImpl.java
@@ -18,8 +18,8 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.security.AccessController;
import java.util.ArrayList;
import java.util.List;
diff --git a/luni/src/main/java/java/net/SecureCacheResponse.java b/luni/src/main/java/java/net/SecureCacheResponse.java
index 9a35b08..ece02ac 100644
--- a/luni/src/main/java/java/net/SecureCacheResponse.java
+++ b/luni/src/main/java/java/net/SecureCacheResponse.java
@@ -18,7 +18,6 @@
import java.security.Principal;
import java.security.cert.Certificate;
import java.util.List;
-
import javax.net.ssl.SSLPeerUnverifiedException;
/**
diff --git a/luni/src/main/java/java/net/ServerSocket.java b/luni/src/main/java/java/net/ServerSocket.java
index dfb14b2..6ddf59e 100644
--- a/luni/src/main/java/java/net/ServerSocket.java
+++ b/luni/src/main/java/java/net/ServerSocket.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.nio.channels.ServerSocketChannel;
import org.apache.harmony.luni.net.PlainServerSocketImpl;
-import org.apache.harmony.luni.platform.Platform;
/**
* This class represents a server-side socket that waits for incoming client
diff --git a/luni/src/main/java/java/net/Socket.java b/luni/src/main/java/java/net/Socket.java
index 4f4cdcc..84afa0c 100644
--- a/luni/src/main/java/java/net/Socket.java
+++ b/luni/src/main/java/java/net/Socket.java
@@ -21,11 +21,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.SocketChannel;
-import java.security.AccessController;
import org.apache.harmony.luni.net.NetUtil;
import org.apache.harmony.luni.net.PlainSocketImpl;
import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.PriviAction;
/**
* Provides a client-side TCP socket.
diff --git a/luni/src/main/java/java/nio/CharToByteBufferAdapter.java b/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
index 3ff9fa6..f38215a 100644
--- a/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a char buffer.
diff --git a/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java b/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
index e2271fa..a368dac 100644
--- a/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a double buffer.
diff --git a/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java b/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
index e1b1c66..079f7f8 100644
--- a/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a float buffer.
diff --git a/luni/src/main/java/java/nio/IntToByteBufferAdapter.java b/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
index 9f412f6..03ac9f9 100644
--- a/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a int buffer.
diff --git a/luni/src/main/java/java/nio/LongToByteBufferAdapter.java b/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
index 805a96b..ca40c5f16 100644
--- a/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a long buffer.
diff --git a/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java b/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
index 11422d5..9d88927 100644
--- a/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
+++ b/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
@@ -18,7 +18,6 @@
package java.nio;
import org.apache.harmony.luni.platform.PlatformAddress;
-// BEGIN android-added
import org.apache.harmony.luni.platform.PlatformAddressFactory;
// END android-added
diff --git a/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java b/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
index 42fbce4..d534460 100644
--- a/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
+++ b/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
@@ -16,8 +16,8 @@
package java.nio;
-import org.apache.harmony.nio.internal.DirectBuffer;
import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
/**
* This class wraps a byte buffer to be a short buffer.
diff --git a/luni/src/main/java/java/nio/channels/DatagramChannel.java b/luni/src/main/java/java/nio/channels/DatagramChannel.java
index 7e61cbc..dd09e16 100644
--- a/luni/src/main/java/java/nio/channels/DatagramChannel.java
+++ b/luni/src/main/java/java/nio/channels/DatagramChannel.java
@@ -24,8 +24,6 @@
import java.nio.channels.spi.AbstractSelectableChannel;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.harmony.luni.platform.Platform;
-
/**
* A {@code DatagramChannel} is a selectable channel that represents a partial
* abstraction of a datagram socket. The {@code socket} method of this class can
diff --git a/luni/src/main/java/java/nio/channels/SelectionKey.java b/luni/src/main/java/java/nio/channels/SelectionKey.java
index 0d1238e..90e396a 100644
--- a/luni/src/main/java/java/nio/channels/SelectionKey.java
+++ b/luni/src/main/java/java/nio/channels/SelectionKey.java
@@ -16,8 +16,6 @@
package java.nio.channels;
-import java.nio.channels.Selector;
-
/**
* A {@code SelectionKey} represents the relationship between a channel and a
* selector for which the channel is registered.
diff --git a/luni/src/main/java/java/nio/channels/SocketChannel.java b/luni/src/main/java/java/nio/channels/SocketChannel.java
index 5d4a556..0951b46 100644
--- a/luni/src/main/java/java/nio/channels/SocketChannel.java
+++ b/luni/src/main/java/java/nio/channels/SocketChannel.java
@@ -24,8 +24,6 @@
import java.nio.channels.spi.AbstractSelectableChannel;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.harmony.luni.platform.Platform;
-
/**
* A {@code SocketChannel} is a selectable channel that provides a partial
* abstraction of stream connecting socket. {@code socket()} returns the related
diff --git a/luni/src/main/java/java/nio/charset/Charset.java b/luni/src/main/java/java/nio/charset/Charset.java
index 14a992f..fe56655 100644
--- a/luni/src/main/java/java/nio/charset/Charset.java
+++ b/luni/src/main/java/java/nio/charset/Charset.java
@@ -18,25 +18,17 @@
package java.nio.charset;
import com.ibm.icu4jni.charset.NativeConverter;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.spi.CharsetProvider;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.SortedMap;
diff --git a/luni/src/main/java/java/security/AccessControlContext.java b/luni/src/main/java/java/security/AccessControlContext.java
index da46ba6..86fd784 100644
--- a/luni/src/main/java/java/security/AccessControlContext.java
+++ b/luni/src/main/java/java/security/AccessControlContext.java
@@ -32,9 +32,8 @@
package java.security;
-import org.apache.harmony.security.fortress.PolicyUtils;
-
import java.util.ArrayList;
+import org.apache.harmony.security.fortress.PolicyUtils;
/**
* {@code AccessControlContext} encapsulates the {@code ProtectionDomain}s on
diff --git a/luni/src/main/java/java/security/AlgorithmParameterGenerator.java b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
index ea81e20..43d577b 100644
--- a/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
+++ b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
@@ -18,7 +18,6 @@
package java.security;
import java.security.spec.AlgorithmParameterSpec;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/AlgorithmParameters.java b/luni/src/main/java/java/security/AlgorithmParameters.java
index c6dbbd8..8f751d0 100644
--- a/luni/src/main/java/java/security/AlgorithmParameters.java
+++ b/luni/src/main/java/java/security/AlgorithmParameters.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidParameterSpecException;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/java/security/CodeSource.java b/luni/src/main/java/java/security/CodeSource.java
index b9e26f4..41104e6 100644
--- a/luni/src/main/java/java/security/CodeSource.java
+++ b/luni/src/main/java/java/security/CodeSource.java
@@ -19,9 +19,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.OptionalDataException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.OptionalDataException;
import java.io.Serializable;
import java.net.SocketPermission;
import java.net.URL;
@@ -33,9 +33,7 @@
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.fortress.PolicyUtils;
/**
diff --git a/luni/src/main/java/java/security/Identity.java b/luni/src/main/java/java/security/Identity.java
index b358390..0e3b4cf 100644
--- a/luni/src/main/java/java/security/Identity.java
+++ b/luni/src/main/java/java/security/Identity.java
@@ -18,8 +18,8 @@
package java.security;
import java.io.Serializable;
-import java.util.Vector;
import java.util.Arrays;
+import java.util.Vector;
import libcore.base.Objects;
/**
diff --git a/luni/src/main/java/java/security/KeyFactory.java b/luni/src/main/java/java/security/KeyFactory.java
index 997437d..8387740 100644
--- a/luni/src/main/java/java/security/KeyFactory.java
+++ b/luni/src/main/java/java/security/KeyFactory.java
@@ -19,7 +19,6 @@
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/KeyPairGenerator.java b/luni/src/main/java/java/security/KeyPairGenerator.java
index 24792b3..cc91b18 100644
--- a/luni/src/main/java/java/security/KeyPairGenerator.java
+++ b/luni/src/main/java/java/security/KeyPairGenerator.java
@@ -18,7 +18,6 @@
package java.security;
import java.security.spec.AlgorithmParameterSpec;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/java/security/KeyRep.java b/luni/src/main/java/java/security/KeyRep.java
index a65cbd7..bc5b72e 100644
--- a/luni/src/main/java/java/security/KeyRep.java
+++ b/luni/src/main/java/java/security/KeyRep.java
@@ -22,10 +22,9 @@
import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
-import java.security.spec.X509EncodedKeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.InvalidKeySpecException;
-
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
import javax.crypto.spec.SecretKeySpec;
/**
diff --git a/luni/src/main/java/java/security/KeyStore.java b/luni/src/main/java/java/security/KeyStore.java
index 38c2af5..fcd0469 100644
--- a/luni/src/main/java/java/security/KeyStore.java
+++ b/luni/src/main/java/java/security/KeyStore.java
@@ -28,12 +28,10 @@
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
-
import javax.crypto.SecretKey;
import javax.security.auth.DestroyFailedException;
import javax.security.auth.Destroyable;
import javax.security.auth.callback.CallbackHandler;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/MessageDigest.java b/luni/src/main/java/java/security/MessageDigest.java
index 2083696..aac5403 100644
--- a/luni/src/main/java/java/security/MessageDigest.java
+++ b/luni/src/main/java/java/security/MessageDigest.java
@@ -18,7 +18,6 @@
package java.security;
import java.nio.ByteBuffer;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/Policy.java b/luni/src/main/java/java/security/Policy.java
index c61c41d..ab4df2b 100644
--- a/luni/src/main/java/java/security/Policy.java
+++ b/luni/src/main/java/java/security/Policy.java
@@ -18,7 +18,6 @@
package java.security;
import java.util.Enumeration;
-
import org.apache.harmony.security.fortress.DefaultPolicy;
import org.apache.harmony.security.fortress.PolicyUtils;
diff --git a/luni/src/main/java/java/security/Provider.java b/luni/src/main/java/java/security/Provider.java
index d1d9c4d..669fc7b 100644
--- a/luni/src/main/java/java/security/Provider.java
+++ b/luni/src/main/java/java/security/Provider.java
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-
import org.apache.harmony.luni.util.TwoKeyHashMap;
import org.apache.harmony.security.Util;
import org.apache.harmony.security.fortress.Services;
diff --git a/luni/src/main/java/java/security/SecureRandom.java b/luni/src/main/java/java/security/SecureRandom.java
index 448f3b5..31a1ba1 100644
--- a/luni/src/main/java/java/security/SecureRandom.java
+++ b/luni/src/main/java/java/security/SecureRandom.java
@@ -17,13 +17,9 @@
package java.security;
-import java.util.Iterator;
import java.util.Random;
-import java.util.Set;
-
import org.apache.harmony.security.fortress.Engine;
import org.apache.harmony.security.fortress.Services;
-
import org.apache.harmony.security.provider.crypto.SHA1PRNG_SecureRandomImpl;
/**
diff --git a/luni/src/main/java/java/security/Security.java b/luni/src/main/java/java/security/Security.java
index af8e916..7581a86 100644
--- a/luni/src/main/java/java/security/Security.java
+++ b/luni/src/main/java/java/security/Security.java
@@ -19,25 +19,20 @@
import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map.Entry;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.harmony.security.Util;
import org.apache.harmony.security.fortress.Engine;
-import org.apache.harmony.security.fortress.PolicyUtils;
import org.apache.harmony.security.fortress.SecurityAccess;
import org.apache.harmony.security.fortress.Services;
diff --git a/luni/src/main/java/java/security/Signature.java b/luni/src/main/java/java/security/Signature.java
index ab6f99d..f8fb2bb 100644
--- a/luni/src/main/java/java/security/Signature.java
+++ b/luni/src/main/java/java/security/Signature.java
@@ -23,7 +23,6 @@
import java.security.spec.AlgorithmParameterSpec;
import java.util.Iterator;
import java.util.Set;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/java/security/Timestamp.java b/luni/src/main/java/java/security/Timestamp.java
index 68236d3..8be421d 100644
--- a/luni/src/main/java/java/security/Timestamp.java
+++ b/luni/src/main/java/java/security/Timestamp.java
@@ -18,8 +18,8 @@
package java.security;
import java.io.Serializable;
-import java.util.Date;
import java.security.cert.CertPath;
+import java.util.Date;
/**
* {@code Timestamp} represents a signed time stamp. {@code Timestamp} is
diff --git a/luni/src/main/java/java/security/UnresolvedPermission.java b/luni/src/main/java/java/security/UnresolvedPermission.java
index 5e2ff78..0865a96 100644
--- a/luni/src/main/java/java/security/UnresolvedPermission.java
+++ b/luni/src/main/java/java/security/UnresolvedPermission.java
@@ -27,7 +27,6 @@
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
-
import org.apache.harmony.security.fortress.PolicyUtils;
/**
diff --git a/luni/src/main/java/java/security/cert/CertPathBuilder.java b/luni/src/main/java/java/security/cert/CertPathBuilder.java
index 1650297..11a38cc 100644
--- a/luni/src/main/java/java/security/cert/CertPathBuilder.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilder.java
@@ -23,7 +23,6 @@
import java.security.NoSuchProviderException;
import java.security.Provider;
import java.security.Security;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/cert/CertPathValidator.java b/luni/src/main/java/java/security/cert/CertPathValidator.java
index c19a611..b73857f 100644
--- a/luni/src/main/java/java/security/cert/CertPathValidator.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidator.java
@@ -23,7 +23,6 @@
import java.security.NoSuchProviderException;
import java.security.Provider;
import java.security.Security;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/cert/CertStore.java b/luni/src/main/java/java/security/cert/CertStore.java
index f175065..775236c 100644
--- a/luni/src/main/java/java/security/cert/CertStore.java
+++ b/luni/src/main/java/java/security/cert/CertStore.java
@@ -24,7 +24,6 @@
import java.security.Provider;
import java.security.Security;
import java.util.Collection;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/java/security/cert/CertificateFactory.java b/luni/src/main/java/java/security/cert/CertificateFactory.java
index ee2d96b..6bef771 100644
--- a/luni/src/main/java/java/security/cert/CertificateFactory.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactory.java
@@ -25,7 +25,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
index 46b500b..a11267d 100644
--- a/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
+++ b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
@@ -18,7 +18,6 @@
package java.security.cert;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ObjectIdentifier;
import org.apache.harmony.security.utils.Array;
diff --git a/luni/src/main/java/java/security/cert/TrustAnchor.java b/luni/src/main/java/java/security/cert/TrustAnchor.java
index c280846..1feeed4 100644
--- a/luni/src/main/java/java/security/cert/TrustAnchor.java
+++ b/luni/src/main/java/java/security/cert/TrustAnchor.java
@@ -19,9 +19,7 @@
import java.io.IOException;
import java.security.PublicKey;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.utils.Array;
import org.apache.harmony.security.x509.NameConstraints;
diff --git a/luni/src/main/java/java/security/cert/X509CRL.java b/luni/src/main/java/java/security/cert/X509CRL.java
index 9284385..4badd59 100644
--- a/luni/src/main/java/java/security/cert/X509CRL.java
+++ b/luni/src/main/java/java/security/cert/X509CRL.java
@@ -25,10 +25,6 @@
import java.security.Principal;
import java.security.PublicKey;
import java.security.SignatureException;
-import java.security.cert.CRL;
-import java.security.cert.CRLException;
-import java.security.cert.X509CRLEntry;
-import java.security.cert.X509Extension;
import java.util.Arrays;
import java.util.Date;
import java.util.Set;
diff --git a/luni/src/main/java/java/security/cert/X509CRLEntry.java b/luni/src/main/java/java/security/cert/X509CRLEntry.java
index ac0805c..4b4c15d 100644
--- a/luni/src/main/java/java/security/cert/X509CRLEntry.java
+++ b/luni/src/main/java/java/security/cert/X509CRLEntry.java
@@ -18,9 +18,6 @@
package java.security.cert;
import java.math.BigInteger;
-import java.security.cert.CRLException;
-import java.security.cert.X509CRLEntry;
-import java.security.cert.X509Extension;
import java.util.Arrays;
import java.util.Date;
import javax.security.auth.x500.X500Principal;
diff --git a/luni/src/main/java/java/security/cert/X509CRLSelector.java b/luni/src/main/java/java/security/cert/X509CRLSelector.java
index 9ea6d20..757bfa8 100644
--- a/luni/src/main/java/java/security/cert/X509CRLSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CRLSelector.java
@@ -25,7 +25,6 @@
import java.util.Collections;
import java.util.Date;
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1OctetString;
import org.apache.harmony.security.x501.Name;
diff --git a/luni/src/main/java/java/security/cert/X509CertSelector.java b/luni/src/main/java/java/security/cert/X509CertSelector.java
index 85d6f32..8745bf2 100644
--- a/luni/src/main/java/java/security/cert/X509CertSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CertSelector.java
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.math.BigInteger;
import java.security.PublicKey;
-import java.security.cert.CertSelector;
-import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -32,7 +30,6 @@
import java.util.List;
import java.util.Set;
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1OctetString;
import org.apache.harmony.security.x509.AlgorithmIdentifier;
import org.apache.harmony.security.x509.CertificatePolicies;
diff --git a/luni/src/main/java/java/security/cert/X509Certificate.java b/luni/src/main/java/java/security/cert/X509Certificate.java
index 6a2feae..90737d7 100644
--- a/luni/src/main/java/java/security/cert/X509Certificate.java
+++ b/luni/src/main/java/java/security/cert/X509Certificate.java
@@ -23,7 +23,6 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
/**
diff --git a/luni/src/main/java/java/security/interfaces/ECPublicKey.java b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
index c6a1db7..d3eeeac 100644
--- a/luni/src/main/java/java/security/interfaces/ECPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
@@ -17,8 +17,8 @@
package java.security.interfaces;
-import java.security.spec.ECPoint;
import java.security.PublicKey;
+import java.security.spec.ECPoint;
/**
* The interface for an Elliptic Curve (EC) public key.
diff --git a/luni/src/main/java/java/sql/Blob.java b/luni/src/main/java/java/sql/Blob.java
index d573d6c..f4278cf 100644
--- a/luni/src/main/java/java/sql/Blob.java
+++ b/luni/src/main/java/java/sql/Blob.java
@@ -17,8 +17,8 @@
package java.sql;
-import java.io.OutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
/**
* A Java interface representing the SQL {@code BLOB} type.
diff --git a/luni/src/main/java/java/sql/CallableStatement.java b/luni/src/main/java/java/sql/CallableStatement.java
index 2ff9990..4c876c2 100644
--- a/luni/src/main/java/java/sql/CallableStatement.java
+++ b/luni/src/main/java/java/sql/CallableStatement.java
@@ -17,12 +17,12 @@
package java.sql;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Map;
-import java.net.URL;
import java.io.InputStream;
import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Map;
/**
* An interface used to call <i>Stored Procedures</i>.
diff --git a/luni/src/main/java/java/sql/Clob.java b/luni/src/main/java/java/sql/Clob.java
index bb95f87..0e55496 100644
--- a/luni/src/main/java/java/sql/Clob.java
+++ b/luni/src/main/java/java/sql/Clob.java
@@ -18,8 +18,8 @@
package java.sql;
import java.io.InputStream;
-import java.io.Reader;
import java.io.OutputStream;
+import java.io.Reader;
import java.io.Writer;
/**
diff --git a/luni/src/main/java/java/sql/PreparedStatement.java b/luni/src/main/java/java/sql/PreparedStatement.java
index 1211baf..957b844 100644
--- a/luni/src/main/java/java/sql/PreparedStatement.java
+++ b/luni/src/main/java/java/sql/PreparedStatement.java
@@ -17,11 +17,11 @@
package java.sql;
-import java.util.Calendar;
-import java.net.URL;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
+import java.net.URL;
+import java.util.Calendar;
/**
* An interface for a precompiled SQL Statement.
diff --git a/luni/src/main/java/java/sql/ResultSet.java b/luni/src/main/java/java/sql/ResultSet.java
index 5a673ea..b707a17 100644
--- a/luni/src/main/java/java/sql/ResultSet.java
+++ b/luni/src/main/java/java/sql/ResultSet.java
@@ -18,11 +18,11 @@
package java.sql;
import java.io.InputStream;
-import java.math.BigDecimal;
import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
import java.util.Calendar;
import java.util.Map;
-import java.net.URL;
/**
* An interface for an object which represents a database table entry, returned
diff --git a/luni/src/main/java/java/sql/SQLInput.java b/luni/src/main/java/java/sql/SQLInput.java
index fd0ddac..70307fd 100644
--- a/luni/src/main/java/java/sql/SQLInput.java
+++ b/luni/src/main/java/java/sql/SQLInput.java
@@ -17,9 +17,9 @@
package java.sql;
-import java.math.BigDecimal;
-import java.io.Reader;
import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
import java.net.URL;
/**
diff --git a/luni/src/main/java/java/sql/SQLXML.java b/luni/src/main/java/java/sql/SQLXML.java
index b92df75..1346ba7 100644
--- a/luni/src/main/java/java/sql/SQLXML.java
+++ b/luni/src/main/java/java/sql/SQLXML.java
@@ -21,7 +21,6 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-
import javax.xml.transform.Result;
import javax.xml.transform.Source;
diff --git a/luni/src/main/java/java/text/Collator.java b/luni/src/main/java/java/text/Collator.java
index 4eba893..95d6557 100644
--- a/luni/src/main/java/java/text/Collator.java
+++ b/luni/src/main/java/java/text/Collator.java
@@ -18,11 +18,8 @@
package java.text;
import com.ibm.icu4jni.util.ICU;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Comparator;
import java.util.Locale;
-import java.util.Vector;
/**
* Performs locale-sensitive string comparison. A concrete subclass,
diff --git a/luni/src/main/java/java/text/DateFormat.java b/luni/src/main/java/java/text/DateFormat.java
index 983691e..c667e8f 100644
--- a/luni/src/main/java/java/text/DateFormat.java
+++ b/luni/src/main/java/java/text/DateFormat.java
@@ -17,8 +17,8 @@
package java.text;
-import com.ibm.icu4jni.util.LocaleData;
import com.ibm.icu4jni.util.ICU;
+import com.ibm.icu4jni.util.LocaleData;
import java.io.InvalidObjectException;
import java.util.Calendar;
import java.util.Date;
diff --git a/luni/src/main/java/java/text/DateFormatSymbols.java b/luni/src/main/java/java/text/DateFormatSymbols.java
index cc810c1..8d785b1 100644
--- a/luni/src/main/java/java/text/DateFormatSymbols.java
+++ b/luni/src/main/java/java/text/DateFormatSymbols.java
@@ -17,8 +17,8 @@
package java.text;
-import com.ibm.icu4jni.util.LocaleData;
import com.ibm.icu4jni.util.ICU;
+import com.ibm.icu4jni.util.LocaleData;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/luni/src/main/java/java/text/DecimalFormat.java b/luni/src/main/java/java/text/DecimalFormat.java
index e09e538..dfff02d 100644
--- a/luni/src/main/java/java/text/DecimalFormat.java
+++ b/luni/src/main/java/java/text/DecimalFormat.java
@@ -26,8 +26,6 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Currency;
import java.util.Locale;
diff --git a/luni/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index 3907f40..0b90ee4 100644
--- a/luni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -17,14 +17,13 @@
package java.text;
-import com.ibm.icu4jni.util.LocaleData;
import com.ibm.icu4jni.util.ICU;
+import com.ibm.icu4jni.util.LocaleData;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamField;
import java.io.Serializable;
-import java.util.Arrays;
import java.util.Currency;
import java.util.Locale;
diff --git a/luni/src/main/java/java/text/Format.java b/luni/src/main/java/java/text/Format.java
index 281be13..65c4363 100644
--- a/luni/src/main/java/java/text/Format.java
+++ b/luni/src/main/java/java/text/Format.java
@@ -18,9 +18,6 @@
package java.text;
import java.io.Serializable;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Locale;
/**
* The base class for all formats.
diff --git a/luni/src/main/java/java/text/NumberFormat.java b/luni/src/main/java/java/text/NumberFormat.java
index 4ac1bf7..6d251af 100644
--- a/luni/src/main/java/java/text/NumberFormat.java
+++ b/luni/src/main/java/java/text/NumberFormat.java
@@ -17,8 +17,8 @@
package java.text;
-import com.ibm.icu4jni.util.LocaleData;
import com.ibm.icu4jni.util.ICU;
+import com.ibm.icu4jni.util.LocaleData;
import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
diff --git a/luni/src/main/java/java/util/Calendar.java b/luni/src/main/java/java/util/Calendar.java
index db61a8a..7f036ab 100644
--- a/luni/src/main/java/java/util/Calendar.java
+++ b/luni/src/main/java/java/util/Calendar.java
@@ -17,8 +17,8 @@
package java.util;
-import com.ibm.icu4jni.util.LocaleData;
import com.ibm.icu4jni.util.ICU;
+import com.ibm.icu4jni.util.LocaleData;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/luni/src/main/java/java/util/Currency.java b/luni/src/main/java/java/util/Currency.java
index 6647f56..84bf833 100644
--- a/luni/src/main/java/java/util/Currency.java
+++ b/luni/src/main/java/java/util/Currency.java
@@ -22,7 +22,6 @@
import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.logging.Logger;
/**
* This class represents a currency as identified in the ISO 4217 currency
diff --git a/luni/src/main/java/java/util/EnumSet.java b/luni/src/main/java/java/util/EnumSet.java
index d187a64..48bfd3a 100644
--- a/luni/src/main/java/java/util/EnumSet.java
+++ b/luni/src/main/java/java/util/EnumSet.java
@@ -16,10 +16,9 @@
package java.util;
// BEGIN android-added
-import org.apache.harmony.kernel.vm.LangAccess;
-// END android-added
import java.io.Serializable;
+import org.apache.harmony.kernel.vm.LangAccess;
/**
* An EnumSet is a specialized Set to be used with enums as keys.
diff --git a/luni/src/main/java/java/util/InvalidPropertiesFormatException.java b/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
index bd66bb7..fa004d5 100644
--- a/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
+++ b/luni/src/main/java/java/util/InvalidPropertiesFormatException.java
@@ -17,10 +17,10 @@
package java.util;
+import java.io.IOException;
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.IOException;
/**
* An {@code InvalidPropertiesFormatException} is thrown if loading the XML
diff --git a/luni/src/main/java/java/util/PropertyPermission.java b/luni/src/main/java/java/util/PropertyPermission.java
index 9d5b98b..b4ac105 100644
--- a/luni/src/main/java/java/util/PropertyPermission.java
+++ b/luni/src/main/java/java/util/PropertyPermission.java
@@ -24,7 +24,6 @@
import java.security.BasicPermission;
import java.security.Permission;
import java.security.PermissionCollection;
-
import org.apache.harmony.luni.util.Util;
/**
diff --git a/luni/src/main/java/java/util/TreeMap.java b/luni/src/main/java/java/util/TreeMap.java
index a11ab1a..ad0f182 100644
--- a/luni/src/main/java/java/util/TreeMap.java
+++ b/luni/src/main/java/java/util/TreeMap.java
@@ -22,14 +22,8 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
-import static java.util.TreeMap.Bound.EXCLUSIVE;
-import static java.util.TreeMap.Bound.INCLUSIVE;
-import static java.util.TreeMap.Bound.NO_BOUND;
-import static java.util.TreeMap.Relation.CEILING;
-import static java.util.TreeMap.Relation.EQUAL;
-import static java.util.TreeMap.Relation.FLOOR;
-import static java.util.TreeMap.Relation.HIGHER;
-import static java.util.TreeMap.Relation.LOWER;
+import static java.util.TreeMap.Bound.*;
+import static java.util.TreeMap.Relation.*;
import libcore.base.Objects;
/**
diff --git a/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java b/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java
index a7c8fe5..eee6c1c 100644
--- a/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java
@@ -5,7 +5,11 @@
*/
package java.util.concurrent;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
/**
* Provides default implementations of {@link ExecutorService}
diff --git a/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java b/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
index 1c6f613..24d04e3 100644
--- a/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
@@ -5,8 +5,14 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.*;
+
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/BlockingDeque.java b/luni/src/main/java/java/util/concurrent/BlockingDeque.java
index 741eb56..2074061 100644
--- a/luni/src/main/java/java/util/concurrent/BlockingDeque.java
+++ b/luni/src/main/java/java/util/concurrent/BlockingDeque.java
@@ -5,7 +5,10 @@
*/
package java.util.concurrent;
-import java.util.*;
+
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
/**
* A {@link Deque} that additionally supports blocking operations that wait
diff --git a/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java
index 1c157b4..1685325 100644
--- a/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java
@@ -5,12 +5,22 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.*;
-import java.io.Serializable;
+
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
index 3ef5c34..3845ade 100644
--- a/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
@@ -9,11 +9,10 @@
import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.ConcurrentModificationException;
import java.util.Deque;
import java.util.Iterator;
-import java.util.ConcurrentModificationException;
import java.util.NoSuchElementException;
-import java.util.concurrent.atomic.AtomicReference;
/**
* A concurrent linked-list implementation of a {@link Deque}
diff --git a/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
index 7d86afb..727f2a6 100644
--- a/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
@@ -5,7 +5,12 @@
*/
package java.util.concurrent;
-import java.util.*;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
/**
* A {@link ConcurrentMap} supporting {@link NavigableMap} operations,
diff --git a/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
index d73d163..19ca588 100644
--- a/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
@@ -5,8 +5,24 @@
*/
package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
/**
* A scalable concurrent {@link ConcurrentNavigableMap} implementation.
diff --git a/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
index 7fd1c76..f91e6e8 100644
--- a/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
@@ -5,7 +5,18 @@
*/
package java.util.concurrent;
-import java.util.*;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.SortedSet;
import sun.misc.Unsafe;
/**
diff --git a/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
index 237c5df..a2dce1d 100644
--- a/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
@@ -15,8 +15,17 @@
*/
package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.locks.*;
+
+import java.util.AbstractList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+import java.util.concurrent.locks.ReentrantLock;
import sun.misc.Unsafe;
// BEGIN android-note
diff --git a/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java b/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
index 65a05de..b07014b 100644
--- a/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
+++ b/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
@@ -5,7 +5,12 @@
*/
package java.util.concurrent;
-import java.util.*;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/CountDownLatch.java b/luni/src/main/java/java/util/concurrent/CountDownLatch.java
index 2b945dd..849ae9d 100644
--- a/luni/src/main/java/java/util/concurrent/CountDownLatch.java
+++ b/luni/src/main/java/java/util/concurrent/CountDownLatch.java
@@ -5,8 +5,8 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
/**
* A synchronization aid that allows one or more threads to wait until
diff --git a/luni/src/main/java/java/util/concurrent/CyclicBarrier.java b/luni/src/main/java/java/util/concurrent/CyclicBarrier.java
index d5738c5..afb267b 100644
--- a/luni/src/main/java/java/util/concurrent/CyclicBarrier.java
+++ b/luni/src/main/java/java/util/concurrent/CyclicBarrier.java
@@ -5,7 +5,9 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* A synchronization aid that allows a set of threads to all wait for
diff --git a/luni/src/main/java/java/util/concurrent/DelayQueue.java b/luni/src/main/java/java/util/concurrent/DelayQueue.java
index 52ac4a0..ff35dbc 100644
--- a/luni/src/main/java/java/util/concurrent/DelayQueue.java
+++ b/luni/src/main/java/java/util/concurrent/DelayQueue.java
@@ -6,8 +6,15 @@
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.*;
+
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.PriorityQueue;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/Delayed.java b/luni/src/main/java/java/util/concurrent/Delayed.java
index b1ff4ee..7d05064 100644
--- a/luni/src/main/java/java/util/concurrent/Delayed.java
+++ b/luni/src/main/java/java/util/concurrent/Delayed.java
@@ -6,8 +6,6 @@
package java.util.concurrent;
-import java.util.*;
-
/**
* A mix-in style interface for marking objects that should be
* acted upon after a given delay.
diff --git a/luni/src/main/java/java/util/concurrent/Exchanger.java b/luni/src/main/java/java/util/concurrent/Exchanger.java
index bb2193c..e8224ed 100644
--- a/luni/src/main/java/java/util/concurrent/Exchanger.java
+++ b/luni/src/main/java/java/util/concurrent/Exchanger.java
@@ -6,7 +6,9 @@
*/
package java.util.concurrent;
-import java.util.concurrent.atomic.*;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
/**
diff --git a/luni/src/main/java/java/util/concurrent/ExecutorService.java b/luni/src/main/java/java/util/concurrent/ExecutorService.java
index ddd77bf..b4bc5cb 100644
--- a/luni/src/main/java/java/util/concurrent/ExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/ExecutorService.java
@@ -5,10 +5,9 @@
*/
package java.util.concurrent;
-import java.util.List;
+
import java.util.Collection;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
+import java.util.List;
/**
* An {@link Executor} that provides methods to manage termination and
diff --git a/luni/src/main/java/java/util/concurrent/Executors.java b/luni/src/main/java/java/util/concurrent/Executors.java
index 96f6c15..9b0f08b 100644
--- a/luni/src/main/java/java/util/concurrent/Executors.java
+++ b/luni/src/main/java/java/util/concurrent/Executors.java
@@ -5,14 +5,16 @@
*/
package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
+
import java.security.AccessControlContext;
+import java.security.AccessControlException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
-import java.security.AccessControlException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
// import sun.security.util.SecurityConstants; // android-removed
/**
diff --git a/luni/src/main/java/java/util/concurrent/FutureTask.java b/luni/src/main/java/java/util/concurrent/FutureTask.java
index 6bd13f9..9142275 100644
--- a/luni/src/main/java/java/util/concurrent/FutureTask.java
+++ b/luni/src/main/java/java/util/concurrent/FutureTask.java
@@ -5,7 +5,8 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
+
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
/**
* A cancellable asynchronous computation. This class provides a base
diff --git a/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java b/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
index 1a8e412..b385320 100644
--- a/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
@@ -10,13 +10,13 @@
// removed link to collections framework docs
// END android-note
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.AbstractQueue;
import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* An optionally-bounded {@linkplain BlockingQueue blocking queue} based on
diff --git a/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java b/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
index 35d7b89..95dfc75 100644
--- a/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
@@ -6,8 +6,17 @@
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.*;
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.SortedSet;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java b/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java
index c170c4a..2eae4b8 100644
--- a/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java
@@ -5,8 +5,6 @@
*/
package java.util.concurrent;
-import java.util.concurrent.atomic.*;
-import java.util.*;
/**
* An {@link ExecutorService} that can schedule commands to run after a given
diff --git a/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java b/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
index 1c02b9a..6b3a90c 100644
--- a/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
+++ b/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
@@ -5,9 +5,16 @@
*/
package java.util.concurrent;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-import java.util.*;
+
+import java.util.AbstractQueue;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* A {@link ThreadPoolExecutor} that can additionally schedule
diff --git a/luni/src/main/java/java/util/concurrent/Semaphore.java b/luni/src/main/java/java/util/concurrent/Semaphore.java
index 1f5c00e..9cf94f5 100644
--- a/luni/src/main/java/java/util/concurrent/Semaphore.java
+++ b/luni/src/main/java/java/util/concurrent/Semaphore.java
@@ -5,9 +5,10 @@
*/
package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.Collection;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import java.util.concurrent.locks.Lock;
/**
* A counting semaphore. Conceptually, a semaphore maintains a set of
diff --git a/luni/src/main/java/java/util/concurrent/SynchronousQueue.java b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java
index 5f9e8d7..153d449 100644
--- a/luni/src/main/java/java/util/concurrent/SynchronousQueue.java
+++ b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java
@@ -6,9 +6,14 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
-import java.util.*;
+
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
// BEGIN android-note
// removed link to collections framework docs
diff --git a/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
index c362c99..d360ad3 100644
--- a/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
+++ b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
@@ -5,9 +5,16 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.ConcurrentModificationException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* An {@link ExecutorService} that executes each submitted task using
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
index b6d6cc5..30fa483 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
@@ -5,8 +5,8 @@
*/
package java.util.concurrent.atomic;
+
import sun.misc.Unsafe;
-import java.util.*;
/**
* An {@code int} array in which elements may be updated atomically.
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
index 476bb0a..11b1124 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
@@ -5,9 +5,12 @@
*/
package java.util.concurrent.atomic;
+
import dalvik.system.VMStack;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
import sun.misc.Unsafe;
-import java.lang.reflect.*;
/**
* A reflection-based utility that enables atomic updates to
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
index 33e6914..7e91ae7 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
@@ -5,8 +5,8 @@
*/
package java.util.concurrent.atomic;
+
import sun.misc.Unsafe;
-import java.util.*;
/**
* A {@code long} array in which elements may be updated atomically.
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
index 427a9e1..81802af 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
@@ -5,9 +5,12 @@
*/
package java.util.concurrent.atomic;
+
import dalvik.system.VMStack;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
import sun.misc.Unsafe;
-import java.lang.reflect.*;
/**
* A reflection-based utility that enables atomic updates to
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
index 2501c2b..b421e1b 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -5,8 +5,8 @@
*/
package java.util.concurrent.atomic;
+
import sun.misc.Unsafe;
-import java.util.*;
/**
* An array of object references in which elements may be updated
diff --git a/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index e53f2e9..b854803 100644
--- a/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
@@ -5,9 +5,12 @@
*/
package java.util.concurrent.atomic;
+
import dalvik.system.VMStack;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Modifier;
import sun.misc.Unsafe;
-import java.lang.reflect.*;
/**
* A reflection-based utility that enables atomic updates to
diff --git a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index d805259..90adce6 100644
--- a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -5,9 +5,11 @@
*/
package java.util.concurrent.locks;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
import sun.misc.Unsafe;
/**
diff --git a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 0f6cea1..9715bc5 100644
--- a/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -5,9 +5,12 @@
*/
package java.util.concurrent.locks;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import sun.misc.Unsafe;
/**
diff --git a/luni/src/main/java/java/util/concurrent/locks/Condition.java b/luni/src/main/java/java/util/concurrent/locks/Condition.java
index d75de51..f3c6a3f 100644
--- a/luni/src/main/java/java/util/concurrent/locks/Condition.java
+++ b/luni/src/main/java/java/util/concurrent/locks/Condition.java
@@ -5,8 +5,9 @@
*/
package java.util.concurrent.locks;
-import java.util.concurrent.*;
+
import java.util.Date;
+import java.util.concurrent.TimeUnit;
/**
* {@code Condition} factors out the {@code Object} monitor
diff --git a/luni/src/main/java/java/util/concurrent/locks/LockSupport.java b/luni/src/main/java/java/util/concurrent/locks/LockSupport.java
index ac9a94f..4b8ccf7 100644
--- a/luni/src/main/java/java/util/concurrent/locks/LockSupport.java
+++ b/luni/src/main/java/java/util/concurrent/locks/LockSupport.java
@@ -5,7 +5,7 @@
*/
package java.util.concurrent.locks;
-import java.util.concurrent.*;
+
import sun.misc.Unsafe;
diff --git a/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java b/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java
index bf2ac38..500a3b7 100644
--- a/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java
@@ -5,9 +5,9 @@
*/
package java.util.concurrent.locks;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
/**
* A reentrant mutual exclusion {@link Lock} with the same basic
diff --git a/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java b/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
index bfaff06..a8f81b2 100644
--- a/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
@@ -5,9 +5,9 @@
*/
package java.util.concurrent.locks;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.*;
+
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
/**
* An implementation of {@link ReadWriteLock} supporting similar
diff --git a/luni/src/main/java/java/util/jar/Attributes.java b/luni/src/main/java/java/util/jar/Attributes.java
index 8366f29..a0f6bf4 100644
--- a/luni/src/main/java/java/util/jar/Attributes.java
+++ b/luni/src/main/java/java/util/jar/Attributes.java
@@ -22,7 +22,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-
import org.apache.harmony.archive.util.Util;
/**
diff --git a/luni/src/main/java/java/util/jar/InitManifest.java b/luni/src/main/java/java/util/jar/InitManifest.java
index 0bc604c..763d8d2 100644
--- a/luni/src/main/java/java/util/jar/InitManifest.java
+++ b/luni/src/main/java/java/util/jar/InitManifest.java
@@ -21,7 +21,6 @@
import java.nio.charset.Charsets;
import java.util.Arrays;
import java.util.Map;
-import org.apache.harmony.luni.util.ThreadLocalCache;
/**
* Reads a JAR file manifest. The specification is here:
diff --git a/luni/src/main/java/java/util/jar/JarEntry.java b/luni/src/main/java/java/util/jar/JarEntry.java
index 55a341f..f53f78f 100644
--- a/luni/src/main/java/java/util/jar/JarEntry.java
+++ b/luni/src/main/java/java/util/jar/JarEntry.java
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.zip.ZipEntry;
-
import javax.security.auth.x500.X500Principal;
/**
diff --git a/luni/src/main/java/java/util/jar/JarFile.java b/luni/src/main/java/java/util/jar/JarFile.java
index 54d1737..9f3eda2 100644
--- a/luni/src/main/java/java/util/jar/JarFile.java
+++ b/luni/src/main/java/java/util/jar/JarFile.java
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-
import org.apache.harmony.archive.util.Util;
import org.apache.harmony.luni.util.InputStreamHelper;
diff --git a/luni/src/main/java/java/util/jar/JarInputStream.java b/luni/src/main/java/java/util/jar/JarInputStream.java
index 5534eac..76180d2 100644
--- a/luni/src/main/java/java/util/jar/JarInputStream.java
+++ b/luni/src/main/java/java/util/jar/JarInputStream.java
@@ -23,7 +23,6 @@
import java.io.OutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-
import org.apache.harmony.luni.util.Util;
/**
diff --git a/luni/src/main/java/java/util/jar/JarVerifier.java b/luni/src/main/java/java/util/jar/JarVerifier.java
index 88373a3..f59ac13 100644
--- a/luni/src/main/java/java/util/jar/JarVerifier.java
+++ b/luni/src/main/java/java/util/jar/JarVerifier.java
@@ -31,11 +31,9 @@
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
-
import org.apache.harmony.luni.util.Base64;
-import org.apache.harmony.security.utils.JarUtils;
-
import org.apache.harmony.luni.util.Util;
+import org.apache.harmony.security.utils.JarUtils;
/**
* Non-public class used by {@link JarFile} and {@link JarInputStream} to manage
diff --git a/luni/src/main/java/java/util/jar/Manifest.java b/luni/src/main/java/java/util/jar/Manifest.java
index 5394bb2..618234f 100644
--- a/luni/src/main/java/java/util/jar/Manifest.java
+++ b/luni/src/main/java/java/util/jar/Manifest.java
@@ -29,7 +29,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
import org.apache.harmony.luni.util.InputStreamHelper;
import org.apache.harmony.luni.util.ThreadLocalCache;
diff --git a/luni/src/main/java/java/util/prefs/AbstractPreferences.java b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
index 5da63c4..7f87283 100644
--- a/luni/src/main/java/java/util/prefs/AbstractPreferences.java
+++ b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.Charsets;
import java.util.Collection;
import java.util.EventListener;
@@ -30,7 +29,6 @@
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-
import org.apache.harmony.luni.util.Base64;
/**
diff --git a/luni/src/main/java/java/util/prefs/NodeChangeEvent.java b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
index efde846..19ad8a3 100644
--- a/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
@@ -16,12 +16,12 @@
package java.util.prefs;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.EventObject;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.NotSerializableException;
-import java.io.IOException;
/**
* This is the event class to indicate that one child of the preference node has
diff --git a/luni/src/main/java/java/util/prefs/NodeChangeListener.java b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
index 5e22769..890e31e 100644
--- a/luni/src/main/java/java/util/prefs/NodeChangeListener.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
@@ -17,7 +17,6 @@
package java.util.prefs;
import java.util.EventListener;
-import java.util.prefs.NodeChangeEvent;
/**
* This interface is used to handle preference node change events. The
diff --git a/luni/src/main/java/java/util/prefs/NodeSet.java b/luni/src/main/java/java/util/prefs/NodeSet.java
index 9e3ab1d..5a8c971 100644
--- a/luni/src/main/java/java/util/prefs/NodeSet.java
+++ b/luni/src/main/java/java/util/prefs/NodeSet.java
@@ -1,10 +1,9 @@
package java.util.prefs;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import java.util.ArrayList;
import java.util.Iterator;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
class NodeSet implements NodeList {
diff --git a/luni/src/main/java/java/util/prefs/Preferences.java b/luni/src/main/java/java/util/prefs/Preferences.java
index dc43bf5..707b3ba 100644
--- a/luni/src/main/java/java/util/prefs/Preferences.java
+++ b/luni/src/main/java/java/util/prefs/Preferences.java
@@ -20,9 +20,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Locale;
import java.util.ServiceLoader;
/**
diff --git a/luni/src/main/java/java/util/prefs/XMLParser.java b/luni/src/main/java/java/util/prefs/XMLParser.java
index 85b6d73..dcb1bc3 100644
--- a/luni/src/main/java/java/util/prefs/XMLParser.java
+++ b/luni/src/main/java/java/util/prefs/XMLParser.java
@@ -41,7 +41,6 @@
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/luni/src/main/java/java/util/regex/Pattern.java b/luni/src/main/java/java/util/regex/Pattern.java
index 75bdd35e..1b724dd 100644
--- a/luni/src/main/java/java/util/regex/Pattern.java
+++ b/luni/src/main/java/java/util/regex/Pattern.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
-import java.util.ArrayList;
/**
* Patterns are compiled regular expressions. In many cases, convenience methods such as
diff --git a/luni/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java
index b1e20f9..f5bf832 100644
--- a/luni/src/main/java/java/util/zip/ZipFile.java
+++ b/luni/src/main/java/java/util/zip/ZipFile.java
@@ -25,8 +25,8 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Enumeration;
-import java.util.LinkedHashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
/**
* This class provides random read access to a <i>ZIP-archive</i> file.
diff --git a/luni/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index 3a2dedd..20dca98 100644
--- a/luni/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
@@ -33,7 +33,6 @@
import java.security.spec.AlgorithmParameterSpec;
import java.util.Set;
import java.util.StringTokenizer;
-
import org.apache.harmony.crypto.internal.NullCipherSpi;
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/javax/crypto/CipherInputStream.java b/luni/src/main/java/javax/crypto/CipherInputStream.java
index a4c5ab7..3e276b7 100644
--- a/luni/src/main/java/javax/crypto/CipherInputStream.java
+++ b/luni/src/main/java/javax/crypto/CipherInputStream.java
@@ -20,7 +20,6 @@
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-import javax.crypto.NullCipher;
import java.security.GeneralSecurityException;
/**
diff --git a/luni/src/main/java/javax/crypto/CipherOutputStream.java b/luni/src/main/java/javax/crypto/CipherOutputStream.java
index 1f95b99..da0ba65 100644
--- a/luni/src/main/java/javax/crypto/CipherOutputStream.java
+++ b/luni/src/main/java/javax/crypto/CipherOutputStream.java
@@ -20,7 +20,6 @@
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import javax.crypto.NullCipher;
/**
* This class wraps an output stream and a cipher so that {@code write} methods
diff --git a/luni/src/main/java/javax/crypto/CipherSpi.java b/luni/src/main/java/javax/crypto/CipherSpi.java
index 2015670..760fdb6 100644
--- a/luni/src/main/java/javax/crypto/CipherSpi.java
+++ b/luni/src/main/java/javax/crypto/CipherSpi.java
@@ -17,6 +17,7 @@
package javax.crypto;
+import java.nio.ByteBuffer;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -24,7 +25,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import java.nio.ByteBuffer;
/**
* This class defines the <i>Service Provider Interface</i> (<b>SPI</b>) for
diff --git a/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
index 8be64db..034f07a 100644
--- a/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
@@ -27,7 +27,6 @@
import java.security.Provider;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
-
import org.apache.harmony.security.asn1.ASN1Any;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
diff --git a/luni/src/main/java/javax/crypto/ExemptionMechanism.java b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
index 06f645d..5bd994f 100644
--- a/luni/src/main/java/javax/crypto/ExemptionMechanism.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
@@ -27,7 +27,6 @@
import java.security.Security;
import java.security.spec.AlgorithmParameterSpec;
import java.util.Arrays;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/javax/crypto/KeyAgreement.java b/luni/src/main/java/javax/crypto/KeyAgreement.java
index 4533f7c3..8df7447 100644
--- a/luni/src/main/java/javax/crypto/KeyAgreement.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreement.java
@@ -26,7 +26,6 @@
import java.security.SecureRandom;
import java.security.Security;
import java.security.spec.AlgorithmParameterSpec;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/javax/crypto/KeyGenerator.java b/luni/src/main/java/javax/crypto/KeyGenerator.java
index 7b83718..915662c 100644
--- a/luni/src/main/java/javax/crypto/KeyGenerator.java
+++ b/luni/src/main/java/javax/crypto/KeyGenerator.java
@@ -24,7 +24,6 @@
import java.security.SecureRandom;
import java.security.Security;
import java.security.spec.AlgorithmParameterSpec;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/javax/crypto/Mac.java b/luni/src/main/java/javax/crypto/Mac.java
index 2827da0..1e98db8 100644
--- a/luni/src/main/java/javax/crypto/Mac.java
+++ b/luni/src/main/java/javax/crypto/Mac.java
@@ -26,7 +26,6 @@
import java.security.Provider;
import java.security.Security;
import java.security.spec.AlgorithmParameterSpec;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/javax/crypto/MacSpi.java b/luni/src/main/java/javax/crypto/MacSpi.java
index 4e78a45..f1cc400 100644
--- a/luni/src/main/java/javax/crypto/MacSpi.java
+++ b/luni/src/main/java/javax/crypto/MacSpi.java
@@ -17,11 +17,11 @@
package javax.crypto;
-import java.security.Key;
-import java.security.InvalidKeyException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.spec.AlgorithmParameterSpec;
import java.nio.ByteBuffer;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.spec.AlgorithmParameterSpec;
/**
* The <i>Service-Provider Interface</i> (<b>SPI</b>) definition for the {@code
@@ -143,4 +143,4 @@
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-}
\ No newline at end of file
+}
diff --git a/luni/src/main/java/javax/crypto/NullCipher.java b/luni/src/main/java/javax/crypto/NullCipher.java
index 3695617..97a04d7 100644
--- a/luni/src/main/java/javax/crypto/NullCipher.java
+++ b/luni/src/main/java/javax/crypto/NullCipher.java
@@ -25,7 +25,6 @@
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.SecureRandom;
-
import org.apache.harmony.crypto.internal.NullCipherSpi;
diff --git a/luni/src/main/java/javax/crypto/SealedObject.java b/luni/src/main/java/javax/crypto/SealedObject.java
index 1b55cfd..c6f8221 100644
--- a/luni/src/main/java/javax/crypto/SealedObject.java
+++ b/luni/src/main/java/javax/crypto/SealedObject.java
@@ -29,8 +29,6 @@
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
/**
* A {@code SealedObject} is a wrapper around a {@code serializable} object
diff --git a/luni/src/main/java/javax/crypto/SecretKeyFactory.java b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
index 2b81950..05dc1ba 100644
--- a/luni/src/main/java/javax/crypto/SecretKeyFactory.java
+++ b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
@@ -24,7 +24,6 @@
import java.security.Security;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
index 7881834..3bc9ab4 100644
--- a/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
@@ -17,9 +17,8 @@
package javax.crypto.spec;
-import java.security.spec.MGF1ParameterSpec;
import java.security.spec.AlgorithmParameterSpec;
-import javax.crypto.spec.PSource;
+import java.security.spec.MGF1ParameterSpec;
/**
* The algorithm parameter specification for the <i>OAEP Padding</i> algorithm.
diff --git a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
index fb495a6..69cb67f 100644
--- a/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
@@ -24,10 +24,7 @@
package javax.net.ssl;
-import org.apache.harmony.luni.util.Inet6Util;
-
import java.io.IOException;
-import java.io.InputStream;
import java.security.cert.Certificate;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
@@ -40,11 +37,7 @@
import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
+import org.apache.harmony.luni.util.Inet6Util;
/**
* A HostnameVerifier that works the same way as Curl and Firefox.
diff --git a/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java b/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
index 4ff53f5..29acb0c 100644
--- a/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
@@ -19,8 +19,8 @@
import java.security.Principal;
import java.security.cert.Certificate;
-import javax.security.cert.X509Certificate;
import java.util.EventObject;
+import javax.security.cert.X509Certificate;
/**
* The event object encapsulating the information about a completed SSL
diff --git a/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java b/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java
index 99a37a8..21b9b59 100644
--- a/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java
+++ b/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java
@@ -27,7 +27,6 @@
import java.security.Provider;
import java.security.Security;
import java.security.UnrecoverableKeyException;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
index d92aa52..195eb43 100644
--- a/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
+++ b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
@@ -17,10 +17,10 @@
package javax.net.ssl;
+import java.security.KeyStore;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.security.KeyStore;
/**
* The parameters for {@code KeyManager}s. The parameters are a list of
diff --git a/luni/src/main/java/javax/net/ssl/SSLContext.java b/luni/src/main/java/javax/net/ssl/SSLContext.java
index 7aae41f..5299771 100644
--- a/luni/src/main/java/javax/net/ssl/SSLContext.java
+++ b/luni/src/main/java/javax/net/ssl/SSLContext.java
@@ -23,7 +23,6 @@
import java.security.Provider;
import java.security.SecureRandom;
import java.security.Security;
-
import org.apache.harmony.security.fortress.Engine;
diff --git a/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java b/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java
index 6d9e4c9..896a486 100644
--- a/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java
+++ b/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java
@@ -26,7 +26,6 @@
import java.security.PrivilegedAction;
import java.security.Provider;
import java.security.Security;
-
import org.apache.harmony.security.fortress.Engine;
/**
diff --git a/luni/src/main/java/javax/security/cert/Certificate.java b/luni/src/main/java/javax/security/cert/Certificate.java
index 19ed268..b3e31f6 100644
--- a/luni/src/main/java/javax/security/cert/Certificate.java
+++ b/luni/src/main/java/javax/security/cert/Certificate.java
@@ -23,8 +23,6 @@
import java.security.PublicKey;
import java.security.SignatureException;
import java.util.Arrays;
-import javax.security.cert.CertificateEncodingException;
-import javax.security.cert.CertificateException;
/**
* Abstract class to represent identity certificates. It represents a way to
diff --git a/luni/src/main/java/javax/security/cert/X509Certificate.java b/luni/src/main/java/javax/security/cert/X509Certificate.java
index 4a4a896..fe5b9f7 100644
--- a/luni/src/main/java/javax/security/cert/X509Certificate.java
+++ b/luni/src/main/java/javax/security/cert/X509Certificate.java
@@ -31,11 +31,6 @@
import java.security.SignatureException;
import java.security.cert.CertificateFactory;
import java.util.Date;
-import javax.security.cert.Certificate;
-import javax.security.cert.CertificateEncodingException;
-import javax.security.cert.CertificateException;
-import javax.security.cert.CertificateExpiredException;
-import javax.security.cert.CertificateNotYetValidException;
/**
* Abstract base class for X.509 certificates.
diff --git a/luni/src/main/java/javax/sql/ConnectionEvent.java b/luni/src/main/java/javax/sql/ConnectionEvent.java
index e2fac02..4d738bd 100644
--- a/luni/src/main/java/javax/sql/ConnectionEvent.java
+++ b/luni/src/main/java/javax/sql/ConnectionEvent.java
@@ -17,9 +17,9 @@
package javax.sql;
-import java.util.EventObject;
-import java.sql.SQLException;
import java.io.Serializable;
+import java.sql.SQLException;
+import java.util.EventObject;
/**
* Sent when specific events happen on a {@link PooledConnection} object. These
diff --git a/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
index 176f261..8263e71 100644
--- a/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
+++ b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
@@ -18,7 +18,6 @@
package javax.sql;
import java.sql.SQLException;
-import java.io.PrintWriter;
/**
* An interface for the creation of {@code ConnectionPoolDataSource} objects.
diff --git a/luni/src/main/java/javax/sql/DataSource.java b/luni/src/main/java/javax/sql/DataSource.java
index 5d50032..80c2869 100644
--- a/luni/src/main/java/javax/sql/DataSource.java
+++ b/luni/src/main/java/javax/sql/DataSource.java
@@ -17,8 +17,8 @@
package javax.sql;
-import java.sql.SQLException;
import java.sql.Connection;
+import java.sql.SQLException;
import java.sql.Wrapper;
/**
diff --git a/luni/src/main/java/javax/sql/PooledConnection.java b/luni/src/main/java/javax/sql/PooledConnection.java
index efbe989..044c5ec 100644
--- a/luni/src/main/java/javax/sql/PooledConnection.java
+++ b/luni/src/main/java/javax/sql/PooledConnection.java
@@ -17,8 +17,8 @@
package javax.sql;
-import java.sql.SQLException;
import java.sql.Connection;
+import java.sql.SQLException;
/**
* An interface which provides facilities for handling connections to a database
diff --git a/luni/src/main/java/javax/sql/RowSet.java b/luni/src/main/java/javax/sql/RowSet.java
index 60323b6..8c74fe9 100644
--- a/luni/src/main/java/javax/sql/RowSet.java
+++ b/luni/src/main/java/javax/sql/RowSet.java
@@ -17,24 +17,24 @@
package javax.sql;
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
import java.net.URL;
-import java.sql.NClob;
-import java.sql.ResultSet;
-import java.sql.RowId;
-import java.sql.SQLException;
import java.sql.Array;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.Date;
+import java.sql.NClob;
import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.RowId;
+import java.sql.SQLException;
import java.sql.SQLXML;
import java.sql.Time;
import java.sql.Timestamp;
-import java.util.Map;
-import java.io.InputStream;
-import java.io.Reader;
import java.util.Calendar;
-import java.math.BigDecimal;
+import java.util.Map;
/**
* An interface which provides means to access data which
diff --git a/luni/src/main/java/javax/sql/RowSetEvent.java b/luni/src/main/java/javax/sql/RowSetEvent.java
index 40a64a6..2b1d774 100644
--- a/luni/src/main/java/javax/sql/RowSetEvent.java
+++ b/luni/src/main/java/javax/sql/RowSetEvent.java
@@ -17,8 +17,8 @@
package javax.sql;
-import java.util.EventObject;
import java.io.Serializable;
+import java.util.EventObject;
/**
* An event which is sent when specific events happen to a {@link RowSet}
diff --git a/luni/src/main/java/javax/sql/RowSetInternal.java b/luni/src/main/java/javax/sql/RowSetInternal.java
index 28807e5..c749bb9 100644
--- a/luni/src/main/java/javax/sql/RowSetInternal.java
+++ b/luni/src/main/java/javax/sql/RowSetInternal.java
@@ -17,9 +17,9 @@
package javax.sql;
-import java.sql.SQLException;
import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.SQLException;
/**
* An interface provided by a {@code RowSet} object to let either a {@code
diff --git a/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
index 8abc7d9..3d5c575 100644
--- a/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
@@ -19,8 +19,8 @@
package javax.xml.datatype;
-import java.math.BigInteger;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.GregorianCalendar;
/**
diff --git a/luni/src/main/java/javax/xml/datatype/Duration.java b/luni/src/main/java/javax/xml/datatype/Duration.java
index 662fdef..0099b00 100644
--- a/luni/src/main/java/javax/xml/datatype/Duration.java
+++ b/luni/src/main/java/javax/xml/datatype/Duration.java
@@ -24,7 +24,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-
import javax.xml.namespace.QName;
/**
diff --git a/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
index 1429827..6796104 100644
--- a/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
+++ b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
@@ -19,11 +19,11 @@
package javax.xml.datatype;
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.TimeZone;
import java.util.GregorianCalendar;
+import java.util.TimeZone;
+import javax.xml.namespace.QName;
/**
* <p>Representation for W3C XML Schema 1.0 date/time datatypes.
diff --git a/luni/src/main/java/javax/xml/namespace/QName.java b/luni/src/main/java/javax/xml/namespace/QName.java
index 0e92ac7..1f398d0 100644
--- a/luni/src/main/java/javax/xml/namespace/QName.java
+++ b/luni/src/main/java/javax/xml/namespace/QName.java
@@ -24,7 +24,6 @@
import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import javax.xml.XMLConstants;
/**
diff --git a/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
index 1e35963..96c191f 100644
--- a/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
@@ -22,12 +22,9 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-
import javax.xml.validation.Schema;
-
-import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
-
+import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
diff --git a/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
index 252958c..a1982a1 100644
--- a/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
@@ -19,9 +19,8 @@
package javax.xml.parsers;
-import org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl;
-
import javax.xml.validation.Schema;
+import org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl;
/**
* Defines a factory API that enables applications to obtain a
diff --git a/luni/src/main/java/javax/xml/parsers/SAXParser.java b/luni/src/main/java/javax/xml/parsers/SAXParser.java
index 84b2efb..d94301f 100644
--- a/luni/src/main/java/javax/xml/parsers/SAXParser.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParser.java
@@ -22,9 +22,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-
import javax.xml.validation.Schema;
-
import org.xml.sax.HandlerBase;
import org.xml.sax.InputSource;
import org.xml.sax.Parser;
diff --git a/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
index 36ad2bc..eb44033 100644
--- a/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
@@ -20,7 +20,6 @@
package javax.xml.parsers;
import javax.xml.validation.Schema;
-
import org.apache.harmony.xml.parsers.SAXParserFactoryImpl;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
diff --git a/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java b/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java
index c4389ab..3aacb57 100644
--- a/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java
@@ -20,7 +20,6 @@
package javax.xml.transform.dom;
import javax.xml.transform.SourceLocator;
-
import org.w3c.dom.Node;
diff --git a/luni/src/main/java/javax/xml/transform/dom/DOMSource.java b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
index e7a6116..52f69ae 100644
--- a/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
@@ -20,7 +20,6 @@
package javax.xml.transform.dom;
import javax.xml.transform.Source;
-
import org.w3c.dom.Node;
/**
diff --git a/luni/src/main/java/javax/xml/transform/sax/SAXResult.java b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
index efda7f6..dbb30bd 100644
--- a/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
@@ -20,7 +20,6 @@
package javax.xml.transform.sax;
import javax.xml.transform.Result;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
diff --git a/luni/src/main/java/javax/xml/transform/sax/SAXSource.java b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
index 5bd1391..c1c1995 100644
--- a/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
@@ -21,7 +21,6 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
diff --git a/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java b/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
index 662ea20..ff62d3a 100644
--- a/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
@@ -19,8 +19,10 @@
package javax.xml.transform.sax;
-import javax.xml.transform.*;
-
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
import org.xml.sax.XMLFilter;
/**
diff --git a/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java b/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
index 4a31c2f..f09ef6f 100644
--- a/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
+++ b/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
@@ -19,8 +19,7 @@
package javax.xml.transform.sax;
-import javax.xml.transform.*;
-
+import javax.xml.transform.Templates;
import org.xml.sax.ContentHandler;
/**
diff --git a/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
index dd01bf7..7843745 100644
--- a/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
+++ b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
@@ -21,7 +21,6 @@
import javax.xml.transform.Result;
import javax.xml.transform.Transformer;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.ext.LexicalHandler;
diff --git a/luni/src/main/java/javax/xml/transform/stream/StreamResult.java b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
index f32765a..58568aa 100644
--- a/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.OutputStream;
import java.io.Writer;
-
import javax.xml.transform.Result;
/**
diff --git a/luni/src/main/java/javax/xml/transform/stream/StreamSource.java b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
index 7c2157f..0d96cc0 100644
--- a/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.InputStream;
import java.io.Reader;
-
import javax.xml.transform.Source;
/**
diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactory.java b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
index 212c762..43db936 100644
--- a/luni/src/main/java/javax/xml/validation/SchemaFactory.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
@@ -21,10 +21,8 @@
import java.io.File;
import java.net.URL;
-
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-
import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
index 7b8cc03..b475d1d 100644
--- a/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
@@ -29,7 +29,6 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Properties;
-
import javax.xml.XMLConstants;
/**
diff --git a/luni/src/main/java/javax/xml/validation/Validator.java b/luni/src/main/java/javax/xml/validation/Validator.java
index e0eaf90..b4ee1ca 100644
--- a/luni/src/main/java/javax/xml/validation/Validator.java
+++ b/luni/src/main/java/javax/xml/validation/Validator.java
@@ -19,10 +19,8 @@
package javax.xml.validation;
import java.io.IOException;
-
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-
import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
diff --git a/luni/src/main/java/javax/xml/xpath/XPath.java b/luni/src/main/java/javax/xml/xpath/XPath.java
index 1d0e203..c027b58 100644
--- a/luni/src/main/java/javax/xml/xpath/XPath.java
+++ b/luni/src/main/java/javax/xml/xpath/XPath.java
@@ -18,9 +18,9 @@
package javax.xml.xpath;
-import org.xml.sax.InputSource;
-import javax.xml.namespace.QName;
import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import org.xml.sax.InputSource;
/**
* <p><code>XPath</code> provides access to the XPath evaluation environment and expressions.</p>
diff --git a/luni/src/main/java/javax/xml/xpath/XPathExpression.java b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
index 51946d0..0182d91 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathExpression.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
@@ -18,8 +18,8 @@
package javax.xml.xpath;
-import org.xml.sax.InputSource;
import javax.xml.namespace.QName;
+import org.xml.sax.InputSource;
/**
* <p><code>XPathExpression</code> provides access to compiled XPath expressions.</p>
diff --git a/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
index cd66401..c85bfd1 100644
--- a/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
@@ -29,7 +29,6 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Properties;
-
import javax.xml.validation.SchemaFactory;
/**
diff --git a/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
index b3d55cf..270f63b 100644
--- a/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
@@ -30,7 +30,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-
import javax.crypto.BadPaddingException;
import javax.crypto.CipherSpi;
import javax.crypto.IllegalBlockSizeException;
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
index ba979da..45a6c75 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
@@ -22,16 +22,15 @@
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.annotation.IncompleteAnnotationException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
import static org.apache.harmony.lang.annotation.AnnotationMember.ARRAY;
import static org.apache.harmony.lang.annotation.AnnotationMember.ERROR;
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
index 2dda631..10386d2 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
@@ -28,7 +28,6 @@
import java.io.PrintStream;
import java.net.URL;
import java.net.URLConnection;
-
import org.apache.harmony.luni.util.Util;
/**
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
index 6f4263f..50ca102 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
@@ -19,12 +19,12 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.SortedMap;
-import java.util.TreeMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.SortedMap;
+import java.util.TreeMap;
import java.util.logging.Logger;
/**
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 6835f59..c4ba36a 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,7 +16,6 @@
package org.apache.harmony.luni.internal.util;
-import java.io.IOException;
import java.nio.charset.Charsets;
import java.util.Arrays;
import java.util.Date;
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfoDB.java b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfoDB.java
index beb9135..c44044c 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfoDB.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/util/ZoneInfoDB.java
@@ -16,8 +16,6 @@
package org.apache.harmony.luni.internal.util;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
@@ -26,10 +24,8 @@
import java.nio.charset.Charsets;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import java.util.logging.Logger;
import libcore.io.IoUtils;
/**
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
index d80b260..db6dbb4 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
+++ b/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
@@ -16,9 +16,9 @@
package org.apache.harmony.luni.lang.reflect;
-import java.lang.reflect.WildcardType;
-import java.lang.reflect.Type;
import java.lang.reflect.MalformedParameterizedTypeException;
+import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
import java.util.Arrays;
public final class ImplForWildcard implements WildcardType {
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 f0b2004..742bfc0 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
@@ -19,7 +19,6 @@
import java.io.FileDescriptor;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.net.DatagramPacket;
import java.net.DatagramSocketImpl;
import java.net.InetAddress;
@@ -27,13 +26,9 @@
import java.net.NetworkInterface;
import java.net.SocketAddress;
import java.net.SocketException;
-import java.net.SocketOptions;
-import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
-import java.security.AccessController;
import org.apache.harmony.luni.platform.INetworkSystem;
import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.PriviAction;
/**
* The default, concrete instance of datagram sockets. This class does not
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/PlainServerSocketImpl.java b/luni/src/main/java/org/apache/harmony/luni/net/PlainServerSocketImpl.java
index 163c8e5..1581f1f 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/PlainServerSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/PlainServerSocketImpl.java
@@ -20,9 +20,6 @@
import java.io.FileDescriptor;
import java.net.SocketException;
-import org.apache.harmony.luni.net.NetUtil;
-import org.apache.harmony.luni.net.PlainSocketImpl;
-
/**
* This class overrides create to call natives that set the options required
* for server sockets.
diff --git a/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java b/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
index 1ee25c9a..77726d2 100644
--- a/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
@@ -20,7 +20,6 @@
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.lang.reflect.Field;
import java.net.ConnectException;
@@ -30,7 +29,6 @@
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.SocketImpl;
-import java.net.SocketOptions;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.security.AccessController;
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java b/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
index cda54b2..07febbc 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
@@ -18,9 +18,9 @@
package org.apache.harmony.luni.platform;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.Reference;
import java.lang.ref.PhantomReference;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
import java.util.HashMap;
import java.util.Map;
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
index e7b3e59..6af1207 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
@@ -27,8 +27,6 @@
import java.net.InetAddress;
import java.net.SocketException;
import java.net.SocketImpl;
-import java.net.UnknownHostException;
-import java.nio.channels.Channel;
/*
* The interface for network methods.
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java b/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
index 215860a..5f2ad20 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
@@ -23,8 +23,6 @@
import java.net.InetAddress;
import java.net.SocketException;
import java.net.SocketImpl;
-import java.net.UnknownHostException;
-import java.nio.channels.Channel;
/**
* This wraps native code that implements the INetworkSystem interface.
diff --git a/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java b/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
index 3098348..9915b06 100644
--- a/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
+++ b/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
@@ -16,8 +16,8 @@
package org.apache.harmony.luni.platform;
-import dalvik.system.VMStack;
import dalvik.system.BlockGuard;
+import dalvik.system.VMStack;
/**
* The Platform class gives access to the low-level underlying capabilities of
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 f688839..2657867 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
@@ -21,7 +21,6 @@
package org.apache.harmony.luni.util;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
/**
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java b/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
index 787eef3..0c5bb6a 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
@@ -16,9 +16,6 @@
package org.apache.harmony.luni.util;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
/**
* Utility functions for IPV6 operations.
*/
diff --git a/luni/src/main/java/org/apache/harmony/luni/util/ThreadLocalCache.java b/luni/src/main/java/org/apache/harmony/luni/util/ThreadLocalCache.java
index 7f3b61e..e1bc217 100644
--- a/luni/src/main/java/org/apache/harmony/luni/util/ThreadLocalCache.java
+++ b/luni/src/main/java/org/apache/harmony/luni/util/ThreadLocalCache.java
@@ -19,7 +19,6 @@
import java.lang.ref.SoftReference;
import java.nio.CharBuffer;
-import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.Charsets;
diff --git a/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java b/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
index 83a70ad..d51e8f2 100644
--- a/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
+++ b/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
@@ -23,11 +23,10 @@
package org.apache.harmony.nio;
import java.nio.channels.FileChannel;
-
+import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.nio.internal.ReadOnlyFileChannel;
import org.apache.harmony.nio.internal.ReadWriteFileChannel;
import org.apache.harmony.nio.internal.WriteOnlyFileChannel;
-import org.apache.harmony.luni.platform.IFileSystem;
/**
* A simple factory to provide a generic way to create FileChannel
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
index 855b2c2..868fad8 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
@@ -39,7 +39,6 @@
import java.nio.channels.IllegalBlockingModeException;
import java.nio.channels.NotYetConnectedException;
import java.nio.channels.spi.SelectorProvider;
-
import org.apache.harmony.luni.net.PlainDatagramSocketImpl;
import org.apache.harmony.luni.platform.FileDescriptorHandler;
import org.apache.harmony.luni.platform.INetworkSystem;
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
index 16f6994..5e1cbd2 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
@@ -36,7 +36,6 @@
import java.nio.channels.NonWritableChannelException;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.WritableByteChannel;
-
import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.luni.platform.Platform;
import org.apache.harmony.luni.platform.PlatformAddress;
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java b/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
index 4abb96f..c64094b 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
@@ -21,7 +21,6 @@
import java.nio.MappedByteBuffer;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import org.apache.harmony.luni.platform.PlatformAddress;
class MappedByteBufferFactory {
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
index 0b5f5de..37c342c 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
@@ -20,7 +20,6 @@
import java.io.FileDescriptor;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
import java.nio.channels.Pipe;
import java.nio.channels.spi.SelectorProvider;
import libcore.io.IoUtils;
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
index f107150..a5555c2 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
@@ -31,7 +31,6 @@
import java.nio.channels.FileLock;
import java.nio.channels.NonWritableChannelException;
import java.nio.channels.ReadableByteChannel;
-
import org.apache.harmony.luni.platform.IMemorySystem;
public final class ReadOnlyFileChannel extends FileChannelImpl {
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
index 5f43251..e9ba45d 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.nio.MappedByteBuffer;
-
import org.apache.harmony.luni.platform.IMemorySystem;
public final class ReadWriteFileChannel extends FileChannelImpl {
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
index f5c9e37..60cc6ad 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
@@ -21,10 +21,10 @@
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.IllegalSelectorException;
import java.nio.channels.Pipe;
+import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import static java.nio.channels.SelectionKey.*;
import java.nio.channels.Selector;
-import java.nio.channels.SelectableChannel;
import java.nio.channels.SocketChannel;
import java.nio.channels.spi.AbstractSelectableChannel;
import java.nio.channels.spi.AbstractSelectionKey;
diff --git a/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
index 424fc73..b67fa2b 100644
--- a/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
+++ b/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
@@ -31,8 +31,6 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
-import java.net.SocketImpl;
-import java.net.SocketOptions;
import java.net.SocketUtils;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
diff --git a/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
index 4c00f01..8470f58 100644
--- a/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
+++ b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
@@ -29,7 +29,6 @@
import java.security.Principal;
import java.util.Collection;
import java.util.Collections;
-
import org.apache.harmony.security.fortress.PolicyUtils;
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
index 750e82a..44c68b2 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.asn1;
import java.io.IOException;
-
import org.apache.harmony.security.x501.AttributeType;
diff --git a/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
index 85cc2c5..c652543 100644
--- a/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.asn1;
import java.util.Arrays;
-
import org.apache.harmony.security.x501.AttributeType;
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
index e4eb0e9..7214e3f 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
@@ -37,7 +37,6 @@
import java.util.Properties;
import java.util.Set;
import java.util.WeakHashMap;
-
import org.apache.harmony.security.PolicyEntry;
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
index 2a82544..9857680 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
@@ -27,9 +27,6 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
import java.security.AccessController;
import java.security.CodeSource;
import java.security.KeyStore;
@@ -37,6 +34,9 @@
import java.security.Permission;
import java.security.Principal;
import java.security.UnresolvedPermission;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -45,14 +45,13 @@
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
-
import org.apache.harmony.security.DefaultPolicyScanner;
-import org.apache.harmony.security.PolicyEntry;
-import org.apache.harmony.security.UnresolvedPrincipal;
import org.apache.harmony.security.DefaultPolicyScanner.GrantEntry;
import org.apache.harmony.security.DefaultPolicyScanner.KeystoreEntry;
import org.apache.harmony.security.DefaultPolicyScanner.PermissionEntry;
import org.apache.harmony.security.DefaultPolicyScanner.PrincipalEntry;
+import org.apache.harmony.security.PolicyEntry;
+import org.apache.harmony.security.UnresolvedPrincipal;
/**
* This is a basic loader of policy files. It delegates lexical analysis to
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
index 843b71d..c5bb376 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
@@ -24,7 +24,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.Provider;
-
import org.apache.harmony.security.Util;
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
index 8307336..43bc44a 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
@@ -40,7 +40,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
-
import org.apache.harmony.security.Util;
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
index 055a154..7c2cff2 100644
--- a/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
@@ -28,11 +28,8 @@
import java.security.Security;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-
import org.apache.harmony.security.Util;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
index bf7e953..d90b446 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
@@ -18,9 +18,7 @@
package org.apache.harmony.security.pkcs10;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
index 2c529db..5483aec 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
@@ -22,7 +22,6 @@
package org.apache.harmony.security.pkcs7;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SetOf;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.x501.AttributeTypeAndValue;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
index 35a4809..fbe06a6 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.Arrays;
-
import org.apache.harmony.security.asn1.ASN1Any;
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1OctetString;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
index 653c993..69156fe 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
@@ -22,8 +22,6 @@
package org.apache.harmony.security.pkcs7;
import java.util.List;
-
-import org.apache.harmony.security.asn1.ASN1Any;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
index 944a93b..aa40fdd 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
@@ -24,9 +24,7 @@
import java.io.IOException;
import java.math.BigInteger;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1OctetString;
diff --git a/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
index 57afbc0..be7e3b3 100644
--- a/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
@@ -18,6 +18,7 @@
package org.apache.harmony.security.pkcs8;
+import java.util.List;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1OctetString;
@@ -25,13 +26,9 @@
import org.apache.harmony.security.asn1.ASN1SetOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
-
import org.apache.harmony.security.x501.AttributeTypeAndValue;
-
import org.apache.harmony.security.x509.AlgorithmIdentifier;
-import java.util.List;
-
/**
* The class implements the ASN.1 DER encoding and decoding of the PKCS#8
* PrivateKeyInfo having the following ASN.1 notation:
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
index 056439a..38500e5 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
@@ -27,9 +27,7 @@
import java.security.cert.X509CRLEntry;
import java.util.Date;
import java.util.Set;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.x509.Extension;
import org.apache.harmony.security.x509.Extensions;
import org.apache.harmony.security.x509.TBSCertList;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
index f74ce8e..134d8f9 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
@@ -42,9 +42,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.utils.AlgNameMapper;
import org.apache.harmony.security.x509.CertificateList;
import org.apache.harmony.security.x509.Extension;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
index cf2f790..20e5646 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
@@ -36,7 +36,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.luni.util.Base64;
import org.apache.harmony.security.asn1.ASN1Constants;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
index d383e89..8d5f247 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
@@ -34,7 +34,6 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1Any;
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1Implicit;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
index d9b3558..8e3774b 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
@@ -17,10 +17,8 @@
package org.apache.harmony.security.provider.crypto;
-import java.security.Provider;
import java.security.AccessController;
-
-import org.apache.harmony.security.provider.crypto.RandomBitsSupplier;
+import java.security.Provider;
/**
* Implementation of Provider for SecureRandom, MessageDigest and Signature
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
index 18eb67c..bd4fe03 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
@@ -35,7 +35,6 @@
import java.security.spec.DSAPrivateKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
-
import org.apache.harmony.security.PrivateKeyImpl;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.pkcs8.PrivateKeyInfo;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
index 1334bc6..a434560 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
@@ -30,25 +30,19 @@
import java.io.IOException;
import java.io.NotActiveException;
-
import java.math.BigInteger;
-
-import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.DSAParams;
-
+import java.security.interfaces.DSAPublicKey;
+import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
-import java.security.spec.DSAParameterSpec;
import java.security.spec.X509EncodedKeySpec;
-
+import org.apache.harmony.security.PublicKeyImpl;
+import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.utils.AlgNameMapper;
import org.apache.harmony.security.x509.AlgorithmIdentifier;
import org.apache.harmony.security.x509.SubjectPublicKeyInfo;
-import org.apache.harmony.security.asn1.ASN1Integer;
-
-import org.apache.harmony.security.PublicKeyImpl;
-
/**
* The class provides DSAPublicKey functionality by extending a class implementing PublicKey
* and implementing methods defined in both interfaces, DSAKey and DSAPublicKey
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
index 310c35f..993914a 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
@@ -21,12 +21,10 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.FileNotFoundException;
-
-import java.security.ProviderException;
+import java.io.IOException;
import java.security.AccessController;
-import java.security.PrivilegedActionException;
+import java.security.ProviderException;
/**
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 379d1de..c6f9b7b 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
@@ -18,16 +18,12 @@
package org.apache.harmony.security.provider.crypto;
-import java.security.InvalidParameterException;
-import java.security.SecureRandomSpi;
-
-import org.apache.harmony.security.provider.crypto.RandomBitsSupplier;
-import org.apache.harmony.security.provider.crypto.SHA1Impl;
-
-import java.io.Serializable;
+import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.Serializable;
+import java.security.InvalidParameterException;
+import java.security.SecureRandomSpi;
/**
* This class extends the SecureRandomSpi class implementing all its abstract methods. <BR>
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
index cf85c4a..a221d72 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
@@ -19,14 +19,10 @@
package org.apache.harmony.security.provider.crypto;
-import java.security.MessageDigestSpi;
import java.security.DigestException;
-
+import java.security.MessageDigestSpi;
import java.util.Arrays;
-import org.apache.harmony.security.provider.crypto.SHA1_Data;
-import org.apache.harmony.security.provider.crypto.SHA1Impl;
-
/**
* This class extends the MessageDigestSpi class implementing all its abstract methods;
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
index a6a4080..d289fd9 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
@@ -18,24 +18,20 @@
package org.apache.harmony.security.provider.crypto;
import java.math.BigInteger;
-
+import java.security.InvalidKeyException;
+import java.security.InvalidParameterException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.Signature;
-
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
-
-import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAKey;
+import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.DSAPublicKey;
-import java.security.MessageDigest;
-
public class SHA1withDSA_SignatureImpl extends Signature {
private MessageDigest msgDigest;
diff --git a/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
index 44a04cd..8305c70 100644
--- a/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
@@ -26,9 +26,8 @@
import java.security.Security;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
-
+import java.util.Set;
import org.apache.harmony.security.Util;
import org.apache.harmony.security.asn1.ObjectIdentifier;
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
index 756bf15..d386c84 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
@@ -27,9 +27,8 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
-
import javax.security.auth.x500.X500Principal;
-
+import org.apache.harmony.security.Util;
import org.apache.harmony.security.asn1.ASN1Constants;
import org.apache.harmony.security.asn1.ASN1Oid;
import org.apache.harmony.security.asn1.ASN1Sequence;
@@ -38,7 +37,6 @@
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.BerOutputStream;
import org.apache.harmony.security.utils.ObjectIdentifier;
-import org.apache.harmony.security.Util;
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
index dad1f03..f6a011c 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
@@ -24,7 +24,6 @@
import java.io.Serializable;
import java.util.Comparator;
-
import org.apache.harmony.security.utils.ObjectIdentifier;
/**
@@ -101,4 +100,4 @@
}
return 0;
}
-}
\ No newline at end of file
+}
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
index 6710a92..94ffa45 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x501;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ASN1StringType;
import org.apache.harmony.security.asn1.DerInputStream;
import org.apache.harmony.security.x509.Utils;
@@ -269,4 +268,4 @@
return buf.toString();
}
-}
\ No newline at end of file
+}
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
index 3e21b1b..9c1eba6 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
@@ -25,7 +25,6 @@
import org.apache.harmony.security.asn1.ASN1Choice;
import org.apache.harmony.security.asn1.ASN1StringType;
import org.apache.harmony.security.asn1.ASN1Type;
-import org.apache.harmony.security.asn1.BerInputStream;
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x501/Name.java b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
index 16b219c..a29c3df 100644
--- a/luni/src/main/java/org/apache/harmony/security/x501/Name.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
@@ -29,9 +29,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1SetOf;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
index 584457e..eeda86b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x509;
import java.util.Arrays;
-
import org.apache.harmony.security.asn1.ASN1Any;
import org.apache.harmony.security.asn1.ASN1Oid;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
index 16c6702..ad07476 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.math.BigInteger;
-
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1OctetString;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
index 53a809f..214b3a8 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
@@ -21,8 +21,8 @@
import java.math.BigInteger;
import org.apache.harmony.security.asn1.ASN1Boolean;
import org.apache.harmony.security.asn1.ASN1Integer;
-import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.ASN1Sequence;
+import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
/**
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
index 1b987ea..781de29 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
@@ -23,10 +23,9 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
index b6d1abf..72a20ec 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.math.BigInteger;
-
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Type;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
index 4470a75..4627a9b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.ASN1Sequence;
+import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.x501.Name;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
index 1e77d64..86ac9a1 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
@@ -27,7 +27,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
index 467da8e..71cf52c 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.harmony.security.x501.AttributeTypeAndValue;
import org.apache.harmony.security.x501.AttributeValue;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
index d24b99e..f631582 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
index 279ff4f..79bee58 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
@@ -24,7 +24,6 @@
import java.io.IOException;
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Choice;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Type;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
index 8950203..fd9223a 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
@@ -20,9 +20,9 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.harmony.security.asn1.ASN1Type;
-import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Oid;
+import org.apache.harmony.security.asn1.ASN1SequenceOf;
+import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.ObjectIdentifier;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Extension.java b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
index cad8f7b..b854c60 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.util.Arrays;
-
import org.apache.harmony.security.asn1.ASN1Boolean;
import org.apache.harmony.security.asn1.ASN1OctetString;
import org.apache.harmony.security.asn1.ASN1Oid;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
index 68fe6e6..2bda81c 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
@@ -31,9 +31,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
index 80ff9de..2a6253b 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
@@ -30,9 +30,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Choice;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1OctetString;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
index 823b7bd..adec066 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
@@ -26,7 +26,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
index 1dc1721..426454a 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
index ba19599..5f26b1e 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
@@ -22,7 +22,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
index 3019078..a0dce86 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Date;
-
import org.apache.harmony.security.asn1.ASN1GeneralizedTime;
import org.apache.harmony.security.asn1.ASN1Type;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
index 6ae7204..a92a622 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
@@ -18,13 +18,12 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-
-import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.ASN1Boolean;
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Sequence;
import org.apache.harmony.security.asn1.ASN1Type;
+import org.apache.harmony.security.asn1.BerInputStream;
/**
* CRL's Issuing Distribution Point Extension (OID = 2.5.29.28).
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
index 349d3c6..2207a1a 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
@@ -18,8 +18,8 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.ASN1BitString;
+import org.apache.harmony.security.asn1.ASN1Type;
/**
* Key Usage Extension (OID = 2.5.29.15).
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
index b7c8b8a..e1a5588 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1OctetString;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
index 6687c89..fffcdbd 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.math.BigInteger;
-
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
index 65767e0..b0e14d5 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x509;
import java.util.Date;
-
import org.apache.harmony.security.asn1.ASN1GeneralizedTime;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
index 0118206..2c8bae9 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
@@ -18,7 +18,6 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ASN1Enumerated;
import org.apache.harmony.security.asn1.ASN1Type;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
index 66e1aab..0be3637 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ASN1BitString;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.BerOutputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
index 04ae096..185a6ca 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
@@ -18,7 +18,6 @@
package org.apache.harmony.security.x509;
import java.io.IOException;
-
import org.apache.harmony.security.asn1.ASN1OctetString;
import org.apache.harmony.security.utils.Array;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
index 7a31b93..1117fc2 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
@@ -27,7 +27,6 @@
import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
-
import org.apache.harmony.security.asn1.ASN1BitString;
import org.apache.harmony.security.asn1.ASN1Sequence;
import org.apache.harmony.security.asn1.ASN1Type;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
index 17cf841..4944cba 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
@@ -28,9 +28,7 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
index 71e993b..5711630 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
@@ -24,7 +24,6 @@
import java.math.BigInteger;
import javax.security.auth.x500.X500Principal;
-
import org.apache.harmony.security.asn1.ASN1BitString;
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1Implicit;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/Validity.java b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
index c031817..5f5cbd2 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
@@ -23,7 +23,6 @@
package org.apache.harmony.security.x509;
import java.util.Date;
-
import org.apache.harmony.security.asn1.ASN1Sequence;
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
index 2406d12..6c70143 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
@@ -21,7 +21,6 @@
import java.math.BigInteger;
import java.util.List;
-
import org.apache.harmony.security.asn1.ASN1BitString;
import org.apache.harmony.security.asn1.ASN1Integer;
import org.apache.harmony.security.asn1.ASN1Sequence;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
index 2e12e9d..5168145 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
@@ -21,7 +21,6 @@
import java.math.BigInteger;
import java.util.Date;
-
import org.apache.harmony.security.asn1.ASN1Boolean;
import org.apache.harmony.security.asn1.ASN1Explicit;
import org.apache.harmony.security.asn1.ASN1GeneralizedTime;
diff --git a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
index 24e3c22..9d78862 100644
--- a/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
@@ -20,7 +20,6 @@
package org.apache.harmony.security.x509.tsp;
import java.math.BigInteger;
-
import org.apache.harmony.security.asn1.ASN1Boolean;
import org.apache.harmony.security.asn1.ASN1Implicit;
import org.apache.harmony.security.asn1.ASN1Integer;
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
index 3e099e6..b783103 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
@@ -16,6 +16,14 @@
package org.apache.harmony.xml;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
@@ -26,15 +34,6 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.ext.LexicalHandler;
-import java.io.Reader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URLConnection;
-import java.net.URL;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
/**
* Adapts SAX API to the Expat native XML parser. Not intended for reuse
* across documents.
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
index 8696511..13adc1a 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
@@ -16,16 +16,15 @@
package org.apache.harmony.xml;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
/**
* Fast, partial XmlPullParser implementation based upon Expat. Does not
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java
index 3bf5d07..db2b428 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java
@@ -16,6 +16,9 @@
package org.apache.harmony.xml;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.EntityResolver;
@@ -27,11 +30,6 @@
import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.InputStream;
-import java.util.logging.Logger;
-
/**
* SAX wrapper around Expat. Interns strings. Does not support validation.
* Does not support {@link DTDHandler}.
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
index 1a8acbc..89c2321 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
@@ -16,6 +16,8 @@
package org.apache.harmony.xml.dom;
+import java.util.Map;
+import java.util.TreeMap;
import org.apache.xml.serializer.dom3.DOMErrorImpl;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMError;
@@ -25,9 +27,6 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import java.util.Map;
-import java.util.TreeMap;
-
/**
* A minimal implementation of DOMConfiguration. This implementation uses inner
* parameter instances to centralize each parameter's behaviour.
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
index 4c2aea6..d1cf342 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
@@ -16,6 +16,10 @@
package org.apache.harmony.xml.dom;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
import org.w3c.dom.Attr;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Comment;
@@ -32,11 +36,6 @@
import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
/**
* Provides a straightforward implementation of the corresponding W3C DOM
* interface. The class is used internally only, thus only notable members that
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 6e11afa..c019b24 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
@@ -16,6 +16,8 @@
package org.apache.harmony.xml.dom;
+import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -24,9 +26,6 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.TypeInfo;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Provides a straightforward implementation of the corresponding W3C DOM
* interface. The class is used internally only, thus only notable members that
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 8d2276b..6fcbfe0 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
@@ -16,13 +16,12 @@
package org.apache.harmony.xml.dom;
+import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Provides a straightforward implementation of the corresponding W3C DOM
* interface. The class is used internally only, thus only notable members that
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
index c561d38..d567b47 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
@@ -16,14 +16,13 @@
package org.apache.harmony.xml.dom;
+import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Provides a straightforward implementation of the corresponding W3C DOM
* interface. The class is used internally only, thus only notable members that
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
index 230dd2a..31ead86 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
@@ -16,6 +16,10 @@
package org.apache.harmony.xml.dom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.xml.transform.TransformerException;
import org.apache.xml.serializer.utils.SystemIDResolver;
import org.apache.xml.utils.URI;
import org.w3c.dom.Attr;
@@ -30,11 +34,6 @@
import org.w3c.dom.TypeInfo;
import org.w3c.dom.UserDataHandler;
-import javax.xml.transform.TransformerException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
/**
* A straightforward implementation of the corresponding W3C DOM node.
*
diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
index caa56af..c281c81 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
@@ -16,11 +16,10 @@
package org.apache.harmony.xml.dom;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import java.util.ArrayList;
import java.util.List;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Provides a straightforward implementation of the corresponding W3C DOM
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index 267099f..224e59e 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
@@ -20,10 +20,9 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.StringTokenizer;
-
import javax.xml.parsers.DocumentBuilder;
-
import org.apache.harmony.xml.dom.CDATASectionImpl;
+import org.apache.harmony.xml.dom.DOMImplementationImpl;
import org.apache.harmony.xml.dom.DocumentImpl;
import org.apache.harmony.xml.dom.DocumentTypeImpl;
import org.apache.harmony.xml.dom.TextImpl;
@@ -44,8 +43,6 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import org.apache.harmony.xml.dom.DOMImplementationImpl;
-
/**
* Provides a straightforward DocumentBuilder implementation based on
* XMLPull/KXML. The class is used internally only, thus only notable members
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
index 3317f39..08657b9 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
@@ -18,11 +18,9 @@
import java.util.HashMap;
import java.util.Map;
-
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-
import org.xml.sax.SAXNotRecognizedException;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
index 55de4b3..1ec662b 100644
--- a/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
@@ -18,12 +18,9 @@
import java.util.Collections;
import java.util.HashMap;
-import org.apache.harmony.xml.ExpatReader;
-
import java.util.Map;
-
import javax.xml.parsers.SAXParser;
-
+import org.apache.harmony.xml.ExpatReader;
import org.xml.sax.Parser;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
index a12d00a..2097bb0 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
@@ -17,10 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.SSLRecordProtocol;
-import org.apache.harmony.xnet.provider.jsse.Logger;
-import org.apache.harmony.xnet.provider.jsse.ContentType;
-
/**
* This class encapsulates the functionality of Alert Protocol.
* Constant values are taken according to the TLS v1 specification
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
index 784a1ec..dbd9519 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
@@ -17,11 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-import org.apache.harmony.xnet.provider.jsse.Handshake;
-import org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream;
-import org.apache.harmony.xnet.provider.jsse.AlertProtocol;
-
import java.io.IOException;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
index 732221d..748e7df 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
@@ -21,10 +21,6 @@
import java.security.cert.X509Certificate;
import java.util.Vector;
import javax.security.auth.x500.X500Principal;
-import org.apache.harmony.xnet.provider.jsse.AlertProtocol;
-import org.apache.harmony.xnet.provider.jsse.Handshake;
-import org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream;
-import org.apache.harmony.xnet.provider.jsse.Message;
/**
*
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
index 0547838..aa4402e 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
@@ -17,11 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-import org.apache.harmony.xnet.provider.jsse.Handshake;
-import org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream;
-import org.apache.harmony.xnet.provider.jsse.AlertProtocol;
-
import java.io.IOException;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
index 0dc8307..f712d11 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
@@ -19,7 +19,6 @@
import java.security.GeneralSecurityException;
import java.util.Hashtable;
-
import javax.crypto.Cipher;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
index f75dccd..11300f7 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
@@ -36,7 +36,6 @@
import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import javax.net.ssl.SSLSession;
import javax.net.ssl.X509ExtendedKeyManager;
import javax.net.ssl.X509KeyManager;
import javax.security.auth.x500.X500Principal;
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 f016cc9..4103cf4 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
@@ -17,10 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-import org.apache.harmony.xnet.provider.jsse.Handshake;
-import org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream;
-
import java.io.IOException;
import java.math.BigInteger;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
index 9706128..069d5db 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
@@ -18,7 +18,6 @@
package org.apache.harmony.xnet.provider.jsse;
import javax.crypto.Cipher;
-import org.apache.harmony.xnet.provider.jsse.Logger;
/**
* This abstract class is a base for Record Protocol operating environmet
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
index a453975..4e05192 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
@@ -25,10 +25,6 @@
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLProtocolException;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.ConnectionState;
-import org.apache.harmony.xnet.provider.jsse.PRF;
-import org.apache.harmony.xnet.provider.jsse.SSLSessionImpl;
/**
* This class encapsulates the operating environment of the TLS v1
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
index fc9aadc..9859be7 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.HandshakeProtocol;
-
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedActionException;
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 1676f5f..e0ca33c 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
@@ -25,7 +25,6 @@
import java.security.SignatureException;
import java.security.cert.Certificate;
import java.util.Arrays;
-
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
index cd7345f..31ec396 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
@@ -16,21 +16,21 @@
package org.apache.harmony.xnet.provider.jsse;
-import javax.net.ssl.SSLSession;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Iterator;
-import java.util.Arrays;
-import java.util.logging.Level;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.logging.Level;
+import javax.net.ssl.SSLSession;
/**
* File-based cache implementation. Only one process should access the
@@ -371,4 +371,4 @@
return result < 0 ? -1 : 1;
}
}
-}
\ No newline at end of file
+}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
index 9e5e021..9cc988c 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-
import java.io.IOException;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
index 12d9b41..720e7a6 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
@@ -17,9 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.SSLInputStream;
-
import java.io.IOException;
import java.io.PrintStream;
import java.security.MessageDigest;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
index f6ceca8..69c146c 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
@@ -17,10 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-import org.apache.harmony.xnet.provider.jsse.Handshake;
-import org.apache.harmony.xnet.provider.jsse.HandshakeIODataStream;
-
import java.io.IOException;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
index 1cc80ba..30556fe 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
@@ -16,24 +16,22 @@
package org.apache.harmony.xnet.provider.jsse;
-import javax.security.auth.x500.X500Principal;
-
-import java.security.cert.CertPath;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStoreException;
import java.security.cert.CertPathValidatorException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.PKIXParameters;
import java.security.cert.TrustAnchor;
import java.security.cert.X509Certificate;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyStoreException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.security.auth.x500.X500Principal;
/**
* Indexes trust anchors so they can be found in O(1) time instead of O(N).
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 3b55299..7df12c0 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
@@ -27,7 +27,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
-
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactorySpi;
import javax.net.ssl.ManagerFactoryParameters;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
index 1f3f0fa..ceff289 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
@@ -18,18 +18,17 @@
import java.net.Socket;
import java.security.KeyStore;
+import java.security.KeyStore.PrivateKeyEntry;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.UnrecoverableEntryException;
-import java.security.KeyStore.PrivateKeyEntry;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
-
import javax.net.ssl.SSLEngine;
import javax.net.ssl.X509ExtendedKeyManager;
import javax.security.auth.x500.X500Principal;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
index 431582b..bd97136 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
index 4dab80d..e93c500 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.net.Socket;
import java.net.SocketTimeoutException;
-import java.security.PrivateKey;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
index 5ea288f..84d7dc7 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
@@ -16,8 +16,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import java.util.HashMap;
-import java.util.Map;
import java.security.InvalidKeyException;
import java.security.InvalidParameterException;
import java.security.NoSuchAlgorithmException;
@@ -28,6 +26,8 @@
import java.security.interfaces.DSAParams;
import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.RSAPublicKey;
+import java.util.HashMap;
+import java.util.Map;
/**
* Implements the subset of the JDK Signature interface needed for
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
index 17ac99a..5316385 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
@@ -21,7 +21,6 @@
import java.net.Socket;
import java.net.UnknownHostException;
import java.security.KeyManagementException;
-import org.apache.harmony.xnet.provider.jsse.SSLParameters;
public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
index 9165e9b..6013d38 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
@@ -17,16 +17,13 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.Logger;
-
import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-import javax.net.ssl.SSLException;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
+import javax.net.ssl.SSLException;
/**
* This class provides functionality for computation
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
index 1d71f6b..c945dbb 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.SSLInputStream;
-
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
index 2f0a362..b827016 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-
import java.nio.ByteBuffer;
import javax.net.ssl.SSLException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
index f66b82f..1c83712 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
@@ -27,9 +27,6 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.SSLEngineDataStream;
-import org.apache.harmony.xnet.provider.jsse.SSLSessionImpl;
/**
* Implementation of SSLEngine.
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
index 5c47ed4..8c3ed0a 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
@@ -17,10 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.SSLSessionImpl;
-import org.apache.harmony.xnet.provider.jsse.SSLInputStream;
-
import java.io.IOException;
import javax.net.ssl.SSLProtocolException;
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 0e99167..df5485e 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
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.SSLParameters;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
index 1428e42..dae1ed8 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
@@ -17,9 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.SSLSocketImpl;
-import org.apache.harmony.xnet.provider.jsse.SSLParameters;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
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 83c1a67..582d316 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
@@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
-
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLPermission;
import javax.net.ssl.SSLSession;
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 97b45fa..8f1d94c 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
@@ -17,14 +17,11 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.SSLSocketWrapper;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.security.KeyManagementException;
-
import javax.net.ssl.SSLSocketFactory;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
index 9ecf203..8f0343e 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
@@ -17,11 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.SSLSocketOutputStream;
-import org.apache.harmony.xnet.provider.jsse.SSLStreamedInput;
-import org.apache.harmony.xnet.provider.jsse.SSLSessionImpl;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -99,7 +94,7 @@
* @param sslParameters: SSLParameters
* @throws IOException
* @throws UnknownHostException
- * @see javax.net.ssl.SSLSocket#SSLSocket(String,int)
+ * @see javax.net.ssl.SSLSocket#SSLSocket(String,int)
* method documentation for more information.
*/
protected SSLSocketImpl(String host, int port, SSLParameters sslParameters)
@@ -137,7 +132,7 @@
* @param sslParameters: SSLParameters
* @return
* @throws IOException
- * @see javax.net.ssl.SSLSocket#SSLSocket(InetAddress,int)
+ * @see javax.net.ssl.SSLSocket#SSLSocket(InetAddress,int)
* method documentation for more information.
*/
protected SSLSocketImpl(InetAddress host, int port,
@@ -494,19 +489,19 @@
super.connect(endpoint);
init();
}
-
+
/**
* This method works according to the specification of implemented class.
* @see java.net.Socket#connect(SocketAddress,int)
* method documentation for more information
*/
@Override
- public void connect(SocketAddress endpoint, int timeout)
+ public void connect(SocketAddress endpoint, int timeout)
throws IOException {
super.connect(endpoint, timeout);
init();
}
-
+
/**
* This method works according to the specification of implemented class.
* @see javax.net.ssl.SSLSocket#close()
@@ -616,7 +611,7 @@
if (!handshakeProtocol.getStatus().equals(
SSLEngineResult.HandshakeStatus
.NOT_HANDSHAKING)) {
- // handshake protocol got addressed to it message
+ // handshake protocol got addressed to it message
// and did not ignore it, so it's a rehandshake
doHandshake();
}
@@ -709,7 +704,7 @@
* handshake message from handshake protocol and sends it to another peer.
* If this status is NEED_UNWRAP, method receives and processes handshake
* message from another peer. Each of this stages (wrap/unwrap) change
- * the state of handshake protocol and this process is performed
+ * the state of handshake protocol and this process is performed
* until handshake status is FINISHED. After handshake process is finnished
* handshake completed event are sent to the registered listeners.
* For more information about the handshake process see
@@ -798,7 +793,7 @@
}
}
}
-
+
/*
* Process received alert message
*/
@@ -813,7 +808,7 @@
shutdown();
throw new SSLException(description);
}
-
+
if (logger != null) {
logger.println("Warning alert received: "
+ alertProtocol.getAlertDescription());
@@ -829,11 +824,11 @@
// TODO: process other warning messages
}
}
-
+
/*
* Sends fatal alert message and throws exception
*/
- private void reportFatalAlert(byte description_code,
+ private void reportFatalAlert(byte description_code,
SSLException reason) throws IOException {
alertProtocol.alert(AlertProtocol.FATAL, description_code);
try {
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
index 4f2cfb4..68b9a19 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
@@ -17,9 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.AlertException;
-import org.apache.harmony.xnet.provider.jsse.SSLSocketImpl;
-
import java.io.IOException;
import java.io.InputStream;
import javax.net.ssl.SSLException;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
index ac1795a..bbb08a5 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
@@ -39,9 +39,6 @@
import javax.net.ssl.X509ExtendedKeyManager;
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
-import org.apache.harmony.xnet.provider.jsse.ProtocolVersion;
-import org.apache.harmony.xnet.provider.jsse.SSLSessionImpl;
-import org.apache.harmony.xnet.provider.jsse.SSLv3Constants;
/**
* Server side handshake protocol implementation.
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
index 276516d..1fa848a 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-
import java.io.IOException;
import java.security.SecureRandom;
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
index 19d9268..fd78b1f 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-
import java.io.IOException;
/**
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
index d3626b9..fea8076 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
@@ -17,8 +17,6 @@
package org.apache.harmony.xnet.provider.jsse;
-import org.apache.harmony.xnet.provider.jsse.Message;
-
import java.io.IOException;
import java.math.BigInteger;
import java.security.KeyFactory;
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 1cbbcff..d3ec952 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
@@ -27,7 +27,6 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-
import javax.net.ssl.ManagerFactoryParameters;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactorySpi;
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSParser.java b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
index 41781fa..610142e 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSParser.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
@@ -12,10 +12,10 @@
package org.w3c.dom.ls;
-import org.w3c.dom.Document;
import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* An interface to an object that is able to build, or augment, a DOM tree
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
index 00db4d3..0bee1ff 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
@@ -12,8 +12,8 @@
package org.w3c.dom.ls;
-import org.w3c.dom.Node;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* <code>LSParserFilter</code>s provide applications the ability to examine
diff --git a/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
index b4f4424..07e2e27 100644
--- a/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
@@ -13,8 +13,8 @@
package org.w3c.dom.ls;
import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
/**
* A <code>LSSerializer</code> provides an API for serializing (writing) a
diff --git a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
index cbf2390..f1fd5d0 100644
--- a/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
+++ b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
@@ -12,8 +12,8 @@
package org.w3c.dom.traversal;
-import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
/**
* <code>NodeIterators</code> are used to step through a set of nodes, e.g.
diff --git a/luni/src/main/java/org/xml/sax/InputSource.java b/luni/src/main/java/org/xml/sax/InputSource.java
index d886974..b9b148e 100644
--- a/luni/src/main/java/org/xml/sax/InputSource.java
+++ b/luni/src/main/java/org/xml/sax/InputSource.java
@@ -5,8 +5,8 @@
package org.xml.sax;
-import java.io.Reader;
import java.io.InputStream;
+import java.io.Reader;
/**
* A single input source for an XML entity.
diff --git a/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
index 5b2e7a6..a6b3515 100644
--- a/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
+++ b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
@@ -6,11 +6,10 @@
package org.xml.sax.ext;
import java.io.IOException;
-
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/**
diff --git a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
index c34538f..227638c 100644
--- a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
@@ -5,9 +5,8 @@
package org.xml.sax.helpers;
-import org.xml.sax.AttributeList;
-
import java.util.Vector;
+import org.xml.sax.AttributeList;
/**
diff --git a/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
index 3e068e7..9998868 100644
--- a/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
+++ b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
@@ -7,14 +7,13 @@
package org.xml.sax.helpers;
import java.io.IOException;
-
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
diff --git a/luni/src/main/java/org/xml/sax/helpers/NewInstance.java b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
index 63013a8..4dfd870 100644
--- a/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
+++ b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
@@ -7,8 +7,8 @@
package org.xml.sax.helpers;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
/**
* Create a new instance of a class by name.
diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
index 33bc9a3..9910080 100644
--- a/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
@@ -9,23 +9,21 @@
import java.io.IOException;
import java.util.Enumeration;
import java.util.Vector;
-
-import org.xml.sax.Parser; // deprecated
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.AttributeList; // deprecated
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.DocumentHandler; // deprecated
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import org.xml.sax.XMLReader;
+import org.xml.sax.AttributeList;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
/**
diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
index 0af3084..468a244 100644
--- a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
@@ -5,12 +5,6 @@
package org.xml.sax.helpers;
-import java.lang.ClassNotFoundException;
-import java.lang.IllegalAccessException;
-import java.lang.InstantiationException;
-import java.lang.SecurityException;
-import java.lang.ClassCastException;
-
import org.xml.sax.Parser;
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
index c16700c..7614b85 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
@@ -7,20 +7,19 @@
package org.xml.sax.helpers;
import java.io.IOException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.XMLFilter;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
/**
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
index 1845ad5..abd7e59 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
@@ -8,21 +8,19 @@
import java.io.IOException;
import java.util.Locale;
-
-import org.xml.sax.Parser; // deprecated
-import org.xml.sax.Locator;
-import org.xml.sax.InputSource;
-import org.xml.sax.AttributeList; // deprecated
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.DocumentHandler; // deprecated
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-
-import org.xml.sax.XMLReader;
+import org.xml.sax.AttributeList;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
/**
diff --git a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
index e5a6e30..1d750b6 100644
--- a/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
@@ -6,11 +6,12 @@
// $Id: XMLReaderFactory.java,v 1.10 2002/04/22 01:00:13 dbrownell Exp $
package org.xml.sax.helpers;
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.xml.sax.XMLReader;
import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/**
