Index: ./org/jdom/adapters/AbstractDOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/AbstractDOMAdapter.java,v
retrieving revision 1.17
diff -c -r1.17 AbstractDOMAdapter.java
*** ./org/jdom/adapters/AbstractDOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.17
--- ./org/jdom/adapters/AbstractDOMAdapter.java	4 Apr 2003 12:45:22 -0000
***************
*** 56,73 ****
  
  package org.jdom.adapters;
  
- import java.io.IOException;
- import java.io.FileInputStream;
  import java.io.File;
  import java.io.InputStream;
! import java.lang.reflect.*;
  
  import org.w3c.dom.Document;
  import org.w3c.dom.DocumentType;
- import org.w3c.dom.DOMImplementation;
- 
- import org.jdom.*;
- import org.jdom.JDOMException;
  
  /**
   * <b><code>AbstractDOMAdapter</code></b>.
--- 56,72 ----
  
  package org.jdom.adapters;
  
  import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.IOException;
  import java.io.InputStream;
! import java.lang.reflect.Method;
  
+ import org.jdom.DocType;
+ import org.jdom.JDOMException;
+ import org.w3c.dom.DOMImplementation;
  import org.w3c.dom.Document;
  import org.w3c.dom.DocumentType;
  
  /**
   * <b><code>AbstractDOMAdapter</code></b>.
Index: ./org/jdom/adapters/CrimsonDOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/CrimsonDOMAdapter.java,v
retrieving revision 1.12
diff -c -r1.12 CrimsonDOMAdapter.java
*** ./org/jdom/adapters/CrimsonDOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.12
--- ./org/jdom/adapters/CrimsonDOMAdapter.java	4 Apr 2003 12:45:22 -0000
***************
*** 56,72 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.w3c.dom.Document;
- import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
- 
- import org.jdom.JDOMException;
  
  /**
   * <b><code>CrimsonDOMAdapater</code></b>.
--- 56,69 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
+ import org.jdom.JDOMException;
  import org.w3c.dom.Document;
  import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>CrimsonDOMAdapater</code></b>.
Index: ./org/jdom/adapters/DOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/DOMAdapter.java,v
retrieving revision 1.18
diff -c -r1.18 DOMAdapter.java
*** ./org/jdom/adapters/DOMAdapter.java	17 May 2002 05:49:14 -0000	1.18
--- ./org/jdom/adapters/DOMAdapter.java	4 Apr 2003 12:45:22 -0000
***************
*** 56,70 ****
  
  package org.jdom.adapters;
  
- import java.io.IOException;
- import java.io.FileInputStream;
  import java.io.File;
  import java.io.InputStream;
  
- import org.w3c.dom.Document;
- 
  import org.jdom.DocType;
  import org.jdom.JDOMException;
  
  /**
   * <b><code>DOMAdapter</code></b>.
--- 56,68 ----
  
  package org.jdom.adapters;
  
  import java.io.File;
+ import java.io.IOException;
  import java.io.InputStream;
  
  import org.jdom.DocType;
  import org.jdom.JDOMException;
+ import org.w3c.dom.Document;
  
  /**
   * <b><code>DOMAdapter</code></b>.
Index: ./org/jdom/adapters/JAXPDOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/JAXPDOMAdapter.java,v
retrieving revision 1.9
diff -c -r1.9 JAXPDOMAdapter.java
*** ./org/jdom/adapters/JAXPDOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.9
--- ./org/jdom/adapters/JAXPDOMAdapter.java	4 Apr 2003 12:45:22 -0000
***************
*** 56,73 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
- import org.w3c.dom.Document;
- import org.xml.sax.InputSource;
- import org.xml.sax.SAXParseException;
- 
  import org.jdom.JDOMException;
  import org.jdom.input.BuilderErrorHandler;
  
  /**
   * <b><code>JAXPDOMAdapater</code></b>.
--- 56,69 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.jdom.JDOMException;
  import org.jdom.input.BuilderErrorHandler;
+ import org.w3c.dom.Document;
  
  /**
   * <b><code>JAXPDOMAdapater</code></b>.
Index: ./org/jdom/adapters/OracleV1DOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/OracleV1DOMAdapter.java,v
retrieving revision 1.15
diff -c -r1.15 OracleV1DOMAdapter.java
*** ./org/jdom/adapters/OracleV1DOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.15
--- ./org/jdom/adapters/OracleV1DOMAdapter.java	4 Apr 2003 12:45:23 -0000
***************
*** 56,72 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
- 
- import org.jdom.JDOMException;
  
  /**
   * <b><code>OracleV1DOMAdapter</code></b>.
--- 56,70 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
+ import org.jdom.JDOMException;
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>OracleV1DOMAdapter</code></b>.
Index: ./org/jdom/adapters/OracleV2DOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/OracleV2DOMAdapter.java,v
retrieving revision 1.14
diff -c -r1.14 OracleV2DOMAdapter.java
*** ./org/jdom/adapters/OracleV2DOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.14
--- ./org/jdom/adapters/OracleV2DOMAdapter.java	4 Apr 2003 12:45:23 -0000
***************
*** 56,72 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
- 
- import org.jdom.JDOMException;
  
  /**
   * <b><code>OracleV2DOMAdapter</code></b>.
--- 56,70 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
+ import org.jdom.JDOMException;
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>OracleV2DOMAdapter</code></b>.
Index: ./org/jdom/adapters/XercesDOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/XercesDOMAdapter.java,v
retrieving revision 1.15
diff -c -r1.15 XercesDOMAdapter.java
*** ./org/jdom/adapters/XercesDOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.15
--- ./org/jdom/adapters/XercesDOMAdapter.java	4 Apr 2003 12:45:23 -0000
***************
*** 56,75 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.InputSource;
- import org.xml.sax.SAXException;
  import org.xml.sax.SAXParseException;
- 
- import org.jdom.JDOMException;
- import org.jdom.input.BuilderErrorHandler;
  
  /**
   * <b><code>XercesDOMAdapater</code></b>.
--- 56,72 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
+ import org.jdom.JDOMException;
+ import org.jdom.input.BuilderErrorHandler;
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>XercesDOMAdapater</code></b>.
Index: ./org/jdom/adapters/XML4JDOMAdapter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/adapters/XML4JDOMAdapter.java,v
retrieving revision 1.14
diff -c -r1.14 XML4JDOMAdapter.java
*** ./org/jdom/adapters/XML4JDOMAdapter.java	29 Apr 2002 13:38:16 -0000	1.14
--- ./org/jdom/adapters/XML4JDOMAdapter.java	4 Apr 2003 12:45:23 -0000
***************
*** 56,75 ****
  
  package org.jdom.adapters;
  
- import java.io.FileInputStream;
- import java.io.InputStream;
  import java.io.IOException;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.InputSource;
- import org.xml.sax.SAXException;
  import org.xml.sax.SAXParseException;
- 
- import org.jdom.JDOMException;
- import org.jdom.input.BuilderErrorHandler;
  
  /**
   * <b><code>XML4JDOMAdapter</code></b>.
--- 56,72 ----
  
  package org.jdom.adapters;
  
  import java.io.IOException;
+ import java.io.InputStream;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  
+ import org.jdom.JDOMException;
+ import org.jdom.input.BuilderErrorHandler;
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>XML4JDOMAdapter</code></b>.
Index: ./org/jdom/Attribute.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/Attribute.java,v
retrieving revision 1.44
diff -c -r1.44 Attribute.java
*** ./org/jdom/Attribute.java	16 May 2002 08:08:25 -0000	1.44
--- ./org/jdom/Attribute.java	4 Apr 2003 12:45:23 -0000
***************
*** 56,65 ****
  
  package org.jdom;
  
- import java.io.Serializable;
- import java.io.ObjectOutputStream;
- import java.io.ObjectInputStream;
  import java.io.IOException;
  
  /**
   * <code>Attribute</code> defines behavior for an XML
--- 56,65 ----
  
  package org.jdom;
  
  import java.io.IOException;
+ import java.io.ObjectInputStream;
+ import java.io.ObjectOutputStream;
+ import java.io.Serializable;
  
  /**
   * <code>Attribute</code> defines behavior for an XML
Index: ./org/jdom/AttributeList.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/AttributeList.java,v
retrieving revision 1.13
diff -c -r1.13 AttributeList.java
*** ./org/jdom/AttributeList.java	29 Apr 2002 13:38:15 -0000	1.13
--- ./org/jdom/AttributeList.java	4 Apr 2003 12:45:24 -0000
***************
*** 56,64 ****
  
  package org.jdom;
  
! import java.util.*;
! 
! import org.jdom.filter.Filter;
  
  /**
   * <code>AttributeList</code> represents legal JDOM <code>Attribute</code>
--- 56,65 ----
  
  package org.jdom;
  
! import java.util.AbstractList;
! import java.util.Collection;
! import java.util.Iterator;
! import java.util.List;
  
  /**
   * <code>AttributeList</code> represents legal JDOM <code>Attribute</code>
Index: ./org/jdom/ContentList.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/ContentList.java,v
retrieving revision 1.19
diff -c -r1.19 ContentList.java
*** ./org/jdom/ContentList.java	2 Apr 2003 01:56:58 -0000	1.19
--- ./org/jdom/ContentList.java	4 Apr 2003 12:45:25 -0000
***************
*** 56,63 ****
  
  package org.jdom;
  
! import java.util.*;
! import java.util.NoSuchElementException; // mysteriously helps JDK 1.1.x builds
  
  import org.jdom.filter.Filter;
  
--- 56,68 ----
  
  package org.jdom;
  
! import java.util.AbstractList;
! import java.util.Collection;
! import java.util.ConcurrentModificationException;
! import java.util.Iterator;
! import java.util.List;
! import java.util.ListIterator;
! import java.util.NoSuchElementException;
  
  import org.jdom.filter.Filter;
  
Index: ./org/jdom/Document.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/Document.java,v
retrieving revision 1.61
diff -c -r1.61 Document.java
*** ./org/jdom/Document.java	16 May 2002 16:32:00 -0000	1.61
--- ./org/jdom/Document.java	4 Apr 2003 12:45:25 -0000
***************
*** 57,63 ****
  package org.jdom;
  
  import java.io.Serializable;
! import java.util.*;
  
  import org.jdom.filter.Filter;
  
--- 57,63 ----
  package org.jdom;
  
  import java.io.Serializable;
! import java.util.List;
  
  import org.jdom.filter.Filter;
  
Index: ./org/jdom/Element.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/Element.java,v
retrieving revision 1.127
diff -c -r1.127 Element.java
*** ./org/jdom/Element.java	2 Apr 2003 10:17:30 -0000	1.127
--- ./org/jdom/Element.java	4 Apr 2003 12:45:26 -0000
***************
*** 56,63 ****
  
  package org.jdom;
  
! import java.io.*;
! import java.util.*;
  
  import org.jdom.filter.ElementFilter;
  import org.jdom.filter.Filter;
--- 56,70 ----
  
  package org.jdom;
  
! import java.io.IOException;
! import java.io.ObjectInputStream;
! import java.io.ObjectOutputStream;
! import java.io.Serializable;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Iterator;
! import java.util.List;
! import java.util.ListIterator;
  
  import org.jdom.filter.ElementFilter;
  import org.jdom.filter.Filter;
Index: ./org/jdom/JDOMException.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/JDOMException.java,v
retrieving revision 1.17
diff -c -r1.17 JDOMException.java
*** ./org/jdom/JDOMException.java	13 May 2002 12:57:09 -0000	1.17
--- ./org/jdom/JDOMException.java	4 Apr 2003 12:45:26 -0000
***************
*** 58,68 ****
  
  import java.io.PrintStream;
  import java.io.PrintWriter;
- import java.lang.reflect.Method;
- import java.sql.SQLException;
  import java.lang.reflect.InvocationTargetException;
! import java.lang.ExceptionInInitializerError;
  import java.rmi.RemoteException;
  import org.xml.sax.SAXException;
  
  /**
--- 58,68 ----
  
  import java.io.PrintStream;
  import java.io.PrintWriter;
  import java.lang.reflect.InvocationTargetException;
! import java.lang.reflect.Method;
  import java.rmi.RemoteException;
+ import java.sql.SQLException;
+ 
  import org.xml.sax.SAXException;
  
  /**
Index: ./org/jdom/Namespace.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/Namespace.java,v
retrieving revision 1.37
diff -c -r1.37 Namespace.java
*** ./org/jdom/Namespace.java	26 Jun 2002 01:44:26 -0000	1.37
--- ./org/jdom/Namespace.java	4 Apr 2003 12:45:27 -0000
***************
*** 56,62 ****
  
  package org.jdom;
  
! import java.util.*;
  
  /**
   * <code>Namespace</code> defines both a factory for
--- 56,62 ----
  
  package org.jdom;
  
! import java.util.HashMap;
  
  /**
   * <code>Namespace</code> defines both a factory for
Index: ./org/jdom/ProcessingInstruction.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/ProcessingInstruction.java,v
retrieving revision 1.33
diff -c -r1.33 ProcessingInstruction.java
*** ./org/jdom/ProcessingInstruction.java	29 Apr 2002 13:38:16 -0000	1.33
--- ./org/jdom/ProcessingInstruction.java	4 Apr 2003 12:45:27 -0000
***************
*** 57,63 ****
  package org.jdom;
  
  import java.io.Serializable;
! import java.util.*;
  
  /**
   * <code>ProcessingInstruction</code> defines behavior for an
--- 57,68 ----
  package org.jdom;
  
  import java.io.Serializable;
! import java.util.ArrayList;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
  
  /**
   * <code>ProcessingInstruction</code> defines behavior for an
Index: ./org/jdom/Verifier.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/Verifier.java,v
retrieving revision 1.41
diff -c -r1.41 Verifier.java
*** ./org/jdom/Verifier.java	22 Jul 2002 12:22:12 -0000	1.41
--- ./org/jdom/Verifier.java	4 Apr 2003 12:45:28 -0000
***************
*** 56,62 ****
  
  package org.jdom;
  
! import java.util.*;
  
  /**
   * <code>Verifier</code> handles XML checks on names, data, and other
--- 56,63 ----
  
  package org.jdom;
  
! import java.util.Iterator;
! import java.util.List;
  
  /**
   * <code>Verifier</code> handles XML checks on names, data, and other
Index: ./org/jdom/filter/ContentFilter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/filter/ContentFilter.java,v
retrieving revision 1.6
diff -c -r1.6 ContentFilter.java
*** ./org/jdom/filter/ContentFilter.java	2 Apr 2003 01:56:58 -0000	1.6
--- ./org/jdom/filter/ContentFilter.java	4 Apr 2003 12:45:31 -0000
***************
*** 56,62 ****
  
  package org.jdom.filter;
  
! import org.jdom.*;
  
  /**
   * <code>ContentFilter</code> is a general purpose <code>Filter</code>
--- 56,68 ----
  
  package org.jdom.filter;
  
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
  
  /**
   * <code>ContentFilter</code> is a general purpose <code>Filter</code>
Index: ./org/jdom/filter/ElementFilter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/filter/ElementFilter.java,v
retrieving revision 1.8
diff -c -r1.8 ElementFilter.java
*** ./org/jdom/filter/ElementFilter.java	2 Apr 2003 01:56:58 -0000	1.8
--- ./org/jdom/filter/ElementFilter.java	4 Apr 2003 12:45:31 -0000
***************
*** 56,62 ****
  
  package org.jdom.filter;
  
! import org.jdom.*;
  
  /**
   * The <code>ElementFilter</code> when applied to a <code>FilterList</code>
--- 56,63 ----
  
  package org.jdom.filter;
  
! import org.jdom.Element;
! import org.jdom.Namespace;
  
  /**
   * The <code>ElementFilter</code> when applied to a <code>FilterList</code>
Index: ./org/jdom/filter/Filter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/filter/Filter.java,v
retrieving revision 1.5
diff -c -r1.5 Filter.java
*** ./org/jdom/filter/Filter.java	2 Apr 2003 01:56:58 -0000	1.5
--- ./org/jdom/filter/Filter.java	4 Apr 2003 12:45:31 -0000
***************
*** 56,62 ****
  
  package org.jdom.filter;
  
- import org.jdom.*;
  
  /**
   * Classes which wish to modify the behaviour of the FilterList
--- 56,61 ----
Index: ./org/jdom/input/BuilderErrorHandler.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/BuilderErrorHandler.java,v
retrieving revision 1.10
diff -c -r1.10 BuilderErrorHandler.java
*** ./org/jdom/input/BuilderErrorHandler.java	29 Apr 2002 13:38:16 -0000	1.10
--- ./org/jdom/input/BuilderErrorHandler.java	4 Apr 2003 12:45:31 -0000
***************
*** 56,62 ****
  
  package org.jdom.input;
  
! import org.xml.sax.*;
  
  /**
   * @author  Jason Hunter
--- 56,64 ----
  
  package org.jdom.input;
  
! import org.xml.sax.ErrorHandler;
! import org.xml.sax.SAXException;
! import org.xml.sax.SAXParseException;
  
  /**
   * @author  Jason Hunter
Index: ./org/jdom/input/DefaultJDOMFactory.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/DefaultJDOMFactory.java,v
retrieving revision 1.9
diff -c -r1.9 DefaultJDOMFactory.java
*** ./org/jdom/input/DefaultJDOMFactory.java	29 Apr 2002 13:38:16 -0000	1.9
--- ./org/jdom/input/DefaultJDOMFactory.java	4 Apr 2003 12:45:32 -0000
***************
*** 56,63 ****
  
  package org.jdom.input;
  
! import org.jdom.*;
! import java.util.*;
  
  /**
   * <code>DefaultJDOMFactory</code> creates the standard
--- 56,73 ----
  
  package org.jdom.input;
  
! import java.util.Map;
! 
! import org.jdom.Attribute;
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.DocType;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.Namespace;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
  
  /**
   * <code>DefaultJDOMFactory</code> creates the standard
Index: ./org/jdom/input/DOMBuilder.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/DOMBuilder.java,v
retrieving revision 1.49
diff -c -r1.49 DOMBuilder.java
*** ./org/jdom/input/DOMBuilder.java	2 Apr 2003 00:42:00 -0000	1.49
--- ./org/jdom/input/DOMBuilder.java	4 Apr 2003 12:45:32 -0000
***************
*** 56,76 ****
  
  package org.jdom.input;
  
! import java.io.*;
! import java.net.*;
! import java.util.*;
! import java.lang.reflect.*;
  
! import org.jdom.*;
! import org.jdom.Comment;
  import org.jdom.Document;
  import org.jdom.Element;
  import org.jdom.EntityRef;
! import org.jdom.ProcessingInstruction;
! import org.jdom.adapters.*;
! 
! import org.w3c.dom.*;
! import org.xml.sax.*;
  
  /**
   * <code>DOMBuilder</code> builds a JDOM tree using DOM.
--- 56,82 ----
  
  package org.jdom.input;
  
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FileNotFoundException;
! import java.io.IOException;
! import java.io.InputStream;
! import java.net.URL;
  
! import org.jdom.Attribute;
! import org.jdom.DocType;
  import org.jdom.Document;
  import org.jdom.Element;
  import org.jdom.EntityRef;
! import org.jdom.JDOMException;
! import org.jdom.Namespace;
! import org.jdom.adapters.DOMAdapter;
! import org.w3c.dom.Attr;
! import org.w3c.dom.DocumentType;
! import org.w3c.dom.NamedNodeMap;
! import org.w3c.dom.Node;
! import org.w3c.dom.NodeList;
! import org.xml.sax.SAXParseException;
  
  /**
   * <code>DOMBuilder</code> builds a JDOM tree using DOM.
Index: ./org/jdom/input/JAXPParserFactory.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/JAXPParserFactory.java,v
retrieving revision 1.1
diff -c -r1.1 JAXPParserFactory.java
*** ./org/jdom/input/JAXPParserFactory.java	2 Apr 2003 20:40:40 -0000	1.1
--- ./org/jdom/input/JAXPParserFactory.java	4 Apr 2003 12:45:33 -0000
***************
*** 56,73 ****
  
  package org.jdom.input;
  
! import java.util.*;
! 
! import org.jdom.JDOMException;
  
  import javax.xml.parsers.SAXParser;
  import javax.xml.parsers.SAXParserFactory;
- import javax.xml.parsers.ParserConfigurationException;
  
! import org.xml.sax.XMLReader;
  import org.xml.sax.SAXException;
- import org.xml.sax.SAXNotSupportedException;
  import org.xml.sax.SAXNotRecognizedException;
  
  /**
   * A helper class to allocate JAXP SAX parsers.
--- 56,72 ----
  
  package org.jdom.input;
  
! import java.util.Map;
  
+ import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParser;
  import javax.xml.parsers.SAXParserFactory;
  
! import org.jdom.JDOMException;
  import org.xml.sax.SAXException;
  import org.xml.sax.SAXNotRecognizedException;
+ import org.xml.sax.SAXNotSupportedException;
+ import org.xml.sax.XMLReader;
  
  /**
   * A helper class to allocate JAXP SAX parsers.
Index: ./org/jdom/input/JDOMFactory.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/JDOMFactory.java,v
retrieving revision 1.10
diff -c -r1.10 JDOMFactory.java
*** ./org/jdom/input/JDOMFactory.java	29 Apr 2002 13:38:16 -0000	1.10
--- ./org/jdom/input/JDOMFactory.java	4 Apr 2003 12:45:33 -0000
***************
*** 56,63 ****
  
  package org.jdom.input;
  
! import org.jdom.*;
! import java.util.*;
  
  /**
   * <code>JDOMFactory</code> is an interface to be used by builders
--- 56,73 ----
  
  package org.jdom.input;
  
! import java.util.Map;
! 
! import org.jdom.Attribute;
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.DocType;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.Namespace;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
  
  /**
   * <code>JDOMFactory</code> is an interface to be used by builders
Index: ./org/jdom/input/JDOMParseException.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/JDOMParseException.java,v
retrieving revision 1.2
diff -c -r1.2 JDOMParseException.java
*** ./org/jdom/input/JDOMParseException.java	2 Apr 2003 00:59:39 -0000	1.2
--- ./org/jdom/input/JDOMParseException.java	4 Apr 2003 12:45:33 -0000
***************
*** 56,65 ****
  
  package org.jdom.input;
  
- import org.xml.sax.SAXParseException;
- 
  import org.jdom.Document;
  import org.jdom.JDOMException;
  
  /**
   * <b><code>JDOMParseException</code></b>.
--- 56,64 ----
  
  package org.jdom.input;
  
  import org.jdom.Document;
  import org.jdom.JDOMException;
+ import org.xml.sax.SAXParseException;
  
  /**
   * <b><code>JDOMParseException</code></b>.
Index: ./org/jdom/input/SAXBuilder.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/SAXBuilder.java,v
retrieving revision 1.73
diff -c -r1.73 SAXBuilder.java
*** ./org/jdom/input/SAXBuilder.java	2 Apr 2003 20:40:40 -0000	1.73
--- ./org/jdom/input/SAXBuilder.java	4 Apr 2003 12:45:35 -0000
***************
*** 56,71 ****
  
  package org.jdom.input;
  
! import java.io.*;
! import java.lang.reflect.*;
! import java.net.*;
! import java.util.*;
  
! import org.jdom.*;
! 
! import org.xml.sax.*;
! import org.xml.sax.ext.LexicalHandler;
! import org.xml.sax.helpers.DefaultHandler;
  import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
--- 56,84 ----
  
  package org.jdom.input;
  
! import java.io.File;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.Reader;
! import java.lang.reflect.Method;
! import java.net.MalformedURLException;
! import java.net.URL;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.Map;
  
! import org.jdom.Document;
! import org.jdom.JDOMException;
! import org.xml.sax.DTDHandler;
! import org.xml.sax.EntityResolver;
! import org.xml.sax.ErrorHandler;
! import org.xml.sax.InputSource;
! import org.xml.sax.SAXException;
! import org.xml.sax.SAXNotRecognizedException;
! import org.xml.sax.SAXNotSupportedException;
! import org.xml.sax.SAXParseException;
! import org.xml.sax.XMLFilter;
! import org.xml.sax.XMLReader;
  import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
Index: ./org/jdom/input/SAXHandler.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/input/SAXHandler.java,v
retrieving revision 1.49
diff -c -r1.49 SAXHandler.java
*** ./org/jdom/input/SAXHandler.java	2 Apr 2003 20:40:40 -0000	1.49
--- ./org/jdom/input/SAXHandler.java	4 Apr 2003 12:45:36 -0000
***************
*** 56,73 ****
  
  package org.jdom.input;
  
! import java.io.*;
! import java.lang.reflect.*;
! import java.net.*;
! import java.util.*;
  
! import org.jdom.*;
! 
! import org.xml.sax.*;
! import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.ext.DeclHandler;
  import org.xml.sax.helpers.DefaultHandler;
- import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
   * <code>SAXHandler</code> supports SAXBuilder.
--- 56,79 ----
  
  package org.jdom.input;
  
! import java.util.ArrayList;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
  
! import org.jdom.Attribute;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.Namespace;
! import org.xml.sax.Attributes;
! import org.xml.sax.DTDHandler;
! import org.xml.sax.Locator;
! import org.xml.sax.SAXException;
  import org.xml.sax.ext.DeclHandler;
+ import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.helpers.DefaultHandler;
  
  /**
   * <code>SAXHandler</code> supports SAXBuilder.
Index: ./org/jdom/output/DOMOutputter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/output/DOMOutputter.java,v
retrieving revision 1.32
diff -c -r1.32 DOMOutputter.java
*** ./org/jdom/output/DOMOutputter.java	29 Apr 2002 13:38:16 -0000	1.32
--- ./org/jdom/output/DOMOutputter.java	4 Apr 2003 12:45:37 -0000
***************
*** 57,71 ****
  
  package org.jdom.output;
  
! import java.io.*;
! import java.util.*;
! import java.lang.reflect.*;
  
! import org.jdom.*;
! import org.jdom.adapters.*;
! 
! import org.w3c.dom.DocumentType;
! import org.w3c.dom.DOMImplementation;
  
  
  /**
--- 57,76 ----
  
  package org.jdom.output;
  
! import java.util.Iterator;
  
! import org.jdom.Attribute;
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.DocType;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.JDOMException;
! import org.jdom.Namespace;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
! import org.jdom.adapters.DOMAdapter;
  
  
  /**
Index: ./org/jdom/output/NamespaceStack.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/output/NamespaceStack.java,v
retrieving revision 1.10
diff -c -r1.10 NamespaceStack.java
*** ./org/jdom/output/NamespaceStack.java	29 Apr 2002 13:38:16 -0000	1.10
--- ./org/jdom/output/NamespaceStack.java	4 Apr 2003 12:45:37 -0000
***************
*** 55,61 ****
   */
  package org.jdom.output;
  
