Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java Sun Sep 28 14:08:27 2008 @@ -45,7 +45,6 @@ import org.apache.xerces.xni.parser.XMLDocumentScanner; import org.apache.xerces.xni.parser.XMLInputSource; import org.apache.xerces.xni.parser.XMLPullParserConfiguration; -import org.w3c.dom.Document; /** * @xerces.internal
Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java Sun Sep 28 14:08:27 2008 @@ -16,8 +16,8 @@ */ package org.apache.xerces.impl.xs.traversers; -import org.w3c.dom.Element; import org.apache.xerces.impl.xs.opti.ElementImpl; +import org.w3c.dom.Element; /** * Objects of this class contain the textual representation of Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java Sun Sep 28 14:08:27 2008 @@ -26,18 +26,18 @@ import org.apache.xerces.impl.xs.XSConstraints; import org.apache.xerces.impl.xs.XSElementDecl; import org.apache.xerces.impl.xs.XSParticleDecl; -import org.apache.xerces.xs.XSConstants; -import org.apache.xerces.xs.XSObject; -import org.apache.xerces.xs.XSObjectList; -import org.apache.xerces.xs.XSTypeDefinition; import org.apache.xerces.impl.xs.util.XInt; import org.apache.xerces.impl.xs.util.XSObjectListImpl; import org.apache.xerces.util.DOMUtil; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.XMLChar; import org.apache.xerces.xni.QName; -import org.w3c.dom.Element; +import org.apache.xerces.xs.XSConstants; +import org.apache.xerces.xs.XSObject; +import org.apache.xerces.xs.XSObjectList; +import org.apache.xerces.xs.XSTypeDefinition; import org.w3c.dom.Attr; +import org.w3c.dom.Element; /** * The element declaration schema component traverser. Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java Sun Sep 28 14:08:27 2008 @@ -49,11 +49,10 @@ import org.apache.xerces.impl.xs.opti.SchemaDOMParser; import org.apache.xerces.impl.xs.opti.SchemaParsingConfig; import org.apache.xerces.impl.xs.util.SimpleLocator; - -import org.apache.xerces.util.DOMUtil; import org.apache.xerces.parsers.SAXParser; import org.apache.xerces.parsers.XML11Configuration; import org.apache.xerces.util.DOMInputSource; +import org.apache.xerces.util.DOMUtil; import org.apache.xerces.util.DefaultErrorHandler; import org.apache.xerces.util.SAXInputSource; import org.apache.xerces.util.StAXInputSource; Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/util/StringListImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/util/StringListImpl.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/util/StringListImpl.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/util/StringListImpl.java Sun Sep 28 14:08:27 2008 @@ -17,9 +17,10 @@ package org.apache.xerces.impl.xs.util; -import org.apache.xerces.xs.StringList; import java.util.Vector; +import org.apache.xerces.xs.StringList; + /** * Containts a list of Object's. * Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java (original) +++ xerces/java/trunk/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java Sun Sep 28 14:08:27 2008 @@ -17,9 +17,9 @@ package org.apache.xerces.impl.xs.util; +import org.apache.xerces.util.SymbolHash; import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSTypeDefinition; -import org.apache.xerces.util.SymbolHash; /** * Contains the map between qnames and XSObject's. Modified: xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java (original) +++ xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java Sun Sep 28 14:08:27 2008 @@ -21,7 +21,6 @@ import org.apache.xerces.xni.XMLDocumentHandler; import org.apache.xerces.xni.XNIException; - import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; import org.w3c.dom.DocumentType; Modified: xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java (original) +++ xerces/java/trunk/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java Sun Sep 28 14:08:27 2008 @@ -46,7 +46,6 @@ import org.apache.xerces.xs.AttributePSVI; import org.apache.xerces.xs.ElementPSVI; import org.apache.xerces.xs.XSTypeDefinition; - import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; import org.w3c.dom.Document; Modified: xerces/java/trunk/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java (original) +++ xerces/java/trunk/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java Sun Sep 28 14:08:27 2008 @@ -19,8 +19,8 @@ import java.util.Locale; import java.util.MissingResourceException; -import java.util.ResourceBundle; import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; /** * <p>Used to format JAXP Validation API error messages using a specified locale.</p> Modified: xerces/java/trunk/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java (original) +++ xerces/java/trunk/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java Sun Sep 28 14:08:27 2008 @@ -23,8 +23,8 @@ import org.apache.xerces.xni.grammars.Grammar; import org.apache.xerces.xni.grammars.XMLGrammarDescription; -import org.apache.xerces.xni.grammars.XMLSchemaDescription; import org.apache.xerces.xni.grammars.XMLGrammarPool; +import org.apache.xerces.xni.grammars.XMLSchemaDescription; /** * <p>This grammar pool is a memory sensitive cache. The grammars Modified: xerces/java/trunk/src/org/apache/xerces/parsers/AbstractDOMParser.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/AbstractDOMParser.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/AbstractDOMParser.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/AbstractDOMParser.java Sun Sep 28 14:08:27 2008 @@ -56,9 +56,9 @@ import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; +import org.w3c.dom.DOMError; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; -import org.w3c.dom.DOMError; import org.w3c.dom.Element; import org.w3c.dom.EntityReference; import org.w3c.dom.NamedNodeMap; Modified: xerces/java/trunk/src/org/apache/xerces/parsers/CachingParserPool.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/CachingParserPool.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/CachingParserPool.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/CachingParserPool.java Sun Sep 28 14:08:27 2008 @@ -17,14 +17,13 @@ package org.apache.xerces.parsers; -import org.apache.xerces.xni.grammars.Grammar; -import org.apache.xerces.xni.grammars.XMLGrammarPool; -import org.apache.xerces.xni.grammars.XMLGrammarDescription; -import org.apache.xerces.util.XMLGrammarPoolImpl; - import org.apache.xerces.util.ShadowedSymbolTable; import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.SynchronizedSymbolTable; +import org.apache.xerces.util.XMLGrammarPoolImpl; +import org.apache.xerces.xni.grammars.Grammar; +import org.apache.xerces.xni.grammars.XMLGrammarDescription; +import org.apache.xerces.xni.grammars.XMLGrammarPool; /** * A parser pool that enables caching of grammars. The caching parser Modified: xerces/java/trunk/src/org/apache/xerces/parsers/DOMParser.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/DOMParser.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/DOMParser.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/DOMParser.java Sun Sep 28 14:08:27 2008 @@ -22,8 +22,8 @@ import org.apache.xerces.dom.DOMMessageFormatter; import org.apache.xerces.impl.Constants; -import org.apache.xerces.util.EntityResolverWrapper; import org.apache.xerces.util.EntityResolver2Wrapper; +import org.apache.xerces.util.EntityResolverWrapper; import org.apache.xerces.util.ErrorHandlerWrapper; import org.apache.xerces.util.SAXMessageFormatter; import org.apache.xerces.util.SymbolTable; Modified: xerces/java/trunk/src/org/apache/xerces/parsers/DTDParser.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/DTDParser.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/DTDParser.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/DTDParser.java Sun Sep 28 14:08:27 2008 @@ -19,15 +19,14 @@ import org.apache.xerces.impl.dtd.DTDGrammar; import org.apache.xerces.util.SymbolTable; - import org.apache.xerces.xni.Augmentations; -import org.apache.xerces.xni.XMLString; import org.apache.xerces.xni.XMLDTDContentModelHandler; import org.apache.xerces.xni.XMLDTDHandler; import org.apache.xerces.xni.XMLLocator; +import org.apache.xerces.xni.XMLResourceIdentifier; +import org.apache.xerces.xni.XMLString; import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLDTDScanner; -import org.apache.xerces.xni.XMLResourceIdentifier; /** * @version $Id$ Modified: xerces/java/trunk/src/org/apache/xerces/parsers/ObjectFactory.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/ObjectFactory.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/ObjectFactory.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/ObjectFactory.java Sun Sep 28 14:08:27 2008 @@ -17,14 +17,13 @@ package org.apache.xerces.parsers; -import java.io.InputStream; -import java.io.IOException; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; - -import java.util.Properties; -import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Properties; /** * This class is duplicated for each JAXP subpackage so keep it in sync. Modified: xerces/java/trunk/src/org/apache/xerces/parsers/SecurityConfiguration.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/SecurityConfiguration.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/SecurityConfiguration.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/SecurityConfiguration.java Sun Sep 28 14:08:27 2008 @@ -18,10 +18,10 @@ package org.apache.xerces.parsers; import org.apache.xerces.impl.Constants; -import org.apache.xerces.xni.grammars.XMLGrammarPool; -import org.apache.xerces.xni.parser.XMLComponentManager; import org.apache.xerces.util.SecurityManager; import org.apache.xerces.util.SymbolTable; +import org.apache.xerces.xni.grammars.XMLGrammarPool; +import org.apache.xerces.xni.parser.XMLComponentManager; /** * This configuration allows Xerces to behave in a security-conscious manner; that is, Modified: xerces/java/trunk/src/org/apache/xerces/parsers/SecuritySupport.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/SecuritySupport.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/SecuritySupport.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/SecuritySupport.java Sun Sep 28 14:08:27 2008 @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; - import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; Modified: xerces/java/trunk/src/org/apache/xerces/parsers/XPointerParserConfiguration.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/parsers/XPointerParserConfiguration.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/parsers/XPointerParserConfiguration.java (original) +++ xerces/java/trunk/src/org/apache/xerces/parsers/XPointerParserConfiguration.java Sun Sep 28 14:08:27 2008 @@ -18,7 +18,6 @@ import org.apache.xerces.impl.Constants; import org.apache.xerces.util.SymbolTable; -import org.apache.xerces.xpointer.XPointerHandler; import org.apache.xerces.xinclude.XIncludeHandler; import org.apache.xerces.xinclude.XIncludeNamespaceSupport; import org.apache.xerces.xni.XMLDocumentHandler; @@ -26,6 +25,7 @@ import org.apache.xerces.xni.parser.XMLComponentManager; import org.apache.xerces.xni.parser.XMLConfigurationException; import org.apache.xerces.xni.parser.XMLDocumentSource; +import org.apache.xerces.xpointer.XPointerHandler; /** * This parser configuration includes an <code>XPointerHandler</code> in the pipeline Modified: xerces/java/trunk/src/org/apache/xerces/util/DOMEntityResolverWrapper.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/DOMEntityResolverWrapper.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/DOMEntityResolverWrapper.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/DOMEntityResolverWrapper.java Sun Sep 28 14:08:27 2008 @@ -18,19 +18,18 @@ package org.apache.xerces.util; -import org.apache.xerces.xni.XNIException; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; + import org.apache.xerces.xni.XMLResourceIdentifier; +import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.grammars.XMLGrammarDescription; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; - -import org.w3c.dom.ls.LSResourceResolver; import org.w3c.dom.ls.LSInput; - -import java.io.InputStream; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; +import org.w3c.dom.ls.LSResourceResolver; /** Modified: xerces/java/trunk/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java Sun Sep 28 14:08:27 2008 @@ -17,20 +17,19 @@ package org.apache.xerces.util; +import java.io.PrintWriter; +import java.util.Hashtable; + +import org.apache.xerces.dom.DOMErrorImpl; +import org.apache.xerces.dom.DOMLocatorImpl; +import org.apache.xerces.impl.msg.XMLMessageFormatter; import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLErrorHandler; import org.apache.xerces.xni.parser.XMLParseException; - -import org.w3c.dom.Node; import org.w3c.dom.DOMError; -import org.w3c.dom.DOMLocator; import org.w3c.dom.DOMErrorHandler; -import org.apache.xerces.dom.DOMErrorImpl; -import org.apache.xerces.dom.DOMLocatorImpl; -import org.apache.xerces.impl.msg.XMLMessageFormatter; - -import java.io.PrintWriter; -import java.util.Hashtable; +import org.w3c.dom.DOMLocator; +import org.w3c.dom.Node; /** * This class handles DOM errors . Modified: xerces/java/trunk/src/org/apache/xerces/util/EntityResolver2Wrapper.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/EntityResolver2Wrapper.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/EntityResolver2Wrapper.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/EntityResolver2Wrapper.java Sun Sep 28 14:08:27 2008 @@ -17,8 +17,8 @@ package org.apache.xerces.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; import org.apache.xerces.impl.ExternalSubsetResolver; @@ -27,10 +27,9 @@ import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.grammars.XMLDTDDescription; import org.apache.xerces.xni.parser.XMLInputSource; - -import org.xml.sax.ext.EntityResolver2; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import org.xml.sax.ext.EntityResolver2; /** * <p>This class wraps a SAX entity resolver (EntityResolver2) in an XNI entity resolver.</p> Modified: xerces/java/trunk/src/org/apache/xerces/util/EntityResolverWrapper.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/EntityResolverWrapper.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/EntityResolverWrapper.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/EntityResolverWrapper.java Sun Sep 28 14:08:27 2008 @@ -17,15 +17,14 @@ package org.apache.xerces.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; -import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.XMLResourceIdentifier; +import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; - import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: xerces/java/trunk/src/org/apache/xerces/util/HTTPInputSource.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/HTTPInputSource.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/HTTPInputSource.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/HTTPInputSource.java Sun Sep 28 14:08:27 2008 @@ -18,7 +18,6 @@ import java.io.InputStream; import java.io.Reader; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; Modified: xerces/java/trunk/src/org/apache/xerces/util/SAXLocatorWrapper.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/SAXLocatorWrapper.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/SAXLocatorWrapper.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/SAXLocatorWrapper.java Sun Sep 28 14:08:27 2008 @@ -17,11 +17,10 @@ package org.apache.xerces.util; +import org.apache.xerces.xni.XMLLocator; import org.xml.sax.Locator; import org.xml.sax.ext.Locator2; -import org.apache.xerces.xni.XMLLocator; - /** * <p>A light wrapper around a SAX locator. This is useful * when bridging between SAX and XNI components.</p> Modified: xerces/java/trunk/src/org/apache/xerces/util/SAXMessageFormatter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/SAXMessageFormatter.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/SAXMessageFormatter.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/SAXMessageFormatter.java Sun Sep 28 14:08:27 2008 @@ -18,8 +18,8 @@ import java.util.Locale; import java.util.MissingResourceException; -import java.util.ResourceBundle; import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; /** * Used to format SAX error messages using a specified locale. Modified: xerces/java/trunk/src/org/apache/xerces/util/XMLCatalogResolver.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/XMLCatalogResolver.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/util/XMLCatalogResolver.java (original) +++ xerces/java/trunk/src/org/apache/xerces/util/XMLCatalogResolver.java Sun Sep 28 14:08:27 2008 @@ -19,28 +19,23 @@ import java.io.IOException; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.ext.EntityResolver2; - -import org.w3c.dom.ls.LSInput; -import org.w3c.dom.ls.LSResourceResolver; - import javax.xml.parsers.SAXParserFactory; import org.apache.xerces.dom.DOMInputImpl; import org.apache.xerces.jaxp.SAXParserFactoryImpl; - -import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.XMLResourceIdentifier; - +import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; - import org.apache.xml.resolver.Catalog; import org.apache.xml.resolver.CatalogManager; import org.apache.xml.resolver.readers.OASISXMLCatalogReader; import org.apache.xml.resolver.readers.SAXCatalogReader; +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSResourceResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.ext.EntityResolver2; /** * <p>The catalog resolver handles the resolution of external Modified: xerces/java/trunk/src/org/apache/xerces/xinclude/ObjectFactory.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xinclude/ObjectFactory.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xinclude/ObjectFactory.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xinclude/ObjectFactory.java Sun Sep 28 14:08:27 2008 @@ -17,14 +17,13 @@ package org.apache.xerces.xinclude; -import java.io.InputStream; -import java.io.IOException; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; - -import java.util.Properties; -import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Properties; /** * This class is duplicated for each JAXP subpackage so keep it in sync. Modified: xerces/java/trunk/src/org/apache/xerces/xinclude/SecuritySupport.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xinclude/SecuritySupport.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xinclude/SecuritySupport.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xinclude/SecuritySupport.java Sun Sep 28 14:08:27 2008 @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; - import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; Modified: xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeHandler.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeHandler.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeHandler.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeHandler.java Sun Sep 28 14:08:27 2008 @@ -38,9 +38,9 @@ import org.apache.xerces.util.SymbolTable; import org.apache.xerces.util.URI; import org.apache.xerces.util.XMLAttributesImpl; +import org.apache.xerces.util.XMLChar; import org.apache.xerces.util.XMLLocatorWrapper; import org.apache.xerces.util.XMLResourceIdentifierImpl; -import org.apache.xerces.util.XMLChar; import org.apache.xerces.util.XMLSymbols; import org.apache.xerces.util.URI.MalformedURIException; import org.apache.xerces.xni.Augmentations; Modified: xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java Sun Sep 28 14:08:27 2008 @@ -19,8 +19,9 @@ import java.util.Locale; import java.util.MissingResourceException; -import java.util.ResourceBundle; import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; + import org.apache.xerces.util.MessageFormatter; // TODO: fix error messages in XIncludeMessages.properties Modified: xerces/java/trunk/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java Sun Sep 28 14:08:27 2008 @@ -17,14 +17,14 @@ package org.apache.xerces.xni.grammars; +import java.io.IOException; +import java.util.Locale; + +import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLConfigurationException; -import org.apache.xerces.xni.parser.XMLErrorHandler; import org.apache.xerces.xni.parser.XMLEntityResolver; +import org.apache.xerces.xni.parser.XMLErrorHandler; import org.apache.xerces.xni.parser.XMLInputSource; -import org.apache.xerces.xni.XNIException; - -import java.io.IOException; -import java.util.Locale; /** * The intention of this interface is to provide a generic means Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLComponent.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLComponent.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLComponent.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLComponent.java Sun Sep 28 14:08:27 2008 @@ -17,6 +17,8 @@ package org.apache.xerces.xni.parser; +import org.apache.xerces.xni.XNIException; + /** * The component interface defines methods that must be implemented * by components in a parser configuration. The component methods allow Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDTDScanner.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDTDScanner.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDTDScanner.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDTDScanner.java Sun Sep 28 14:08:27 2008 @@ -18,6 +18,7 @@ package org.apache.xerces.xni.parser; import java.io.IOException; + import org.apache.xerces.xni.XNIException; /** Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java Sun Sep 28 14:08:27 2008 @@ -18,6 +18,7 @@ package org.apache.xerces.xni.parser; import java.io.IOException; + import org.apache.xerces.xni.XNIException; /** Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLEntityResolver.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLEntityResolver.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLEntityResolver.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLEntityResolver.java Sun Sep 28 14:08:27 2008 @@ -19,8 +19,8 @@ import java.io.IOException; -import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.XMLResourceIdentifier; +import org.apache.xerces.xni.XNIException; /** * This interface is used to resolve external parsed entities. The Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLInputSource.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLInputSource.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLInputSource.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLInputSource.java Sun Sep 28 14:08:27 2008 @@ -17,11 +17,11 @@ package org.apache.xerces.xni.parser; -import org.apache.xerces.xni.XMLResourceIdentifier; - import java.io.InputStream; import java.io.Reader; +import org.apache.xerces.xni.XMLResourceIdentifier; + /** * This class represents an input source for an XML document. The * basic properties of an input source are the following: Modified: xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java Sun Sep 28 14:08:27 2008 @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Locale; -import org.apache.xerces.xni.XMLDocumentHandler; -import org.apache.xerces.xni.XMLDTDHandler; import org.apache.xerces.xni.XMLDTDContentModelHandler; +import org.apache.xerces.xni.XMLDTDHandler; +import org.apache.xerces.xni.XMLDocumentHandler; import org.apache.xerces.xni.XNIException; /** Modified: xerces/java/trunk/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java (original) +++ xerces/java/trunk/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java Sun Sep 28 14:08:27 2008 @@ -19,8 +19,9 @@ import java.util.Locale; import java.util.MissingResourceException; -import java.util.ResourceBundle; import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; + import org.apache.xerces.util.MessageFormatter; /** Modified: xerces/java/trunk/src/org/apache/xml/serialize/BaseMarkupSerializer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/BaseMarkupSerializer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/BaseMarkupSerializer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/BaseMarkupSerializer.java Sun Sep 28 14:08:27 2008 @@ -59,7 +59,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.ls.LSException; -import org.w3c.dom.ls.LSSerializer; import org.w3c.dom.ls.LSSerializerFilter; import org.w3c.dom.traversal.NodeFilter; import org.xml.sax.ContentHandler; Modified: xerces/java/trunk/src/org/apache/xml/serialize/DOMSerializer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/DOMSerializer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/DOMSerializer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/DOMSerializer.java Sun Sep 28 14:08:27 2008 @@ -20,9 +20,10 @@ import java.io.IOException; -import org.w3c.dom.Element; + import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Element; Modified: xerces/java/trunk/src/org/apache/xml/serialize/EncodingInfo.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/EncodingInfo.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/EncodingInfo.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/EncodingInfo.java Sun Sep 28 14:08:27 2008 @@ -21,6 +21,7 @@ import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; + import org.apache.xerces.util.EncodingMap; /** Modified: xerces/java/trunk/src/org/apache/xml/serialize/HTMLSerializer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/HTMLSerializer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/HTMLSerializer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/HTMLSerializer.java Sun Sep 28 14:08:27 2008 @@ -33,14 +33,13 @@ package org.apache.xml.serialize; -import org.apache.xerces.dom.DOMMessageFormatter; - import java.io.IOException; import java.io.OutputStream; import java.io.Writer; import java.util.Enumeration; import java.util.Locale; +import org.apache.xerces.dom.DOMMessageFormatter; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: xerces/java/trunk/src/org/apache/xml/serialize/HTMLdtd.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/HTMLdtd.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/HTMLdtd.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/HTMLdtd.java Sun Sep 28 14:08:27 2008 @@ -21,14 +21,14 @@ package org.apache.xml.serialize; -import org.apache.xerces.dom.DOMMessageFormatter; - +import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedReader; import java.util.Hashtable; import java.util.Locale; +import org.apache.xerces.dom.DOMMessageFormatter; + /** * Utility class for accessing information specific to HTML documents. * The HTML DTD is expressed as three utility function groups. Two methods Modified: xerces/java/trunk/src/org/apache/xml/serialize/IndentPrinter.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/IndentPrinter.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/IndentPrinter.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/IndentPrinter.java Sun Sep 28 14:08:27 2008 @@ -19,9 +19,9 @@ package org.apache.xml.serialize; -import java.io.Writer; -import java.io.StringWriter; import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; /** Modified: xerces/java/trunk/src/org/apache/xml/serialize/ObjectFactory.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/ObjectFactory.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/ObjectFactory.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/ObjectFactory.java Sun Sep 28 14:08:27 2008 @@ -17,14 +17,13 @@ package org.apache.xml.serialize; -import java.io.InputStream; -import java.io.IOException; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; - -import java.util.Properties; -import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Properties; /** * This class is duplicated for each JAXP subpackage so keep it in sync. Modified: xerces/java/trunk/src/org/apache/xml/serialize/Printer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/Printer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/Printer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/Printer.java Sun Sep 28 14:08:27 2008 @@ -25,9 +25,9 @@ package org.apache.xml.serialize; -import java.io.Writer; -import java.io.StringWriter; import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; /** Modified: xerces/java/trunk/src/org/apache/xml/serialize/SecuritySupport.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/SecuritySupport.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/SecuritySupport.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/SecuritySupport.java Sun Sep 28 14:08:27 2008 @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; - import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; Modified: xerces/java/trunk/src/org/apache/xml/serialize/Serializer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/Serializer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/Serializer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/Serializer.java Sun Sep 28 14:08:27 2008 @@ -23,6 +23,8 @@ import java.io.OutputStream; import java.io.Writer; +import org.w3c.dom.Document; +import org.w3c.dom.Element; import org.xml.sax.ContentHandler; import org.xml.sax.DocumentHandler; Modified: xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactory.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactory.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactory.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactory.java Sun Sep 28 14:08:27 2008 @@ -18,8 +18,8 @@ package org.apache.xml.serialize; import java.io.OutputStream; -import java.io.Writer; import java.io.UnsupportedEncodingException; +import java.io.Writer; import java.util.Hashtable; import java.util.StringTokenizer; Modified: xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactoryImpl.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactoryImpl.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactoryImpl.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/SerializerFactoryImpl.java Sun Sep 28 14:08:27 2008 @@ -20,8 +20,9 @@ import java.io.OutputStream; -import java.io.Writer; import java.io.UnsupportedEncodingException; +import java.io.Writer; + import org.apache.xerces.dom.DOMMessageFormatter; /** Modified: xerces/java/trunk/src/org/apache/xml/serialize/XMLSerializer.java URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xml/serialize/XMLSerializer.java?rev=699892&r1=699891&r2=699892&view=diff ============================================================================== --- xerces/java/trunk/src/org/apache/xml/serialize/XMLSerializer.java (original) +++ xerces/java/trunk/src/org/apache/xml/serialize/XMLSerializer.java Sun Sep 28 14:08:27 2008 @@ -43,6 +43,7 @@ import org.apache.xerces.xni.NamespaceContext; import org.w3c.dom.Attr; import org.w3c.dom.DOMError; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
