diff options
Diffstat (limited to 'libjava/gnu/java')
22 files changed, 55 insertions, 59 deletions
diff --git a/libjava/gnu/java/net/protocol/http/Cookie.java b/libjava/gnu/java/net/protocol/http/Cookie.java index fc4fde4..452ca0f 100644 --- a/libjava/gnu/java/net/protocol/http/Cookie.java +++ b/libjava/gnu/java/net/protocol/http/Cookie.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.java.net.protocol.http; -import java.text.ParseException; import java.util.Date; /** diff --git a/libjava/gnu/java/net/protocol/http/HTTPConnection.java b/libjava/gnu/java/net/protocol/http/HTTPConnection.java index 00cb703..a3f14b5 100644 --- a/libjava/gnu/java/net/protocol/http/HTTPConnection.java +++ b/libjava/gnu/java/net/protocol/http/HTTPConnection.java @@ -54,12 +54,10 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.security.GeneralSecurityException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.net.SocketFactory; import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; diff --git a/libjava/gnu/java/net/protocol/http/HTTPDateFormat.java b/libjava/gnu/java/net/protocol/http/HTTPDateFormat.java index 22ef056..0137596 100644 --- a/libjava/gnu/java/net/protocol/http/HTTPDateFormat.java +++ b/libjava/gnu/java/net/protocol/http/HTTPDateFormat.java @@ -38,9 +38,15 @@ exception statement from your version. */ package gnu.java.net.protocol.http; -import java.io.PrintStream; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.FieldPosition; +import java.text.NumberFormat; +import java.text.ParsePosition; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; /** * HTTP date formatter and parser. diff --git a/libjava/gnu/java/net/protocol/http/Request.java b/libjava/gnu/java/net/protocol/http/Request.java index 123e889..62a1a53 100644 --- a/libjava/gnu/java/net/protocol/http/Request.java +++ b/libjava/gnu/java/net/protocol/http/Request.java @@ -46,7 +46,6 @@ import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; import java.net.ProtocolException; -import java.net.Socket; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.DateFormat; diff --git a/libjava/gnu/java/nio/PipeImpl.java b/libjava/gnu/java/nio/PipeImpl.java index df79e17..ca374c5 100644 --- a/libjava/gnu/java/nio/PipeImpl.java +++ b/libjava/gnu/java/nio/PipeImpl.java @@ -1,5 +1,5 @@ /* PipeImpl.java -- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -79,7 +79,8 @@ class PipeImpl extends Pipe return read (srcs, 0, srcs.length); } - public synchronized final long read (ByteBuffer[] srcs, int offset, int len) + public final synchronized long read (ByteBuffer[] srcs, int offset, + int len) throws IOException { if (offset < 0 @@ -138,7 +139,7 @@ class PipeImpl extends Pipe return write (srcs, 0, srcs.length); } - public synchronized final long write (ByteBuffer[] srcs, int offset, int len) + public final synchronized long write (ByteBuffer[] srcs, int offset, int len) throws IOException { if (offset < 0 diff --git a/libjava/gnu/java/rmi/dgc/DGCImpl.java b/libjava/gnu/java/rmi/dgc/DGCImpl.java index 4216b64..483ac54 100644 --- a/libjava/gnu/java/rmi/dgc/DGCImpl.java +++ b/libjava/gnu/java/rmi/dgc/DGCImpl.java @@ -42,7 +42,6 @@ import java.rmi.dgc.Lease; import java.rmi.dgc.VMID; import java.rmi.server.ObjID; import java.rmi.RemoteException; -import java.rmi.server.UnicastRemoteObject; import java.rmi.server.RMISocketFactory; import gnu.java.rmi.server.UnicastServerRef; diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java index 5f5da8c..b917315 100644 --- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java +++ b/libjava/gnu/java/rmi/server/ConnectionRunnerPool.java @@ -1,5 +1,5 @@ /* gnu.java.rmi.server.ConnectionRunnerPool - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -118,7 +118,7 @@ class ConnectionRunnerPool max_size = size; } - private synchronized static ConnectionRunner getConnectionRunner() + private static synchronized ConnectionRunner getConnectionRunner() { if(freelist.size() == 0){ if(size < max_size){ diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java index cf08a08..ef01c82 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.java @@ -55,7 +55,6 @@ import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.RMIClientSocketFactory; import java.util.ArrayList; import java.util.ConcurrentModificationException; -import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; diff --git a/libjava/gnu/java/security/der/DERWriter.java b/libjava/gnu/java/security/der/DERWriter.java index 8bf80b5..5568b69 100644 --- a/libjava/gnu/java/security/der/DERWriter.java +++ b/libjava/gnu/java/security/der/DERWriter.java @@ -1,5 +1,5 @@ /* DERWriter.java -- write Java types in DER format. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,6 @@ import java.math.BigInteger; import java.text.SimpleDateFormat; -import java.util.BitSet; import java.util.Date; import java.util.Iterator; import java.util.List; diff --git a/libjava/gnu/java/security/pkcs/SignerInfo.java b/libjava/gnu/java/security/pkcs/SignerInfo.java index 4444294..15fe9f9 100644 --- a/libjava/gnu/java/security/pkcs/SignerInfo.java +++ b/libjava/gnu/java/security/pkcs/SignerInfo.java @@ -41,11 +41,9 @@ import gnu.java.security.ber.BER; import gnu.java.security.ber.BEREncodingException; import gnu.java.security.ber.BERReader; import gnu.java.security.ber.BERValue; -import gnu.java.security.der.BitString; import gnu.java.security.der.DERValue; import java.io.IOException; -import java.io.InputStream; import java.math.BigInteger; diff --git a/libjava/gnu/java/security/provider/EncodedKeyFactory.java b/libjava/gnu/java/security/provider/EncodedKeyFactory.java index e308d44..7dc5ee9 100644 --- a/libjava/gnu/java/security/provider/EncodedKeyFactory.java +++ b/libjava/gnu/java/security/provider/EncodedKeyFactory.java @@ -38,6 +38,11 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.security.OID; +import gnu.java.security.der.BitString; +import gnu.java.security.der.DERReader; +import gnu.java.security.der.DERValue; + import java.io.IOException; import java.math.BigInteger; @@ -45,15 +50,12 @@ import java.math.BigInteger; import java.security.AlgorithmParameters; import java.security.InvalidKeyException; import java.security.Key; -import java.security.KeyFactory; import java.security.KeyFactorySpi; import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.PublicKey; import java.security.spec.DSAParameterSpec; -import java.security.spec.DSAPrivateKeySpec; -import java.security.spec.DSAPublicKeySpec; import java.security.spec.InvalidParameterSpecException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; @@ -64,12 +66,6 @@ import java.security.spec.X509EncodedKeySpec; import javax.crypto.spec.DHParameterSpec; -import gnu.java.security.OID; -import gnu.java.security.der.BitString; -import gnu.java.security.der.DER; -import gnu.java.security.der.DERReader; -import gnu.java.security.der.DERValue; - /** * A factory for keys encoded in either the X.509 format (for public * keys) or the PKCS#8 format (for private keys). diff --git a/libjava/gnu/java/security/provider/GnuDHPublicKey.java b/libjava/gnu/java/security/provider/GnuDHPublicKey.java index a650761..fbf9d9f 100644 --- a/libjava/gnu/java/security/provider/GnuDHPublicKey.java +++ b/libjava/gnu/java/security/provider/GnuDHPublicKey.java @@ -49,7 +49,6 @@ import gnu.java.security.OID; import gnu.java.security.der.BitString; import gnu.java.security.der.DER; import gnu.java.security.der.DERValue; -import gnu.java.security.der.DERWriter; public class GnuDHPublicKey implements DHPublicKey { diff --git a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java index e82483c..72fe387 100644 --- a/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java +++ b/libjava/gnu/java/security/provider/GnuDSAPrivateKey.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -62,7 +62,7 @@ public class GnuDSAPrivateKey implements DSAPrivateKey BigInteger q; BigInteger g; - public GnuDSAPrivateKey(BigInteger x, BigInteger p, BigInteger q, BigInteger g ) + public GnuDSAPrivateKey(BigInteger x, BigInteger p, BigInteger q, BigInteger g ) { this.x = x; this.p = p; @@ -125,8 +125,8 @@ public class GnuDSAPrivateKey implements DSAPrivateKey } catch (IOException ioe) { - return null; - } + return null; + } } public DSAParams getParams() diff --git a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java index 24600d6..9ec827d 100644 --- a/libjava/gnu/java/security/provider/GnuDSAPublicKey.java +++ b/libjava/gnu/java/security/provider/GnuDSAPublicKey.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -63,7 +63,7 @@ public class GnuDSAPublicKey implements DSAPublicKey BigInteger q; BigInteger g; - public GnuDSAPublicKey(BigInteger y, BigInteger p, BigInteger q, BigInteger g ) + public GnuDSAPublicKey(BigInteger y, BigInteger p, BigInteger q, BigInteger g ) { this.y = y; this.p = p; @@ -113,8 +113,8 @@ public class GnuDSAPublicKey implements DSAPublicKey } catch (IOException ioe) { - return null; - } + return null; + } } public DSAParams getParams() diff --git a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java index 7d1d857..7bba502 100644 --- a/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java +++ b/libjava/gnu/java/security/provider/PKIXCertPathValidatorImpl.java @@ -38,18 +38,40 @@ exception statement from your version. */ package gnu.java.security.provider; +import gnu.java.security.OID; +import gnu.java.security.x509.GnuPKIExtension; +import gnu.java.security.x509.PolicyNodeImpl; +import gnu.java.security.x509.X509CertSelectorImpl; +import gnu.java.security.x509.X509CRLSelectorImpl; +import gnu.java.security.x509.ext.BasicConstraints; +import gnu.java.security.x509.ext.CertificatePolicies; +import gnu.java.security.x509.ext.Extension; +import gnu.java.security.x509.ext.KeyUsage; +import gnu.java.security.x509.ext.PolicyConstraint; + import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; -import java.security.Principal; import java.security.PublicKey; -import java.security.cert.*; - +import java.security.cert.CertificateException; +import java.security.cert.CertPath; +import java.security.cert.CertPathParameters; +import java.security.cert.CertPathValidatorException; +import java.security.cert.CertPathValidatorResult; +import java.security.cert.CertPathValidatorSpi; +import java.security.cert.CertStore; +import java.security.cert.CertStoreException; +import java.security.cert.CRL; +import java.security.cert.PKIXCertPathChecker; +import java.security.cert.PKIXCertPathValidatorResult; +import java.security.cert.PKIXParameters; +import java.security.cert.TrustAnchor; +import java.security.cert.X509Certificate; +import java.security.cert.X509CRL; import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPublicKey; -import java.security.spec.DSAParameterSpec; import java.util.Arrays; import java.util.Collection; @@ -61,13 +83,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import gnu.java.security.x509.GnuPKIExtension; -import gnu.java.security.x509.PolicyNodeImpl; -import gnu.java.security.x509.X509CertSelectorImpl; -import gnu.java.security.x509.X509CRLSelectorImpl; -import gnu.java.security.x509.ext.*; -import gnu.java.security.OID; - /** * An implementation of the Public Key Infrastructure's X.509 * certificate path validation algorithm. diff --git a/libjava/gnu/java/security/x509/X500DistinguishedName.java b/libjava/gnu/java/security/x509/X500DistinguishedName.java index 64e320b..daf76a2 100644 --- a/libjava/gnu/java/security/x509/X500DistinguishedName.java +++ b/libjava/gnu/java/security/x509/X500DistinguishedName.java @@ -55,7 +55,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TreeMap; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; diff --git a/libjava/gnu/java/security/x509/X509CRL.java b/libjava/gnu/java/security/x509/X509CRL.java index adaa003..33263af 100644 --- a/libjava/gnu/java/security/x509/X509CRL.java +++ b/libjava/gnu/java/security/x509/X509CRL.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.java.security.x509; -import gnu.java.io.ASN1ParsingException; import gnu.java.security.OID; import gnu.java.security.der.BitString; import gnu.java.security.der.DER; diff --git a/libjava/gnu/java/security/x509/X509CRLEntry.java b/libjava/gnu/java/security/x509/X509CRLEntry.java index 252737c..da16115 100644 --- a/libjava/gnu/java/security/x509/X509CRLEntry.java +++ b/libjava/gnu/java/security/x509/X509CRLEntry.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.io.InputStream; import java.io.IOException; import java.math.BigInteger; diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java index 25a56d4..721439e 100644 --- a/libjava/gnu/java/security/x509/X509Certificate.java +++ b/libjava/gnu/java/security/x509/X509Certificate.java @@ -38,18 +38,14 @@ exception statement from your version. */ package gnu.java.security.x509; -import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.IOException; -import java.io.ObjectStreamException; import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; import java.math.BigInteger; -import java.net.InetAddress; - import java.security.AlgorithmParameters; import java.security.InvalidKeyException; import java.security.KeyFactory; @@ -79,7 +75,6 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java index 6f4e00b..5441521 100644 --- a/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java +++ b/libjava/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java @@ -40,7 +40,6 @@ package gnu.java.security.x509.ext; import java.io.IOException; import java.math.BigInteger; -import java.util.List; import gnu.java.security.OID; import gnu.java.security.der.DER; diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java index 206fa7e..9c14dc9 100644 --- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.java +++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.java @@ -39,7 +39,6 @@ exception statement from your version. */ package gnu.java.security.x509.ext; import java.io.IOException; -import java.math.BigInteger; import java.security.cert.PolicyQualifierInfo; import java.util.ArrayList; diff --git a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java index 0949b50..e33f960 100644 --- a/libjava/gnu/java/security/x509/ext/PolicyConstraint.java +++ b/libjava/gnu/java/security/x509/ext/PolicyConstraint.java @@ -42,10 +42,8 @@ import java.io.IOException; import java.math.BigInteger; import gnu.java.security.OID; -import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; import gnu.java.security.der.DERValue; -import gnu.java.security.x509.Util; public class PolicyConstraint extends Extension.Value { |