summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-21 21:00:07 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-21 21:00:07 +0000
commit5534465383bb5b22d5f88321b0d764c85acbd41a (patch)
treeab8dfab1eb3b1a18e555664d957193a1cd136dcf
parent072a7df15f39976e5bc5034f226f099494ce3bda (diff)
downloadgcc-5534465383bb5b22d5f88321b0d764c85acbd41a.tar.gz
2004-10-21 Michael Koch <konqueror@gmx.de>
* java/net/NetworkInterface.java, java/text/Format.java, javax/security/auth/x500/X500Principal.java, javax/security/auth/x500/X500PrivateCredential.java, javax/security/cert/X509CertBridge.java, javax/security/sasl/Sasl.java, javax/sql/XAConnection.java: Import cleanup. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89401 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog11
-rw-r--r--libjava/java/net/NetworkInterface.java3
-rw-r--r--libjava/java/text/Format.java1
-rw-r--r--libjava/javax/security/auth/x500/X500Principal.java2
-rw-r--r--libjava/javax/security/auth/x500/X500PrivateCredential.java3
-rw-r--r--libjava/javax/security/cert/X509CertBridge.java4
-rw-r--r--libjava/javax/security/sasl/Sasl.java4
-rw-r--r--libjava/javax/sql/XAConnection.java5
8 files changed, 23 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0bacf1ed798..fe0a7f0b654 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,16 @@
2004-10-21 Michael Koch <konqueror@gmx.de>
+ * java/net/NetworkInterface.java,
+ java/text/Format.java,
+ javax/security/auth/x500/X500Principal.java,
+ javax/security/auth/x500/X500PrivateCredential.java,
+ javax/security/cert/X509CertBridge.java,
+ javax/security/sasl/Sasl.java,
+ javax/sql/XAConnection.java:
+ Import cleanup.
+
+2004-10-21 Michael Koch <konqueror@gmx.de>
+
* javax/net/ssl/HandshakeCompletedEvent.java,
javax/net/ssl/KeyManagerFactory.java,
javax/net/ssl/SSLContext.java,
diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java
index defd3482583..f2c8acdaf9e 100644
--- a/libjava/java/net/NetworkInterface.java
+++ b/libjava/java/net/NetworkInterface.java
@@ -35,13 +35,14 @@ this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.net;
import gnu.classpath.Configuration;
+
import java.util.Enumeration;
import java.util.Vector;
-
/**
* This class models a network interface on the host computer. A network
* interface contains a name (typically associated with a specific
diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java
index 6f15dc04441..7310d5588cd 100644
--- a/libjava/java/text/Format.java
+++ b/libjava/java/text/Format.java
@@ -39,6 +39,7 @@ exception statement from your version. */
package java.text;
import gnu.java.text.FormatCharacterIterator;
+
import java.io.Serializable;
/**
diff --git a/libjava/javax/security/auth/x500/X500Principal.java b/libjava/javax/security/auth/x500/X500Principal.java
index 2b016a67978..e9032ffaf78 100644
--- a/libjava/javax/security/auth/x500/X500Principal.java
+++ b/libjava/javax/security/auth/x500/X500Principal.java
@@ -44,9 +44,9 @@ import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
import java.io.ByteArrayInputStream;
+import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.EOFException;
import java.io.NotActiveException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/libjava/javax/security/auth/x500/X500PrivateCredential.java b/libjava/javax/security/auth/x500/X500PrivateCredential.java
index fb3a5ef40b7..b2eeb8da821 100644
--- a/libjava/javax/security/auth/x500/X500PrivateCredential.java
+++ b/libjava/javax/security/auth/x500/X500PrivateCredential.java
@@ -1,5 +1,5 @@
/* X500PrivateCredential.java -- certificate and private key pair.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,6 +40,7 @@ package javax.security.auth.x500;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
+
import javax.security.auth.Destroyable;
/**
diff --git a/libjava/javax/security/cert/X509CertBridge.java b/libjava/javax/security/cert/X509CertBridge.java
index 1c075d6d52f..9db2c4829d9 100644
--- a/libjava/javax/security/cert/X509CertBridge.java
+++ b/libjava/javax/security/cert/X509CertBridge.java
@@ -39,14 +39,12 @@ exception statement from your version. */
package javax.security.cert;
import java.math.BigInteger;
-
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.PublicKey;
import java.security.Principal;
+import java.security.PublicKey;
import java.security.SignatureException;
-
import java.util.Date;
/**
diff --git a/libjava/javax/security/sasl/Sasl.java b/libjava/javax/security/sasl/Sasl.java
index b08890f7e4b..334aac602ba 100644
--- a/libjava/javax/security/sasl/Sasl.java
+++ b/libjava/javax/security/sasl/Sasl.java
@@ -38,13 +38,13 @@ exception statement from your version. */
package javax.security.sasl;
+import java.security.Provider;
+import java.security.Security;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
-import java.security.Security;
-import java.security.Provider;
import javax.security.auth.callback.CallbackHandler;
diff --git a/libjava/javax/sql/XAConnection.java b/libjava/javax/sql/XAConnection.java
index 60b83d74c24..f1caa788482 100644
--- a/libjava/javax/sql/XAConnection.java
+++ b/libjava/javax/sql/XAConnection.java
@@ -1,5 +1,5 @@
-/* XAConnection.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+/* XAConnection.java --
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,6 +39,7 @@ exception statement from your version. */
package javax.sql;
import java.sql.SQLException;
+
import javax.transaction.xa.XAResource;
/**