You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2008/09/28 23:40:52 UTC
svn commit: r699902 [1/2] - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache: html/dom/ wml/
xerces/dom/ xerces/dom3/as/ xerces/impl/ xerces/impl/dtd/
xerces/impl/dtd/models/ xerces/impl/dv/ xerces/impl/dv/dtd/
xerces/impl/dv/util/ xerces/imp...
Author: mrglavas
Date: Sun Sep 28 14:40:49 2008
New Revision: 699902
URL: http://svn.apache.org/viewvc?rev=699902&view=rev
Log:
Reorganized / cleaned up imports using Eclipse.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/HTMLMapElementImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDOMImplementation.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDocument.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASDOMImplementationImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASModelImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/CoreDocumentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMErrorImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationListImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMInputImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMOutputImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeepNodeListImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeferredDocumentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DocumentTypeImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/NodeImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIDocumentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIElementNSImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ParentNode.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ProcessingInstructionImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom3/as/ElementEditAS.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLVersionDetector.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLElementDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/util/ByteListImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/ASCIIReader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UCSReader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UTF8Reader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/regex/Token.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSConstraints.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGrammarBucket.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGroupDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSLoaderImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSModelGroupImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMNodeFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XS11AllCM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSAllCM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSCMValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/XSEmptyCM.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/AttrImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/DefaultElement.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/DefaultNode.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/DefaultText.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/DefaultXMLDocumentHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/NamedNodeMapImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaParsingConfig.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSAnnotationInfo.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/StringListImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSNamedMap4Types.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/DOMDocumentHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/DOMResultBuilder.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/JAXPValidationMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/SoftReferenceGrammarPool.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/AbstractDOMParser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/CachingParserPool.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DOMParser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/DTDParser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/SecurityConfiguration.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/XPointerParserConfiguration.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/AugmentationsImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DOMEntityResolverWrapper.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/DOMErrorHandlerWrapper.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/EntityResolver2Wrapper.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/EntityResolverWrapper.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/HTTPInputSource.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXLocatorWrapper.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/SAXMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/XMLCatalogResolver.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/grammars/XMLGrammarLoader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLComponent.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLDTDScanner.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLDocumentScanner.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLEntityResolver.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLInputSource.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xni/parser/XMLParserConfiguration.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xpointer/XPointerMessageFormatter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/BaseMarkupSerializer.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/DOMSerializer.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/EncodingInfo.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/HTMLSerializer.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/HTMLdtd.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/IndentPrinter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/ObjectFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/Printer.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/SecuritySupport.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/Serializer.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/SerializerFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/SerializerFactoryImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xml/serialize/XMLSerializer.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/HTMLMapElementImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/HTMLMapElementImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/HTMLMapElementImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/HTMLMapElementImpl.java Sun Sep 28 14:40:49 2008
@@ -16,9 +16,9 @@
*/
package org.apache.html.dom;
+import org.w3c.dom.Node;
import org.w3c.dom.html.HTMLCollection;
import org.w3c.dom.html.HTMLMapElement;
-import org.w3c.dom.Node;
/**
* @xerces.internal
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/ObjectFactory.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/ObjectFactory.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/ObjectFactory.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/ObjectFactory.java Sun Sep 28 14:40:49 2008
@@ -17,14 +17,13 @@
package org.apache.html.dom;
-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/branches/xml-schema-1.1-dev/src/org/apache/html/dom/SecuritySupport.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/SecuritySupport.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/SecuritySupport.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/html/dom/SecuritySupport.java Sun Sep 28 14:40:49 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/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDOMImplementation.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDOMImplementation.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDOMImplementation.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDOMImplementation.java Sun Sep 28 14:40:49 2008
@@ -16,7 +16,7 @@
*/
package org.apache.wml;
-import org.w3c.dom.*;
+import org.w3c.dom.DOMImplementation;
/**
* <p>The interface is modeled after DOM1 Spec for HTML from W3C.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDocument.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDocument.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDocument.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/wml/WMLDocument.java Sun Sep 28 14:40:49 2008
@@ -16,7 +16,7 @@
*/
package org.apache.wml;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
/**
* <p>The interface is modeled after DOM1 Spec for HTML from W3C.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASDOMImplementationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASDOMImplementationImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASDOMImplementationImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASDOMImplementationImpl.java Sun Sep 28 14:40:49 2008
@@ -17,14 +17,13 @@
package org.apache.xerces.dom;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-
-import org.apache.xerces.dom3.as.DOMImplementationAS;
import org.apache.xerces.dom3.as.ASModel;
import org.apache.xerces.dom3.as.DOMASBuilder;
import org.apache.xerces.dom3.as.DOMASWriter;
+import org.apache.xerces.dom3.as.DOMImplementationAS;
import org.apache.xerces.parsers.DOMASBuilderImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASModelImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASModelImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASModelImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ASModelImpl.java Sun Sep 28 14:40:49 2008
@@ -19,9 +19,18 @@
import java.util.Vector;
-import org.w3c.dom.DOMException;
-import org.apache.xerces.dom3.as.*;
+import org.apache.xerces.dom3.as.ASAttributeDeclaration;
+import org.apache.xerces.dom3.as.ASContentModel;
+import org.apache.xerces.dom3.as.ASElementDeclaration;
+import org.apache.xerces.dom3.as.ASEntityDeclaration;
+import org.apache.xerces.dom3.as.ASModel;
+import org.apache.xerces.dom3.as.ASNamedObjectMap;
+import org.apache.xerces.dom3.as.ASNotationDeclaration;
+import org.apache.xerces.dom3.as.ASObject;
+import org.apache.xerces.dom3.as.ASObjectList;
+import org.apache.xerces.dom3.as.DOMASException;
import org.apache.xerces.impl.xs.SchemaGrammar;
+import org.w3c.dom.DOMException;
/**
* To begin with, an abstract schema is a generic structure that could
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/AttrImpl.java Sun Sep 28 14:40:49 2008
@@ -21,13 +21,13 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.w3c.dom.TypeInfo;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.w3c.dom.TypeInfo;
/**
* Attribute represents an XML-style attribute of an
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/CoreDocumentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/CoreDocumentImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/CoreDocumentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/CoreDocumentImpl.java Sun Sep 28 14:40:49 2008
@@ -27,15 +27,13 @@
import java.util.WeakHashMap;
import org.apache.xerces.util.URI;
-
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.UserDataHandler;
-import org.apache.xerces.util.XMLChar;
import org.apache.xerces.util.XML11Char;
+import org.apache.xerces.util.XMLChar;
import org.apache.xerces.xni.NamespaceContext;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -50,6 +48,7 @@
import org.w3c.dom.Notation;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.ls.DOMImplementationLS;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMErrorImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMErrorImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMErrorImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMErrorImpl.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,9 @@
package org.apache.xerces.dom;
+import org.apache.xerces.xni.parser.XMLParseException;
import org.w3c.dom.DOMError;
import org.w3c.dom.DOMLocator;
-import org.apache.xerces.xni.parser.XMLParseException;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationListImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationListImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationListImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationListImpl.java Sun Sep 28 14:40:49 2008
@@ -18,8 +18,9 @@
package org.apache.xerces.dom;
import java.util.Vector;
-import org.w3c.dom.DOMImplementationList;
+
import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMImplementationList;
/**
* <p>This class implements the DOM Level 3 Core interface DOMImplementationList.</p>
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMImplementationSourceImpl.java Sun Sep 28 14:40:49 2008
@@ -19,10 +19,10 @@
import java.util.StringTokenizer;
import java.util.Vector;
+
+import org.w3c.dom.DOMImplementation;
import org.w3c.dom.DOMImplementationList;
import org.w3c.dom.DOMImplementationSource;
-import org.w3c.dom.DOMImplementation;
-import org.apache.xerces.dom.DOMImplementationListImpl;
/**
* Supply one the right implementation, based upon requested features. Each
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMInputImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMInputImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMInputImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMInputImpl.java Sun Sep 28 14:40:49 2008
@@ -17,10 +17,10 @@
package org.apache.xerces.dom;
-import org.w3c.dom.ls.LSInput;
-
-import java.io.Reader;
import java.io.InputStream;
+import java.io.Reader;
+
+import org.w3c.dom.ls.LSInput;
/**
* This Class <code>DOMInputImpl</code> represents a single input source for an XML entity.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMMessageFormatter.java Sun Sep 28 14:40:49 2008
@@ -19,8 +19,8 @@
package org.apache.xerces.dom;
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.ResourceBundle;
import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
/**
* Used to format DOM error messages, using the system locale.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMOutputImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMOutputImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMOutputImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMOutputImpl.java Sun Sep 28 14:40:49 2008
@@ -17,10 +17,10 @@
package org.apache.xerces.dom;
-import org.w3c.dom.ls.LSOutput;
-
-import java.io.Writer;
import java.io.OutputStream;
+import java.io.Writer;
+
+import org.w3c.dom.ls.LSOutput;
/**
* This class represents an output destination for data.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DOMXSImplementationSourceImpl.java Sun Sep 28 14:40:49 2008
@@ -17,10 +17,11 @@
package org.apache.xerces.dom;
+import java.util.Vector;
+
import org.apache.xerces.impl.xs.XSImplementationImpl;
-import org.w3c.dom.DOMImplementationList;
import org.w3c.dom.DOMImplementation;
-import java.util.Vector;
+import org.w3c.dom.DOMImplementationList;
/**
* Allows to retrieve <code>XSImplementation</code>, DOM Level 3 Core and LS implementations
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeepNodeListImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeepNodeListImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeepNodeListImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeepNodeListImpl.java Sun Sep 28 14:40:49 2008
@@ -17,11 +17,11 @@
package org.apache.xerces.dom;
+import java.util.Vector;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.Vector;
-
/**
* This class implements the DOM's NodeList behavior for
* Element.getElementsByTagName()
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeferredDocumentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeferredDocumentImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeferredDocumentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DeferredDocumentImpl.java Sun Sep 28 14:40:49 2008
@@ -17,12 +17,12 @@
package org.apache.xerces.dom;
+import java.util.Vector;
+
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import java.util.Vector;
-
/**
* The Document interface represents the entire HTML or XML document.
* Conceptually, it is the root of the document tree, and provides the
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DocumentTypeImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DocumentTypeImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DocumentTypeImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/DocumentTypeImpl.java Sun Sep 28 14:40:49 2008
@@ -17,11 +17,12 @@
package org.apache.xerces.dom;
+import java.util.Hashtable;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.DocumentType;
-import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
-import java.util.Hashtable;
+import org.w3c.dom.Node;
import org.w3c.dom.UserDataHandler;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementImpl.java Sun Sep 28 14:40:49 2008
@@ -17,6 +17,7 @@
package org.apache.xerces.dom;
+import org.apache.xerces.util.URI;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -24,9 +25,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-
import org.w3c.dom.TypeInfo;
-import org.apache.xerces.util.URI;
/**
* Elements represent most of the "markup" and structure of the
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ElementNSImpl.java Sun Sep 28 14:40:49 2008
@@ -17,12 +17,11 @@
package org.apache.xerces.dom;
-import org.apache.xerces.xs.XSSimpleTypeDefinition;
-import org.apache.xerces.xs.XSTypeDefinition;
import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
import org.apache.xerces.impl.xs.XSComplexTypeDecl;
-import org.apache.xerces.util.URI;
import org.apache.xerces.xni.NamespaceContext;
+import org.apache.xerces.xs.XSSimpleTypeDefinition;
+import org.apache.xerces.xs.XSTypeDefinition;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/NodeImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/NodeImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/NodeImpl.java Sun Sep 28 14:40:49 2008
@@ -22,13 +22,13 @@
import java.io.Serializable;
import java.util.Hashtable;
-import org.w3c.dom.UserDataHandler;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentType;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ObjectFactory.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ObjectFactory.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ObjectFactory.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ObjectFactory.java Sun Sep 28 14:40:49 2008
@@ -17,14 +17,13 @@
package org.apache.xerces.dom;
-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/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIAttrNSImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIAttrNSImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIAttrNSImpl.java Sun Sep 28 14:40:49 2008
@@ -23,7 +23,12 @@
import java.io.ObjectOutputStream;
import org.apache.xerces.xs.AttributePSVI;
-import org.apache.xerces.xs.*;
+import org.apache.xerces.xs.ShortList;
+import org.apache.xerces.xs.StringList;
+import org.apache.xerces.xs.XSAttributeDeclaration;
+import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSSimpleTypeDefinition;
+import org.apache.xerces.xs.XSTypeDefinition;
/**
* Attribute namespace implementation; stores PSVI attribute items.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIDocumentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIDocumentImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIDocumentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIDocumentImpl.java Sun Sep 28 14:40:49 2008
@@ -21,9 +21,15 @@
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+
+import org.w3c.dom.Attr;
import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.*;
/**
* Our own document implementation, which knows how to create an element
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIElementNSImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIElementNSImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIElementNSImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/PSVIElementNSImpl.java Sun Sep 28 14:40:49 2008
@@ -23,7 +23,14 @@
import java.io.ObjectOutputStream;
import org.apache.xerces.xs.ElementPSVI;
-import org.apache.xerces.xs.*;
+import org.apache.xerces.xs.ShortList;
+import org.apache.xerces.xs.StringList;
+import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSElementDeclaration;
+import org.apache.xerces.xs.XSModel;
+import org.apache.xerces.xs.XSNotationDeclaration;
+import org.apache.xerces.xs.XSSimpleTypeDefinition;
+import org.apache.xerces.xs.XSTypeDefinition;
/**
* Element namespace implementation; stores PSVI element items.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ParentNode.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ParentNode.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ParentNode.java Sun Sep 28 14:40:49 2008
@@ -17,10 +17,10 @@
package org.apache.xerces.dom;
-import java.io.Serializable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ProcessingInstructionImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ProcessingInstructionImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/ProcessingInstructionImpl.java Sun Sep 28 14:40:49 2008
@@ -17,6 +17,7 @@
package org.apache.xerces.dom;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/SecuritySupport.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/SecuritySupport.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/SecuritySupport.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom/SecuritySupport.java Sun Sep 28 14:40:49 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/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom3/as/ElementEditAS.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom3/as/ElementEditAS.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom3/as/ElementEditAS.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/dom3/as/ElementEditAS.java Sun Sep 28 14:40:49 2008
@@ -12,9 +12,9 @@
package org.apache.xerces.dom3.as;
+import org.w3c.dom.Attr;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Attr;
/**
* @deprecated
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java Sun Sep 28 14:40:49 2008
@@ -17,11 +17,12 @@
package org.apache.xerces.impl;
+import java.io.EOFException;
import java.io.IOException;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
-import org.apache.xerces.util.XMLChar;
import org.apache.xerces.util.XML11Char;
+import org.apache.xerces.util.XMLChar;
import org.apache.xerces.util.XMLStringBuffer;
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLString;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLVersionDetector.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLVersionDetector.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLVersionDetector.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLVersionDetector.java Sun Sep 28 14:40:49 2008
@@ -24,6 +24,7 @@
import org.apache.xerces.impl.io.MalformedByteSequenceException;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLComponentManager;
import org.apache.xerces.xni.parser.XMLConfigurationException;
import org.apache.xerces.xni.parser.XMLInputSource;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/DTDGrammarBucket.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,10 @@
package org.apache.xerces.impl.dtd;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
import java.util.Hashtable;
+import org.apache.xerces.xni.grammars.XMLGrammarDescription;
+
/**
* This very simple class is the skeleton of what the DTDValidator could use
* to store various grammars that it gets from the GrammarPool. As in the
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDDescription.java Sun Sep 28 14:40:49 2008
@@ -17,12 +17,12 @@
package org.apache.xerces.impl.dtd;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.parser.XMLInputSource;
+import java.util.Vector;
import org.apache.xerces.util.XMLResourceIdentifierImpl;
-import java.util.Vector;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.grammars.XMLGrammarDescription;
+import org.apache.xerces.xni.parser.XMLInputSource;
/**
* All information specific to DTD grammars.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDLoader.java Sun Sep 28 14:40:49 2008
@@ -17,29 +17,27 @@
package org.apache.xerces.impl.dtd;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Locale;
+
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.XMLDTDScannerImpl;
-import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.XMLEntityManager;
+import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
-
-import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.util.DefaultErrorHandler;
-
+import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XMLGrammarLoader;
import org.apache.xerces.xni.grammars.Grammar;
+import org.apache.xerces.xni.grammars.XMLGrammarLoader;
+import org.apache.xerces.xni.grammars.XMLGrammarPool;
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 java.util.Locale;
-import java.io.IOException;
-import java.io.EOFException;
-import java.io.StringReader;
-
/**
* The DTD loader. The loader knows how to build grammars from XMLInputSources.
* It extends the DTD processor in order to do this; it's
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLElementDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLElementDecl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLElementDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLElementDecl.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.dtd;
-import org.apache.xerces.xni.QName;
import org.apache.xerces.impl.dtd.models.ContentModelValidator;
+import org.apache.xerces.xni.QName;
/**
* @xerces.internal
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/MixedContentModel.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,8 @@
package org.apache.xerces.impl.dtd.models;
-import org.apache.xerces.xni.QName;
-
import org.apache.xerces.impl.dtd.XMLContentSpec;
+import org.apache.xerces.xni.QName;
/**
* MixedContentModel is a derivative of the abstract content model base
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/models/SimpleContentModel.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,8 @@
package org.apache.xerces.impl.dtd.models;
-import org.apache.xerces.xni.QName;
-
import org.apache.xerces.impl.dtd.XMLContentSpec;
+import org.apache.xerces.xni.QName;
/**
* SimpleContentModel is a derivative of the abstract content model base
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeException.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,9 @@
package org.apache.xerces.impl.dv;
-import java.util.ResourceBundle;
-import java.util.PropertyResourceBundle;
import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
/**
* Base class for datatype exceptions. For DTD types, the exception can be
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/DatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,6 @@
package org.apache.xerces.impl.dv;
-import org.apache.xerces.impl.dv.ValidationContext;
/**
* The interface that a DTD datatype must implement. The implementation of this
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ObjectFactory.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ObjectFactory.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ObjectFactory.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ObjectFactory.java Sun Sep 28 14:40:49 2008
@@ -17,14 +17,13 @@
package org.apache.xerces.impl.dv;
-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/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/SecuritySupport.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/SecuritySupport.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/SecuritySupport.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/SecuritySupport.java Sun Sep 28 14:40:49 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/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/DTDDVFactoryImpl.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,10 @@
package org.apache.xerces.impl.dv.dtd;
+import java.util.Hashtable;
+
import org.apache.xerces.impl.dv.DTDDVFactory;
import org.apache.xerces.impl.dv.DatatypeValidator;
-import java.util.Hashtable;
/**
* the factory to create/return built-in schema DVs and create user-defined DVs
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
/**
* <P>ENTITYDatatypeValidator implements the
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XMLChar;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XMLChar;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/ListDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,9 +17,12 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
import java.util.StringTokenizer;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
+
/**
* For list types: ENTITIES, IDREFS, NMTOKENS.
*
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NMTOKENDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XMLChar;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
/**
* NOTATIONValidator defines the interface that data type validators must obey.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/StringDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,9 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.DatatypeValidator;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
/**
* <P>StringValidator validates that XML content is a W3C string type.</P>
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,8 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XML11Char;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11IDREFDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,8 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XML11Char;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java Sun Sep 28 14:40:49 2008
@@ -17,7 +17,8 @@
package org.apache.xerces.impl.dv.dtd;
-import org.apache.xerces.impl.dv.*;
+import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
+import org.apache.xerces.impl.dv.ValidationContext;
import org.apache.xerces.util.XML11Char;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/util/ByteListImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/util/ByteListImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/util/ByteListImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/util/ByteListImpl.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.dv.util;
-import org.apache.xerces.xs.datatypes.ByteList;
import org.apache.xerces.xs.XSException;
+import org.apache.xerces.xs.datatypes.ByteList;
/**
* Implementation of <code>org.apache.xerces.xs.datatypes.ByteList</code>.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java Sun Sep 28 14:40:49 2008
@@ -18,8 +18,8 @@
package org.apache.xerces.impl.dv.xs;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
-import org.apache.xerces.util.URI;
import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.util.URI;
/**
* Represent the schema type "anyURI"
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java Sun Sep 28 14:40:49 2008
@@ -18,11 +18,11 @@
package org.apache.xerces.impl.dv.xs;
import org.apache.xerces.impl.dv.SchemaDVFactory;
-import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.dv.XSFacets;
+import org.apache.xerces.impl.dv.XSSimpleType;
+import org.apache.xerces.util.SymbolHash;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSObjectList;
-import org.apache.xerces.util.SymbolHash;
/**
* the factory to create/return built-in schema DVs and create user-defined DVs
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.dv.xs;
-import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.dv.XSFacets;
+import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.util.SymbolHash;
import org.apache.xerces.xs.XSConstants;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java Sun Sep 28 14:40:49 2008
@@ -18,8 +18,8 @@
package org.apache.xerces.impl.dv.xs;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
-import org.apache.xerces.util.XMLChar;
import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.util.XMLChar;
/**
* Represent the schema type "ID"
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/ASCIIReader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/ASCIIReader.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/ASCIIReader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/ASCIIReader.java Sun Sep 28 14:40:49 2008
@@ -17,12 +17,13 @@
package org.apache.xerces.impl.io;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.util.Locale;
-import org.apache.xerces.util.MessageFormatter;
+
import org.apache.xerces.impl.msg.XMLMessageFormatter;
+import org.apache.xerces.util.MessageFormatter;
/**
* A simple ASCII byte reader. This is an optimized reader for reading
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/MalformedByteSequenceException.java Sun Sep 28 14:40:49 2008
@@ -19,6 +19,7 @@
import java.io.CharConversionException;
import java.util.Locale;
+
import org.apache.xerces.util.MessageFormatter;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UCSReader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UCSReader.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UCSReader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UCSReader.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.io;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UTF8Reader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UTF8Reader.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UTF8Reader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/io/UTF8Reader.java Sun Sep 28 14:40:49 2008
@@ -17,13 +17,13 @@
package org.apache.xerces.impl.io;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
-
import java.util.Locale;
-import org.apache.xerces.util.MessageFormatter;
+
import org.apache.xerces.impl.msg.XMLMessageFormatter;
+import org.apache.xerces.util.MessageFormatter;
/**
* <p>A UTF-8 reader.</p>
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLMessageFormatter.java Sun Sep 28 14:40:49 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;
import org.apache.xerces.util.MessageFormatter;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java Sun Sep 28 14:40:49 2008
@@ -17,12 +17,12 @@
package org.apache.xerces.impl.validation;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.impl.dv.ValidationContext;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.NamespaceContext;
-import java.util.Hashtable;
-import java.util.Enumeration;
/**
* Implementation of ValidationContext inteface. Used to establish an
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20.java Sun Sep 28 14:40:49 2008
@@ -20,9 +20,9 @@
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
import org.apache.xerces.impl.dv.SchemaDVFactory;
+import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.dv.xs.TypeValidator;
import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
-import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.AttributePSVImpl;
import org.apache.xerces.impl.xs.SchemaSymbols;
import org.apache.xerces.util.IntStack;
@@ -32,10 +32,10 @@
import org.apache.xerces.xni.Augmentations;
import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.QName;
+import org.apache.xerces.xni.XMLAttributes;
import org.apache.xerces.xs.ShortList;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSSimpleTypeDefinition;
-import org.apache.xerces.xni.XMLAttributes;
/**
* Bare minimal XPath 2.0 implementation for schema
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/regex/Token.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/regex/Token.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/regex/Token.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/regex/Token.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.xpath.regex;
-import java.util.Vector;
import java.util.Hashtable;
+import java.util.Vector;
/**
* This class represents a node in parse tree.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AttributePSVImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AttributePSVImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AttributePSVImpl.java Sun Sep 28 14:40:49 2008
@@ -17,14 +17,14 @@
package org.apache.xerces.impl.xs;
+import org.apache.xerces.impl.xs.util.StringListImpl;
+import org.apache.xerces.xs.AttributePSVI;
import org.apache.xerces.xs.ShortList;
import org.apache.xerces.xs.StringList;
import org.apache.xerces.xs.XSAttributeDeclaration;
+import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSSimpleTypeDefinition;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.apache.xerces.impl.xs.util.StringListImpl;
-import org.apache.xerces.xs.AttributePSVI;
-import org.apache.xerces.xs.XSConstants;
/**
* Attribute PSV infoset augmentations implementation.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/ElementPSVImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/ElementPSVImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/ElementPSVImpl.java Sun Sep 28 14:40:49 2008
@@ -17,16 +17,16 @@
package org.apache.xerces.impl.xs;
+import org.apache.xerces.impl.xs.util.StringListImpl;
+import org.apache.xerces.xs.ElementPSVI;
import org.apache.xerces.xs.ShortList;
import org.apache.xerces.xs.StringList;
+import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSModel;
import org.apache.xerces.xs.XSNotationDeclaration;
import org.apache.xerces.xs.XSSimpleTypeDefinition;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.apache.xerces.impl.xs.util.StringListImpl;
-import org.apache.xerces.xs.ElementPSVI;
-import org.apache.xerces.xs.XSConstants;
/**
* Element PSV infoset augmentations implementation.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java Sun Sep 28 14:40:49 2008
@@ -17,13 +17,14 @@
package org.apache.xerces.impl.xs;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.xerces.xni.QName;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSSimpleTypeDefinition;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.apache.xerces.xni.QName;
-import java.util.Hashtable;
-import java.util.Vector;
/**
* To store and validate information about substitutionGroup
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAnnotationImpl.java Sun Sep 28 14:40:49 2008
@@ -16,21 +16,21 @@
*/
package org.apache.xerces.impl.xs;
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.apache.xerces.dom.CoreDocumentImpl;
+import org.apache.xerces.parsers.DOMParser;
+import org.apache.xerces.parsers.SAXParser;
import org.apache.xerces.xs.XSAnnotation;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSNamespaceItem;
-import org.apache.xerces.dom.CoreDocumentImpl;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.parsers.DOMParser;
-
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import java.io.StringReader;
-import java.io.IOException;
+import org.xml.sax.SAXException;
/**
* This is an implementation of the XSAnnotation schema component.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeDecl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeDecl.java Sun Sep 28 14:40:49 2008
@@ -17,10 +17,17 @@
package org.apache.xerces.impl.xs;
-import org.apache.xerces.impl.dv.XSSimpleType;
-import org.apache.xerces.xs.*;
import org.apache.xerces.impl.dv.ValidatedInfo;
+import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
+import org.apache.xerces.xs.ShortList;
+import org.apache.xerces.xs.XSAnnotation;
+import org.apache.xerces.xs.XSAttributeDeclaration;
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSNamespaceItem;
+import org.apache.xerces.xs.XSObjectList;
+import org.apache.xerces.xs.XSSimpleTypeDefinition;
/**
* The XML representation for an attribute declaration
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java Sun Sep 28 14:40:49 2008
@@ -18,6 +18,7 @@
package org.apache.xerces.impl.xs;
import org.apache.xerces.impl.dv.ValidatedInfo;
+import org.apache.xerces.impl.xs.util.XSObjectListImpl;
import org.apache.xerces.xs.XSAnnotation;
import org.apache.xerces.xs.XSAttributeGroupDefinition;
import org.apache.xerces.xs.XSAttributeUse;
@@ -25,7 +26,6 @@
import org.apache.xerces.xs.XSNamespaceItem;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSWildcard;
-import org.apache.xerces.impl.xs.util.XSObjectListImpl;
/**
* The XML representation for an attribute group declaration
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java Sun Sep 28 14:40:49 2008
@@ -18,11 +18,20 @@
package org.apache.xerces.impl.xs;
import org.apache.xerces.impl.dv.XSSimpleType;
-import org.apache.xerces.xs.*;
-import org.apache.xerces.impl.xs.models.XSCMValidator;
+import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
import org.apache.xerces.impl.xs.models.CMBuilder;
+import org.apache.xerces.impl.xs.models.XSCMValidator;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
+import org.apache.xerces.xs.XSAttributeUse;
+import org.apache.xerces.xs.XSComplexTypeDefinition;
+import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSNamespaceItem;
+import org.apache.xerces.xs.XSObjectList;
+import org.apache.xerces.xs.XSOpenContent;
+import org.apache.xerces.xs.XSParticle;
+import org.apache.xerces.xs.XSSimpleTypeDefinition;
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.apache.xerces.xs.XSWildcard;
import org.w3c.dom.TypeInfo;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSConstraints.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSConstraints.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSConstraints.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSConstraints.java Sun Sep 28 14:40:49 2008
@@ -17,22 +17,22 @@
package org.apache.xerces.impl.xs;
-import org.apache.xerces.impl.dv.XSSimpleType;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Vector;
+
+import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
import org.apache.xerces.impl.dv.ValidatedInfo;
-import org.apache.xerces.impl.XMLErrorReporter;
+import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.models.CMBuilder;
import org.apache.xerces.impl.xs.models.XSCMValidator;
import org.apache.xerces.impl.xs.util.SimpleLocator;
+import org.apache.xerces.util.SymbolHash;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.apache.xerces.impl.dv.ValidationContext;
-import org.apache.xerces.util.SymbolHash;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Vector;
/**
* Constraints shared by traversers and validator
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java Sun Sep 28 14:40:49 2008
@@ -20,6 +20,8 @@
import org.apache.xerces.impl.dv.ValidatedInfo;
import org.apache.xerces.impl.xs.alternative.XSTypeAlternativeImpl;
import org.apache.xerces.impl.xs.identity.IdentityConstraint;
+import org.apache.xerces.impl.xs.util.XSNamedMapImpl;
+import org.apache.xerces.impl.xs.util.XSObjectListImpl;
import org.apache.xerces.xs.ShortList;
import org.apache.xerces.xs.XSAnnotation;
import org.apache.xerces.xs.XSComplexTypeDefinition;
@@ -29,8 +31,6 @@
import org.apache.xerces.xs.XSNamespaceItem;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSTypeDefinition;
-import org.apache.xerces.impl.xs.util.XSNamedMapImpl;
-import org.apache.xerces.impl.xs.util.XSObjectListImpl;
/**
* The XML representation for an element declaration
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGrammarBucket.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGrammarBucket.java?rev=699902&r1=699901&r2=699902&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGrammarBucket.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSGrammarBucket.java Sun Sep 28 14:40:49 2008
@@ -17,8 +17,8 @@
package org.apache.xerces.impl.xs;
-import java.util.Hashtable;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Vector;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org