Cookie.java, [...]: Reworked import statements, fixed modifier order and some little formatting issues.
2005-02-17 Andrew John Hughes <gnu_andrew@member.fsf.org> Michael Koch <konqueror@gmx.de> * 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 <konqueror@gmx.de> From-SVN: r95177
This commit is contained in:
parent
59fc63fcf8
commit
c38e914edb
@ -1,3 +1,69 @@
|
||||
2005-02-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
|
||||
Michael Koch <konqueror@gmx.de>
|
||||
|
||||
* 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 <kaz@maczuka.gcd.org>
|
||||
|
||||
* java/nio/ByteBufferImpl.java (compact):
|
||||
|
@ -38,7 +38,6 @@ exception statement from your version. */
|
||||
|
||||
package gnu.java.net.protocol.http;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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){
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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).
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p> "Node", "EventTarget", and "DocumentEvent" implementation.
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
/**
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 <code>apply-imports</code> instruction.
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
/**
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -37,7 +37,6 @@ exception statement from your version. */
|
||||
|
||||
package gnu.xml.xpath;
|
||||
|
||||
import java.util.Collection;
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
/**
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user