! import java.util.*;
  
  import org.jdom.Namespace;
  
--- 55,61 ----
   */
  package org.jdom.output;
  
! import java.util.Stack;
  
  import org.jdom.Namespace;
  
Index: ./org/jdom/output/SAXOutputter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/output/SAXOutputter.java,v
retrieving revision 1.27
diff -c -r1.27 SAXOutputter.java
*** ./org/jdom/output/SAXOutputter.java	4 Apr 2003 03:48:22 -0000	1.27
--- ./org/jdom/output/SAXOutputter.java	4 Apr 2003 12:45:39 -0000
***************
*** 56,73 ****
  
  package org.jdom.output;
  
! import java.io.*;
! import java.lang.reflect.Method;
  import java.lang.reflect.InvocationTargetException;
! import java.util.*;
  
! import org.xml.sax.*;
  import org.xml.sax.ext.DeclHandler;
  import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.helpers.AttributesImpl;
  import org.xml.sax.helpers.XMLReaderFactory;
- 
- import org.jdom.*;
  
  /**
   * <code>SAXOutputter</code> takes a JDOM tree and fires SAX2 events.
--- 56,95 ----
  
  package org.jdom.output;
  
! import java.io.IOException;
! import java.io.StringReader;
  import java.lang.reflect.InvocationTargetException;
! import java.lang.reflect.Method;
! import java.util.Iterator;
! import java.util.List;
  
! import org.jdom.Attribute;
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.DocType;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.JDOMException;
! import org.jdom.Namespace;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
! import org.xml.sax.Attributes;
! import org.xml.sax.ContentHandler;
! import org.xml.sax.DTDHandler;
! 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.SAXNotRecognizedException;
! import org.xml.sax.SAXNotSupportedException;
! import org.xml.sax.SAXParseException;
! import org.xml.sax.XMLReader;
  import org.xml.sax.ext.DeclHandler;
  import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.helpers.AttributesImpl;
  import org.xml.sax.helpers.XMLReaderFactory;
  
  /**
   * <code>SAXOutputter</code> takes a JDOM tree and fires SAX2 events.
Index: ./org/jdom/output/XMLOutputter.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/output/XMLOutputter.java,v
retrieving revision 1.89
diff -c -r1.89 XMLOutputter.java
*** ./org/jdom/output/XMLOutputter.java	2 Apr 2003 02:08:32 -0000	1.89
--- ./org/jdom/output/XMLOutputter.java	4 Apr 2003 12:45:42 -0000
***************
*** 56,66 ****
  
  package org.jdom.output;
  
! import java.io.*;
! import java.util.*;
  
! import org.jdom.*;
! import org.jdom.output.*;
  
  /**
   * <code>XMLOutputter</code> takes a JDOM tree and formats it to a
--- 56,80 ----
  
  package org.jdom.output;
  
! import java.io.BufferedOutputStream;
! import java.io.BufferedWriter;
! import java.io.IOException;
! import java.io.OutputStream;
! import java.io.OutputStreamWriter;
! import java.io.StringWriter;
! import java.io.Writer;
! import java.util.List;
  
! import org.jdom.Attribute;
! import org.jdom.CDATA;
! import org.jdom.Comment;
! import org.jdom.DocType;
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.EntityRef;
! import org.jdom.Namespace;
! import org.jdom.ProcessingInstruction;
! import org.jdom.Text;
  
  /**
   * <code>XMLOutputter</code> takes a JDOM tree and formats it to a
Index: ./org/jdom/transform/JDOMResult.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/transform/JDOMResult.java,v
retrieving revision 1.15
diff -c -r1.15 JDOMResult.java
*** ./org/jdom/transform/JDOMResult.java	2 Apr 2003 20:40:40 -0000	1.15
--- ./org/jdom/transform/JDOMResult.java	4 Apr 2003 12:45:42 -0000
***************
*** 56,74 ****
  
  package org.jdom.transform;
  
! import java.io.*;
! import java.util.*;
  
! import org.xml.sax.*;
  import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.helpers.XMLFilterImpl;
- 
- import org.jdom.*;
- import org.jdom.input.*;
- import org.jdom.output.*;
- 
- import javax.xml.transform.sax.SAXResult;
- import javax.xml.transform.TransformerFactory; // workaround for @link bug
  
  /**
   * Acts as a holder for a transformation result tree, in the form
--- 56,77 ----
  
  package org.jdom.transform;
  
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.List;
  
! import javax.xml.transform.sax.SAXResult;
! 
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.input.DefaultJDOMFactory;
! import org.jdom.input.JDOMFactory;
! import org.jdom.input.SAXHandler;
! import org.xml.sax.Attributes;
! import org.xml.sax.ContentHandler;
! import org.xml.sax.SAXException;
  import org.xml.sax.ext.LexicalHandler;
  import org.xml.sax.helpers.XMLFilterImpl;
  
  /**
   * Acts as a holder for a transformation result tree, in the form
Index: ./org/jdom/transform/JDOMSource.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/transform/JDOMSource.java,v
retrieving revision 1.11
diff -c -r1.11 JDOMSource.java
*** ./org/jdom/transform/JDOMSource.java	23 Jan 2003 02:23:31 -0000	1.11
--- ./org/jdom/transform/JDOMSource.java	4 Apr 2003 12:45:42 -0000
***************
*** 56,73 ****
  
  package org.jdom.transform;
  
! import java.io.*;
! import java.util.*;
! 
! import org.xml.sax.*;
! import org.xml.sax.helpers.XMLFilterImpl;
! 
! import org.jdom.*;
! import org.jdom.output.*;
  
  import javax.xml.transform.sax.SAXSource;
! import javax.xml.transform.Transformer;        // workaround for @link bug
! import javax.xml.transform.TransformerFactory; // workaround for @link bug
  
  /**
   * Acts as an holder for JDOM document sources.
--- 56,78 ----
  
  package org.jdom.transform;
  
! import java.io.Reader;
! import java.io.StringReader;
! import java.util.ArrayList;
! import java.util.List;
  
  import javax.xml.transform.sax.SAXSource;
! 
! import org.jdom.Document;
! import org.jdom.Element;
! import org.jdom.JDOMException;
! import org.jdom.output.SAXOutputter;
! import org.jdom.output.XMLOutputter;
! import org.xml.sax.InputSource;
! import org.xml.sax.SAXException;
! import org.xml.sax.SAXNotSupportedException;
! import org.xml.sax.XMLFilter;
! import org.xml.sax.XMLReader;
  
  /**
   * Acts as an holder for JDOM document sources.
Index: ./org/jdom/xpath/JaxenXPath.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/xpath/JaxenXPath.java,v
retrieving revision 1.9
diff -c -r1.9 JaxenXPath.java
*** ./org/jdom/xpath/JaxenXPath.java	26 Feb 2003 23:55:55 -0000	1.9
--- ./org/jdom/xpath/JaxenXPath.java	4 Apr 2003 12:45:43 -0000
***************
*** 58,73 ****
  
  
  import java.util.List;
- import java.util.Map;
- import java.util.Hashtable;
  
- import org.jdom.*;
- 
- import org.saxpath.SAXPathException;
- import org.jaxen.jdom.JDOMXPath;
- import org.jaxen.SimpleVariableContext;
- import org.jaxen.SimpleNamespaceContext;
  import org.jaxen.JaxenException;
  
  
  /**
--- 58,78 ----
  
  
  import java.util.List;
  
  import org.jaxen.JaxenException;
+ import org.jaxen.SimpleNamespaceContext;
+ import org.jaxen.SimpleVariableContext;
+ import org.jaxen.jdom.JDOMXPath;
+ import org.jdom.Attribute;
+ import org.jdom.Comment;
+ import org.jdom.Document;
+ import org.jdom.Element;
+ import org.jdom.EntityRef;
+ import org.jdom.JDOMException;
+ import org.jdom.Namespace;
+ import org.jdom.ProcessingInstruction;
+ import org.jdom.Text;
+ import org.saxpath.SAXPathException;
  
  
  /**
Index: ./org/jdom/xpath/XPath.java
===================================================================
RCS file: /home/cvspublic/jdom/src/java/org/jdom/xpath/XPath.java,v
retrieving revision 1.8
diff -c -r1.8 XPath.java
*** ./org/jdom/xpath/XPath.java	23 Jan 2003 02:23:31 -0000	1.8
--- ./org/jdom/xpath/XPath.java	4 Apr 2003 12:45:43 -0000
***************
*** 57,73 ****
  package org.jdom.xpath;
  
  
- import java.io.Serializable;
  import java.io.InvalidObjectException;
  import java.io.ObjectStreamException;
  import java.lang.reflect.Constructor;
- import java.lang.reflect.Modifier;
  import java.lang.reflect.InvocationTargetException;
  import java.util.List;
  
- import org.jdom.Namespace;
  import org.jdom.JDOMException;
! import org.jdom.IllegalNameException;
  
  
  /**
--- 57,72 ----
  package org.jdom.xpath;
  
  
  import java.io.InvalidObjectException;
  import java.io.ObjectStreamException;
+ import java.io.Serializable;
  import java.lang.reflect.Constructor;
  import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Modifier;
  import java.util.List;
  
  import org.jdom.JDOMException;
! import org.jdom.Namespace;
  
  
  /**