8 files changed, 21 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b0facb7dad8..0bacf1ed798 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,16 @@
 2004-10-21  Michael Koch  <konqueror@gmx.de>
 
+	* javax/net/ssl/HandshakeCompletedEvent.java,
+	javax/net/ssl/KeyManagerFactory.java,
+	javax/net/ssl/SSLContext.java,
+	javax/net/ssl/SSLServerSocketFactory.java,
+	javax/net/ssl/SSLSession.java,
+	javax/net/ssl/SSLSocketFactory.java,
+	javax/net/ssl/TrustManagerFactory.java:
+	Import cleanup.
+
+2004-10-21  Michael Koch  <konqueror@gmx.de>
+
 	* javax/naming/directory/BasicAttribute.java,
 	javax/naming/directory/BasicAttributes.java,
 	javax/naming/directory/InitialDirContext.java,
diff --git a/libjava/javax/net/ssl/HandshakeCompletedEvent.java b/libjava/javax/net/ssl/HandshakeCompletedEvent.java
index 6171ebc48e7..f19dd6a29fd 100644
--- a/libjava/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/libjava/javax/net/ssl/HandshakeCompletedEvent.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.net.ssl;
 
 import java.security.cert.Certificate;
+
 import javax.security.cert.X509Certificate;
 
 /**
diff --git a/libjava/javax/net/ssl/KeyManagerFactory.java b/libjava/javax/net/ssl/KeyManagerFactory.java
index a166f60aa43..938dbcec9b6 100644
--- a/libjava/javax/net/ssl/KeyManagerFactory.java
+++ b/libjava/javax/net/ssl/KeyManagerFactory.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.net.ssl;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
@@ -51,8 +52,6 @@ import java.security.Provider;
 import java.security.Security;
 import java.security.UnrecoverableKeyException;
 
-import gnu.java.security.Engine;
-
 /**
  * A class that creates key manager implementations based on a
  * requested algorithm.
diff --git a/libjava/javax/net/ssl/SSLContext.java b/libjava/javax/net/ssl/SSLContext.java
index 45e01c3c7be..f69e2678beb 100644
--- a/libjava/javax/net/ssl/SSLContext.java
+++ b/libjava/javax/net/ssl/SSLContext.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.net.ssl;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
@@ -47,8 +48,6 @@ import java.security.Provider;
 import java.security.SecureRandom;
 import java.security.Security;
 
-import gnu.java.security.Engine;
-
 /**
  * A "meta-factory" for protocol-specific socket and server socket
  * factories. This class serves as a clearinghouse for socket
@@ -59,7 +58,6 @@ import gnu.java.security.Engine;
  */
 public class SSLContext
 {
-
   // Constants and fields.
   // ------------------------------------------------------------------
 
diff --git a/libjava/javax/net/ssl/SSLServerSocketFactory.java b/libjava/javax/net/ssl/SSLServerSocketFactory.java
index ef82d146294..c26a6138448 100644
--- a/libjava/javax/net/ssl/SSLServerSocketFactory.java
+++ b/libjava/javax/net/ssl/SSLServerSocketFactory.java
@@ -40,6 +40,7 @@ package javax.net.ssl;
 
 import java.security.KeyStore;
 import java.security.Security;
+
 import javax.net.ServerSocketFactory;
 
 /**
@@ -48,7 +49,6 @@ import javax.net.ServerSocketFactory;
  */
 public abstract class SSLServerSocketFactory extends ServerSocketFactory
 {
-
   // Field.
   // -------------------------------------------------------------------------
 
diff --git a/libjava/javax/net/ssl/SSLSession.java b/libjava/javax/net/ssl/SSLSession.java
index 14797f083a7..bad1f0df4d5 100644
--- a/libjava/javax/net/ssl/SSLSession.java
+++ b/libjava/javax/net/ssl/SSLSession.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package javax.net.ssl;
 
 import java.security.cert.Certificate;
+
 import javax.security.cert.X509Certificate;
 
 /**
@@ -47,7 +48,6 @@ import javax.security.cert.X509Certificate;
  */
 public interface SSLSession
 {
-
   /**
    * Returns this session's cihper suite.
    *
diff --git a/libjava/javax/net/ssl/SSLSocketFactory.java b/libjava/javax/net/ssl/SSLSocketFactory.java
index 3532164168b..5b9000ed3dd 100644
--- a/libjava/javax/net/ssl/SSLSocketFactory.java
+++ b/libjava/javax/net/ssl/SSLSocketFactory.java
@@ -42,6 +42,7 @@ import java.io.IOException;
 import java.net.Socket;
 import java.security.KeyStore;
 import java.security.Security;
+
 import javax.net.SocketFactory;
 
 /**
@@ -50,7 +51,6 @@ import javax.net.SocketFactory;
  */
 public abstract class SSLSocketFactory extends SocketFactory
 {
-
   // Constants.
   // -------------------------------------------------------------------------
 
diff --git a/libjava/javax/net/ssl/TrustManagerFactory.java b/libjava/javax/net/ssl/TrustManagerFactory.java
index 84059c89618..c1f2019f24b 100644
--- a/libjava/javax/net/ssl/TrustManagerFactory.java
+++ b/libjava/javax/net/ssl/TrustManagerFactory.java
@@ -38,8 +38,9 @@ exception statement from your version. */
 
 package javax.net.ssl;
 
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
 
+import java.lang.reflect.InvocationTargetException;
 import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
@@ -50,8 +51,6 @@ import java.security.PrivilegedAction;
 import java.security.Provider;
 import java.security.Security;
 
-import gnu.java.security.Engine;
-
 /**
  * A factory for creating trust manager objects.
  */