From c38e914edbb02ff6bdccfea7a98a18dbccc866e3 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 17 Feb 2005 18:26:34 +0000 Subject: [PATCH] Cookie.java, [...]: Reworked import statements, fixed modifier order and some little formatting issues. 2005-02-17 Andrew John Hughes Michael Koch * gnu/java/net/protocol/http/Cookie.java, gnu/java/net/protocol/http/HTTPConnection.java, gnu/java/net/protocol/http/HTTPDateFormat.java, gnu/java/net/protocol/http/Request.java, gnu/java/nio/PipeImpl.java, gnu/java/rmi/dgc/DGCImpl.java, gnu/java/rmi/server/ConnectionRunnerPool.java, gnu/java/rmi/server/UnicastConnectionManager.java, gnu/java/security/der/DERWriter.java, gnu/java/security/pkcs/SignerInfo.java, gnu/java/security/provider/EncodedKeyFactory.java, gnu/java/security/provider/GnuDHPublicKey.java, gnu/java/security/provider/GnuDSAPrivateKey.java, gnu/java/security/provider/GnuDSAPublicKey.java, gnu/java/security/provider/PKIXCertPathValidatorImpl.java, gnu/java/security/x509/X500DistinguishedName.java, gnu/java/security/x509/X509CRL.java, gnu/java/security/x509/X509CRLEntry.java, gnu/java/security/x509/X509Certificate.java, gnu/java/security/x509/ext/AuthorityKeyIdentifier.java, gnu/java/security/x509/ext/CertificatePolicies.java, gnu/java/security/x509/ext/PolicyConstraint.java, gnu/xml/dom/Consumer.java, gnu/xml/dom/DomCharacterData.java, gnu/xml/dom/DomDocument.java, gnu/xml/dom/DomDocumentBuilder.java, gnu/xml/dom/DomIterator.java, gnu/xml/dom/DomNode.java, gnu/xml/dom/DomXPathExpression.java, gnu/xml/dom/DomXPathResult.java, gnu/xml/dom/JAXPFactory.java, gnu/xml/pipeline/CallFilter.java, gnu/xml/pipeline/DomConsumer.java, gnu/xml/pipeline/LinkFilter.java, gnu/xml/pipeline/NSFilter.java, gnu/xml/pipeline/TeeConsumer.java, gnu/xml/pipeline/ValidationConsumer.java, gnu/xml/pipeline/WellFormednessFilter.java, gnu/xml/pipeline/XIncludeFilter.java, gnu/xml/pipeline/XsltFilter.java, gnu/xml/transform/ApplyImportsNode.java, gnu/xml/transform/Bindings.java, gnu/xml/transform/DocumentFunction.java, gnu/xml/transform/FormatNumberFunction.java, gnu/xml/transform/NodeNumberNode.java, gnu/xml/transform/NumberNode.java, gnu/xml/transform/Stylesheet.java, gnu/xml/transform/SystemPropertyFunction.java, gnu/xml/transform/Template.java, gnu/xml/transform/TemplatesImpl.java, gnu/xml/transform/TransformerImpl.java, gnu/xml/transform/ValueOfNode.java, gnu/xml/transform/XSLURIResolver.java, gnu/xml/util/DoParse.java, gnu/xml/util/Resolver.java, gnu/xml/xpath/Expr.java, gnu/xml/xpath/FunctionCall.java, gnu/xml/xpath/RelationalExpr.java, gnu/xml/xpath/Selector.java, gnu/xml/xpath/XPathParser.java: Reworked import statements, fixed modifier order and some little formatting issues. Co-Authored-By: Michael Koch From-SVN: r95177 --- libjava/ChangeLog | 66 +++++++++++++++++++ .../gnu/java/net/protocol/http/Cookie.java | 1 - .../net/protocol/http/HTTPConnection.java | 2 - .../net/protocol/http/HTTPDateFormat.java | 12 +++- .../gnu/java/net/protocol/http/Request.java | 1 - libjava/gnu/java/nio/PipeImpl.java | 7 +- libjava/gnu/java/rmi/dgc/DGCImpl.java | 1 - .../java/rmi/server/ConnectionRunnerPool.java | 4 +- .../rmi/server/UnicastConnectionManager.java | 1 - libjava/gnu/java/security/der/DERWriter.java | 3 +- .../gnu/java/security/pkcs/SignerInfo.java | 2 - .../security/provider/EncodedKeyFactory.java | 14 ++-- .../security/provider/GnuDHPublicKey.java | 1 - .../security/provider/GnuDSAPrivateKey.java | 8 +-- .../security/provider/GnuDSAPublicKey.java | 8 +-- .../provider/PKIXCertPathValidatorImpl.java | 37 +++++++---- .../security/x509/X500DistinguishedName.java | 1 - libjava/gnu/java/security/x509/X509CRL.java | 1 - .../gnu/java/security/x509/X509CRLEntry.java | 1 - .../java/security/x509/X509Certificate.java | 5 -- .../x509/ext/AuthorityKeyIdentifier.java | 1 - .../x509/ext/CertificatePolicies.java | 1 - .../security/x509/ext/PolicyConstraint.java | 2 - libjava/gnu/xml/dom/Consumer.java | 5 -- libjava/gnu/xml/dom/DomCharacterData.java | 2 - libjava/gnu/xml/dom/DomDocument.java | 1 - libjava/gnu/xml/dom/DomDocumentBuilder.java | 1 - libjava/gnu/xml/dom/DomIterator.java | 2 - libjava/gnu/xml/dom/DomNode.java | 2 - libjava/gnu/xml/dom/DomXPathExpression.java | 1 - libjava/gnu/xml/dom/DomXPathResult.java | 2 - libjava/gnu/xml/dom/JAXPFactory.java | 1 - libjava/gnu/xml/pipeline/CallFilter.java | 15 +++-- libjava/gnu/xml/pipeline/DomConsumer.java | 29 +++++--- libjava/gnu/xml/pipeline/LinkFilter.java | 1 - libjava/gnu/xml/pipeline/NSFilter.java | 9 +-- libjava/gnu/xml/pipeline/TeeConsumer.java | 14 ++-- .../gnu/xml/pipeline/ValidationConsumer.java | 16 +++-- .../xml/pipeline/WellFormednessFilter.java | 9 +-- libjava/gnu/xml/pipeline/XIncludeFilter.java | 1 - libjava/gnu/xml/pipeline/XsltFilter.java | 1 - .../gnu/xml/transform/ApplyImportsNode.java | 6 -- libjava/gnu/xml/transform/Bindings.java | 4 -- .../gnu/xml/transform/DocumentFunction.java | 6 -- .../xml/transform/FormatNumberFunction.java | 1 - libjava/gnu/xml/transform/NodeNumberNode.java | 3 - libjava/gnu/xml/transform/NumberNode.java | 1 - libjava/gnu/xml/transform/Stylesheet.java | 2 - .../xml/transform/SystemPropertyFunction.java | 1 - libjava/gnu/xml/transform/Template.java | 2 - libjava/gnu/xml/transform/TemplatesImpl.java | 3 - .../gnu/xml/transform/TransformerImpl.java | 6 -- libjava/gnu/xml/transform/ValueOfNode.java | 3 - libjava/gnu/xml/transform/XSLURIResolver.java | 1 - libjava/gnu/xml/util/DoParse.java | 18 ++--- libjava/gnu/xml/util/Resolver.java | 10 +-- libjava/gnu/xml/xpath/Expr.java | 2 - libjava/gnu/xml/xpath/FunctionCall.java | 1 - libjava/gnu/xml/xpath/RelationalExpr.java | 1 - libjava/gnu/xml/xpath/Selector.java | 2 - libjava/gnu/xml/xpath/XPathParser.java | 1 - 61 files changed, 194 insertions(+), 172 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ebf7fcecb5d..c2678d67e70 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,69 @@ +2005-02-17 Andrew John Hughes + Michael Koch + + * gnu/java/net/protocol/http/Cookie.java, + gnu/java/net/protocol/http/HTTPConnection.java, + gnu/java/net/protocol/http/HTTPDateFormat.java, + gnu/java/net/protocol/http/Request.java, + gnu/java/nio/PipeImpl.java, + gnu/java/rmi/dgc/DGCImpl.java, + gnu/java/rmi/server/ConnectionRunnerPool.java, + gnu/java/rmi/server/UnicastConnectionManager.java, + gnu/java/security/der/DERWriter.java, + gnu/java/security/pkcs/SignerInfo.java, + gnu/java/security/provider/EncodedKeyFactory.java, + gnu/java/security/provider/GnuDHPublicKey.java, + gnu/java/security/provider/GnuDSAPrivateKey.java, + gnu/java/security/provider/GnuDSAPublicKey.java, + gnu/java/security/provider/PKIXCertPathValidatorImpl.java, + gnu/java/security/x509/X500DistinguishedName.java, + gnu/java/security/x509/X509CRL.java, + gnu/java/security/x509/X509CRLEntry.java, + gnu/java/security/x509/X509Certificate.java, + gnu/java/security/x509/ext/AuthorityKeyIdentifier.java, + gnu/java/security/x509/ext/CertificatePolicies.java, + gnu/java/security/x509/ext/PolicyConstraint.java, + gnu/xml/dom/Consumer.java, + gnu/xml/dom/DomCharacterData.java, + gnu/xml/dom/DomDocument.java, + gnu/xml/dom/DomDocumentBuilder.java, + gnu/xml/dom/DomIterator.java, + gnu/xml/dom/DomNode.java, + gnu/xml/dom/DomXPathExpression.java, + gnu/xml/dom/DomXPathResult.java, + gnu/xml/dom/JAXPFactory.java, + gnu/xml/pipeline/CallFilter.java, + gnu/xml/pipeline/DomConsumer.java, + gnu/xml/pipeline/LinkFilter.java, + gnu/xml/pipeline/NSFilter.java, + gnu/xml/pipeline/TeeConsumer.java, + gnu/xml/pipeline/ValidationConsumer.java, + gnu/xml/pipeline/WellFormednessFilter.java, + gnu/xml/pipeline/XIncludeFilter.java, + gnu/xml/pipeline/XsltFilter.java, + gnu/xml/transform/ApplyImportsNode.java, + gnu/xml/transform/Bindings.java, + gnu/xml/transform/DocumentFunction.java, + gnu/xml/transform/FormatNumberFunction.java, + gnu/xml/transform/NodeNumberNode.java, + gnu/xml/transform/NumberNode.java, + gnu/xml/transform/Stylesheet.java, + gnu/xml/transform/SystemPropertyFunction.java, + gnu/xml/transform/Template.java, + gnu/xml/transform/TemplatesImpl.java, + gnu/xml/transform/TransformerImpl.java, + gnu/xml/transform/ValueOfNode.java, + gnu/xml/transform/XSLURIResolver.java, + gnu/xml/util/DoParse.java, + gnu/xml/util/Resolver.java, + gnu/xml/xpath/Expr.java, + gnu/xml/xpath/FunctionCall.java, + gnu/xml/xpath/RelationalExpr.java, + gnu/xml/xpath/Selector.java, + gnu/xml/xpath/XPathParser.java: + Reworked import statements, fixed modifier order and some little + formatting issues. + 2005-02-17 Ito Kazumitsu * java/nio/ByteBufferImpl.java (compact): diff --git a/libjava/gnu/java/net/protocol/http/Cookie.java b/libjava/gnu/java/net/protocol/http/Cookie.java index fc4fde4f0dd..452ca0f7ad1 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 00cb7036c75..a3f14b51012 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 22ef05631e9..0137596aa74 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 123e889c065..62a1a535a12 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 df79e17fd2b..ca374c52ff1 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 4216b6466ba..483ac54f192 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 5f5da8ca941..b917315cbb4 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 cf08a08ab5b..ef01c8264e5 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 8bf80b5fc76..5568b69bbad 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 444429493c6..15fe9f9f860 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 e308d443fc6..7dc5ee9337b 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 a650761dc8f..fbf9d9f8633 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 e82483c5adf..72fe38784d5 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 24600d6c583..9ec827d41ae 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 7d1d857a049..7bba5021338 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 64e320bef82..daf76a22dfa 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 adaa003f3cb..33263af4325 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 252737c0eaa..da161153c62 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 25a56d4a8ef..721439ef238 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 6f4e00b3f07..5441521990b 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 206fa7efaf6..9c14dc96ef7 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 0949b5000ae..e33f960b30b 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 { diff --git a/libjava/gnu/xml/dom/Consumer.java b/libjava/gnu/xml/dom/Consumer.java index 1aad5be9273..426b1e5da62 100644 --- a/libjava/gnu/xml/dom/Consumer.java +++ b/libjava/gnu/xml/dom/Consumer.java @@ -38,16 +38,11 @@ exception statement from your version. */ package gnu.xml.dom; -import java.io.IOException; - -import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import org.w3c.dom.DOMImplementation; import org.w3c.dom.Node; import org.w3c.dom.Text; import org.xml.sax.Attributes; -import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.Attributes2; diff --git a/libjava/gnu/xml/dom/DomCharacterData.java b/libjava/gnu/xml/dom/DomCharacterData.java index fc4313e5fe5..e5cc231891d 100644 --- a/libjava/gnu/xml/dom/DomCharacterData.java +++ b/libjava/gnu/xml/dom/DomCharacterData.java @@ -39,8 +39,6 @@ package gnu.xml.dom; import org.w3c.dom.CharacterData; import org.w3c.dom.DOMException; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.w3c.dom.events.MutationEvent; diff --git a/libjava/gnu/xml/dom/DomDocument.java b/libjava/gnu/xml/dom/DomDocument.java index 90885716836..d8ccc9d821c 100644 --- a/libjava/gnu/xml/dom/DomDocument.java +++ b/libjava/gnu/xml/dom/DomDocument.java @@ -54,7 +54,6 @@ import org.w3c.dom.Entity; import org.w3c.dom.EntityReference; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.w3c.dom.Notation; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; diff --git a/libjava/gnu/xml/dom/DomDocumentBuilder.java b/libjava/gnu/xml/dom/DomDocumentBuilder.java index 16ea2ae5dba..d321653ed73 100644 --- a/libjava/gnu/xml/dom/DomDocumentBuilder.java +++ b/libjava/gnu/xml/dom/DomDocumentBuilder.java @@ -40,7 +40,6 @@ package gnu.xml.dom; import java.io.InputStream; import java.io.IOException; import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.ParserConfigurationException; import org.w3c.dom.Document; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMImplementation; diff --git a/libjava/gnu/xml/dom/DomIterator.java b/libjava/gnu/xml/dom/DomIterator.java index fb05d93084c..bb1f2cff2af 100644 --- a/libjava/gnu/xml/dom/DomIterator.java +++ b/libjava/gnu/xml/dom/DomIterator.java @@ -37,8 +37,6 @@ exception statement from your version. */ package gnu.xml.dom; -import java.util.Vector; - import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.events.Event; diff --git a/libjava/gnu/xml/dom/DomNode.java b/libjava/gnu/xml/dom/DomNode.java index 74535eef656..20a62c53ba5 100644 --- a/libjava/gnu/xml/dom/DomNode.java +++ b/libjava/gnu/xml/dom/DomNode.java @@ -40,7 +40,6 @@ package gnu.xml.dom; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.xml.XMLConstants; import org.w3c.dom.Document; import org.w3c.dom.DOMException; @@ -58,7 +57,6 @@ import org.w3c.dom.events.EventTarget; import org.w3c.dom.events.MutationEvent; import org.w3c.dom.traversal.NodeFilter; import org.w3c.dom.traversal.NodeIterator; -import org.w3c.dom.traversal.TreeWalker; /** *

"Node", "EventTarget", and "DocumentEvent" implementation. diff --git a/libjava/gnu/xml/dom/DomXPathExpression.java b/libjava/gnu/xml/dom/DomXPathExpression.java index d92670d7eff..c22f29413ee 100644 --- a/libjava/gnu/xml/dom/DomXPathExpression.java +++ b/libjava/gnu/xml/dom/DomXPathExpression.java @@ -37,7 +37,6 @@ exception statement from your version. */ package gnu.xml.dom; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/libjava/gnu/xml/dom/DomXPathResult.java b/libjava/gnu/xml/dom/DomXPathResult.java index 1cc49d8f733..5c57e25e204 100644 --- a/libjava/gnu/xml/dom/DomXPathResult.java +++ b/libjava/gnu/xml/dom/DomXPathResult.java @@ -39,10 +39,8 @@ package gnu.xml.dom; import java.util.Collection; import java.util.Iterator; -import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.xpath.XPathException; -import org.w3c.dom.xpath.XPathNSResolver; import org.w3c.dom.xpath.XPathResult; /** diff --git a/libjava/gnu/xml/dom/JAXPFactory.java b/libjava/gnu/xml/dom/JAXPFactory.java index 42712081094..3602ef6b9ab 100644 --- a/libjava/gnu/xml/dom/JAXPFactory.java +++ b/libjava/gnu/xml/dom/JAXPFactory.java @@ -40,7 +40,6 @@ package gnu.xml.dom; import java.io.IOException; import org.w3c.dom.Document; -import org.w3c.dom.DocumentType; import org.w3c.dom.DOMImplementation; import org.xml.sax.EntityResolver; diff --git a/libjava/gnu/xml/pipeline/CallFilter.java b/libjava/gnu/xml/pipeline/CallFilter.java index 0d8585991df..da1a2e9c102 100644 --- a/libjava/gnu/xml/pipeline/CallFilter.java +++ b/libjava/gnu/xml/pipeline/CallFilter.java @@ -37,11 +37,18 @@ exception statement from your version. */ package gnu.xml.pipeline; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.io.Writer; -import org.xml.sax.*; -import org.xml.sax.ext.*; +import org.xml.sax.DTDHandler; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; import gnu.xml.util.Resolver; diff --git a/libjava/gnu/xml/pipeline/DomConsumer.java b/libjava/gnu/xml/pipeline/DomConsumer.java index 17fdeeb3453..e3136093c50 100644 --- a/libjava/gnu/xml/pipeline/DomConsumer.java +++ b/libjava/gnu/xml/pipeline/DomConsumer.java @@ -37,17 +37,30 @@ exception statement from your version. */ package gnu.xml.pipeline; -import java.util.Hashtable; - -import org.w3c.dom.*; -import org.xml.sax.*; -import org.xml.sax.ext.DeclHandler; -import org.xml.sax.ext.LexicalHandler; -import org.xml.sax.helpers.AttributesImpl; - import gnu.xml.aelfred2.ContentHandler2; import gnu.xml.util.DomParser; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.DTDHandler; +import org.xml.sax.ErrorHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXParseException; +import org.xml.sax.ext.DeclHandler; +import org.xml.sax.ext.LexicalHandler; +import org.xml.sax.helpers.AttributesImpl; +import org.w3c.dom.Attr; +import org.w3c.dom.CDATASection; +import org.w3c.dom.CharacterData; +import org.w3c.dom.Document; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Element; +import org.w3c.dom.EntityReference; +import org.w3c.dom.Node; +import org.w3c.dom.ProcessingInstruction; +import org.w3c.dom.Text; /** * This consumer builds a DOM Document from its input, acting either as a diff --git a/libjava/gnu/xml/pipeline/LinkFilter.java b/libjava/gnu/xml/pipeline/LinkFilter.java index 28a45017046..465103b2251 100644 --- a/libjava/gnu/xml/pipeline/LinkFilter.java +++ b/libjava/gnu/xml/pipeline/LinkFilter.java @@ -43,7 +43,6 @@ import java.util.Enumeration; import java.util.Vector; import org.xml.sax.Attributes; -import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/libjava/gnu/xml/pipeline/NSFilter.java b/libjava/gnu/xml/pipeline/NSFilter.java index 9e8a6436503..63e167361c1 100644 --- a/libjava/gnu/xml/pipeline/NSFilter.java +++ b/libjava/gnu/xml/pipeline/NSFilter.java @@ -37,16 +37,17 @@ exception statement from your version. */ package gnu.xml.pipeline; -import java.util.EmptyStackException; import java.util.Enumeration; import java.util.Stack; -import org.xml.sax.*; -import org.xml.sax.ext.*; +import org.xml.sax.Attributes; +import org.xml.sax.ErrorHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.NamespaceSupport; - /** * This filter ensures that element and attribute names are properly prefixed, * and that such prefixes are declared. Such data is critical for operations diff --git a/libjava/gnu/xml/pipeline/TeeConsumer.java b/libjava/gnu/xml/pipeline/TeeConsumer.java index 6d3227eda11..922e79cf29f 100644 --- a/libjava/gnu/xml/pipeline/TeeConsumer.java +++ b/libjava/gnu/xml/pipeline/TeeConsumer.java @@ -37,11 +37,15 @@ exception statement from your version. */ package gnu.xml.pipeline; -import java.io.IOException; -import org.xml.sax.*; -import org.xml.sax.ext.*; -//import gnu.xml.util; - +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.DTDHandler; +import org.xml.sax.ErrorHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.ext.DeclHandler; +import org.xml.sax.ext.LexicalHandler; /** * Fans its events out to two other consumers, a "tee" filter stage in an diff --git a/libjava/gnu/xml/pipeline/ValidationConsumer.java b/libjava/gnu/xml/pipeline/ValidationConsumer.java index e73c0ffe21c..719270e0754 100644 --- a/libjava/gnu/xml/pipeline/ValidationConsumer.java +++ b/libjava/gnu/xml/pipeline/ValidationConsumer.java @@ -37,8 +37,9 @@ exception statement from your version. */ package gnu.xml.pipeline; -import java.io.*; - +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; import java.util.EmptyStackException; import java.util.Enumeration; import java.util.Hashtable; @@ -46,11 +47,16 @@ import java.util.Stack; import java.util.StringTokenizer; import java.util.Vector; -import org.xml.sax.*; -import org.xml.sax.ext.*; +import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; - /** * This class checks SAX2 events to report validity errors; it works as * both a filter and a terminus on an event pipeline. It relies on the diff --git a/libjava/gnu/xml/pipeline/WellFormednessFilter.java b/libjava/gnu/xml/pipeline/WellFormednessFilter.java index 3047ae3567f..4f3f200c007 100644 --- a/libjava/gnu/xml/pipeline/WellFormednessFilter.java +++ b/libjava/gnu/xml/pipeline/WellFormednessFilter.java @@ -40,10 +40,11 @@ package gnu.xml.pipeline; import java.util.EmptyStackException; import java.util.Stack; -import gnu.xml.aelfred2.SAXDriver; -import org.xml.sax.*; -import org.xml.sax.ext.*; - +import org.xml.sax.Attributes; +import org.xml.sax.ErrorHandler; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * This filter reports fatal exceptions in the case of event streams that diff --git a/libjava/gnu/xml/pipeline/XIncludeFilter.java b/libjava/gnu/xml/pipeline/XIncludeFilter.java index efa05d942f9..042cadda613 100644 --- a/libjava/gnu/xml/pipeline/XIncludeFilter.java +++ b/libjava/gnu/xml/pipeline/XIncludeFilter.java @@ -42,7 +42,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.Enumeration; import java.util.Hashtable; import java.util.Stack; import java.util.Vector; diff --git a/libjava/gnu/xml/pipeline/XsltFilter.java b/libjava/gnu/xml/pipeline/XsltFilter.java index b1bebbe98a5..9f77f9937bf 100644 --- a/libjava/gnu/xml/pipeline/XsltFilter.java +++ b/libjava/gnu/xml/pipeline/XsltFilter.java @@ -44,7 +44,6 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.sax.*; import javax.xml.transform.stream.StreamSource; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.java b/libjava/gnu/xml/transform/ApplyImportsNode.java index 2b286550484..39d9dea9af6 100644 --- a/libjava/gnu/xml/transform/ApplyImportsNode.java +++ b/libjava/gnu/xml/transform/ApplyImportsNode.java @@ -37,15 +37,9 @@ exception statement from your version. */ package gnu.xml.transform; -import java.util.Collection; -import java.util.Iterator; -import java.text.DecimalFormat; import javax.xml.namespace.QName; import javax.xml.transform.TransformerException; -import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.w3c.dom.Text; -import gnu.xml.xpath.Expr; /** * A template node representing an XSLT apply-imports instruction. diff --git a/libjava/gnu/xml/transform/Bindings.java b/libjava/gnu/xml/transform/Bindings.java index f898a7288b0..75a8a165138 100644 --- a/libjava/gnu/xml/transform/Bindings.java +++ b/libjava/gnu/xml/transform/Bindings.java @@ -45,12 +45,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Map; import javax.xml.namespace.QName; -import javax.xml.transform.TransformerException; import javax.xml.xpath.XPathVariableResolver; -import org.w3c.dom.Document; -import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; -import gnu.xml.xpath.Expr; /** * The set of variable bindings in effect for a stylesheet. diff --git a/libjava/gnu/xml/transform/DocumentFunction.java b/libjava/gnu/xml/transform/DocumentFunction.java index 03f22b4ced2..78862dc9e57 100644 --- a/libjava/gnu/xml/transform/DocumentFunction.java +++ b/libjava/gnu/xml/transform/DocumentFunction.java @@ -37,22 +37,16 @@ exception statement from your version. */ package gnu.xml.transform; -import java.io.InputStream; -import java.io.IOException; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.TreeSet; -import javax.xml.transform.ErrorListener; import javax.xml.transform.TransformerException; -import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; import javax.xml.xpath.XPathFunction; import javax.xml.xpath.XPathFunctionException; -import org.w3c.dom.Document; import org.w3c.dom.Node; import gnu.xml.xpath.Constant; import gnu.xml.xpath.Expr; diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.java b/libjava/gnu/xml/transform/FormatNumberFunction.java index 73c5af43a2b..393cb99ffea 100644 --- a/libjava/gnu/xml/transform/FormatNumberFunction.java +++ b/libjava/gnu/xml/transform/FormatNumberFunction.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.xml.transform; import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/libjava/gnu/xml/transform/NodeNumberNode.java b/libjava/gnu/xml/transform/NodeNumberNode.java index 76f8d7eea3d..aae86c6f2a3 100644 --- a/libjava/gnu/xml/transform/NodeNumberNode.java +++ b/libjava/gnu/xml/transform/NodeNumberNode.java @@ -43,13 +43,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import javax.xml.transform.TransformerException; -import org.w3c.dom.Document; import org.w3c.dom.Node; import gnu.xml.xpath.Expr; -import gnu.xml.xpath.NodeTypeTest; import gnu.xml.xpath.Pattern; import gnu.xml.xpath.Selector; -import gnu.xml.xpath.Test; import gnu.xml.xpath.UnionExpr; /** diff --git a/libjava/gnu/xml/transform/NumberNode.java b/libjava/gnu/xml/transform/NumberNode.java index 0970ac9733d..b01b983dff1 100644 --- a/libjava/gnu/xml/transform/NumberNode.java +++ b/libjava/gnu/xml/transform/NumberNode.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.xml.transform; import javax.xml.transform.TransformerException; -import org.w3c.dom.Document; import org.w3c.dom.Node; import gnu.xml.xpath.Expr; diff --git a/libjava/gnu/xml/transform/Stylesheet.java b/libjava/gnu/xml/transform/Stylesheet.java index 80f5781e2fd..6250fd542ef 100644 --- a/libjava/gnu/xml/transform/Stylesheet.java +++ b/libjava/gnu/xml/transform/Stylesheet.java @@ -58,7 +58,6 @@ import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; -import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFunction; import javax.xml.xpath.XPathFunctionResolver; import javax.xml.xpath.XPathExpressionException; @@ -68,7 +67,6 @@ import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.w3c.dom.Text; import org.w3c.dom.UserDataHandler; import gnu.xml.xpath.Expr; diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.java b/libjava/gnu/xml/transform/SystemPropertyFunction.java index 3d95d21d585..03518e9cb89 100644 --- a/libjava/gnu/xml/transform/SystemPropertyFunction.java +++ b/libjava/gnu/xml/transform/SystemPropertyFunction.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.xml.transform; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.xml.namespace.QName; import javax.xml.xpath.XPathFunction; diff --git a/libjava/gnu/xml/transform/Template.java b/libjava/gnu/xml/transform/Template.java index 6aaa4c1c69f..0e7c67a7e52 100644 --- a/libjava/gnu/xml/transform/Template.java +++ b/libjava/gnu/xml/transform/Template.java @@ -39,9 +39,7 @@ package gnu.xml.transform; import java.io.PrintStream; import javax.xml.namespace.QName; -import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; -import javax.xml.xpath.XPathExpressionException; import org.w3c.dom.Node; import gnu.xml.xpath.Expr; import gnu.xml.xpath.NameTest; diff --git a/libjava/gnu/xml/transform/TemplatesImpl.java b/libjava/gnu/xml/transform/TemplatesImpl.java index a7403e9ee2c..173fb036fb8 100644 --- a/libjava/gnu/xml/transform/TemplatesImpl.java +++ b/libjava/gnu/xml/transform/TemplatesImpl.java @@ -38,12 +38,9 @@ exception statement from your version. */ package gnu.xml.transform; import java.util.Properties; -import javax.xml.transform.ErrorListener; -import javax.xml.transform.Source; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.URIResolver; /** * GNU precompiled stylesheet implementation. diff --git a/libjava/gnu/xml/transform/TransformerImpl.java b/libjava/gnu/xml/transform/TransformerImpl.java index fb4632e3f38..c0af0fca440 100644 --- a/libjava/gnu/xml/transform/TransformerImpl.java +++ b/libjava/gnu/xml/transform/TransformerImpl.java @@ -48,9 +48,6 @@ import java.net.UnknownServiceException; import java.net.URL; import java.net.URLConnection; import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; import java.util.Properties; import javax.xml.transform.ErrorListener; import javax.xml.transform.OutputKeys; @@ -67,7 +64,6 @@ import javax.xml.transform.stream.StreamResult; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.DOMImplementation; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.Text; import org.xml.sax.ContentHandler; @@ -76,8 +72,6 @@ import org.xml.sax.ext.LexicalHandler; import gnu.xml.dom.DomDoctype; import gnu.xml.dom.DomDocument; import gnu.xml.dom.ls.WriterOutputStream; -import gnu.xml.xpath.Expr; -import gnu.xml.xpath.Root; /** * The transformation process for a given stylesheet. diff --git a/libjava/gnu/xml/transform/ValueOfNode.java b/libjava/gnu/xml/transform/ValueOfNode.java index 6027052e9e1..9eb2fde5d3a 100644 --- a/libjava/gnu/xml/transform/ValueOfNode.java +++ b/libjava/gnu/xml/transform/ValueOfNode.java @@ -37,9 +37,6 @@ exception statement from your version. */ package gnu.xml.transform; -import java.util.Collection; -import java.util.Iterator; -import java.text.DecimalFormat; import javax.xml.namespace.QName; import javax.xml.transform.TransformerException; import org.w3c.dom.Document; diff --git a/libjava/gnu/xml/transform/XSLURIResolver.java b/libjava/gnu/xml/transform/XSLURIResolver.java index 2603cdd831f..f0f417202fb 100644 --- a/libjava/gnu/xml/transform/XSLURIResolver.java +++ b/libjava/gnu/xml/transform/XSLURIResolver.java @@ -41,7 +41,6 @@ import java.io.File; import java.io.InputStream; import java.io.IOException; import java.io.Reader; -import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; diff --git a/libjava/gnu/xml/util/DoParse.java b/libjava/gnu/xml/util/DoParse.java index 23721de7657..6f255c80453 100644 --- a/libjava/gnu/xml/util/DoParse.java +++ b/libjava/gnu/xml/util/DoParse.java @@ -37,28 +37,22 @@ exception statement from your version. */ package gnu.xml.util; -import java.io.*; +import java.io.IOException; -import org.xml.sax.*; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; -import org.xml.sax.ext.*; -// import gnu.xml.pipeline.*; -// Added imports directly to fix a GCJ problem. -import gnu.xml.pipeline.CallFilter; -import gnu.xml.pipeline.DomConsumer; import gnu.xml.pipeline.EventConsumer; import gnu.xml.pipeline.EventFilter; -import gnu.xml.pipeline.LinkFilter; import gnu.xml.pipeline.NSFilter; import gnu.xml.pipeline.PipelineFactory; import gnu.xml.pipeline.TeeConsumer; -import gnu.xml.pipeline.TextConsumer; import gnu.xml.pipeline.ValidationConsumer; import gnu.xml.pipeline.WellFormednessFilter; -import gnu.xml.pipeline.XIncludeFilter; -import gnu.xml.pipeline.XsltFilter; - /** * This class provides a driver which may be invoked from the command line diff --git a/libjava/gnu/xml/util/Resolver.java b/libjava/gnu/xml/util/Resolver.java index 4ca078774ec..97256c3c861 100644 --- a/libjava/gnu/xml/util/Resolver.java +++ b/libjava/gnu/xml/util/Resolver.java @@ -37,13 +37,13 @@ exception statement from your version. */ package gnu.xml.util; -import java.io.*; - +import java.io.File; +import java.io.IOException; import java.util.Dictionary; -import java.util.Hashtable; - -import org.xml.sax.*; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** * Utility implementation of a SAX resolver, which can be used to improve diff --git a/libjava/gnu/xml/xpath/Expr.java b/libjava/gnu/xml/xpath/Expr.java index 6a933c8c598..fcfae52addc 100644 --- a/libjava/gnu/xml/xpath/Expr.java +++ b/libjava/gnu/xml/xpath/Expr.java @@ -58,9 +58,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/libjava/gnu/xml/xpath/FunctionCall.java b/libjava/gnu/xml/xpath/FunctionCall.java index 2c77b586903..35eacb51678 100644 --- a/libjava/gnu/xml/xpath/FunctionCall.java +++ b/libjava/gnu/xml/xpath/FunctionCall.java @@ -38,7 +38,6 @@ exception statement from your version. */ package gnu.xml.xpath; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; import javax.xml.namespace.QName; diff --git a/libjava/gnu/xml/xpath/RelationalExpr.java b/libjava/gnu/xml/xpath/RelationalExpr.java index e039cc1c600..fcdc932ab38 100644 --- a/libjava/gnu/xml/xpath/RelationalExpr.java +++ b/libjava/gnu/xml/xpath/RelationalExpr.java @@ -37,7 +37,6 @@ exception statement from your version. */ package gnu.xml.xpath; -import java.util.Collection; import org.w3c.dom.Node; /** diff --git a/libjava/gnu/xml/xpath/Selector.java b/libjava/gnu/xml/xpath/Selector.java index 5431cbe1fdd..5fd45b9117a 100644 --- a/libjava/gnu/xml/xpath/Selector.java +++ b/libjava/gnu/xml/xpath/Selector.java @@ -39,7 +39,6 @@ package gnu.xml.xpath; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -48,7 +47,6 @@ import javax.xml.XMLConstants; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * A single component of a location path. diff --git a/libjava/gnu/xml/xpath/XPathParser.java b/libjava/gnu/xml/xpath/XPathParser.java index 973919bae69..188cfb5bf66 100644 --- a/libjava/gnu/xml/xpath/XPathParser.java +++ b/libjava/gnu/xml/xpath/XPathParser.java @@ -43,7 +43,6 @@ package gnu.xml.xpath; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.xpath.XPathFunctionResolver;