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/12/30 22:14:57 UTC
svn commit: r730239 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/
Author: mrglavas
Date: Tue Dec 30 13:14:57 2008
New Revision: 730239
URL: http://svn.apache.org/viewvc?rev=730239&view=rev
Log:
Remove schemaType field. I doubt we need this any time soon and if we ever do we can add it back.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/AttributeImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CharactersImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CommentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/DTDImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndDocumentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndElementImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityReferenceImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NamespaceImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/ProcessingInstructionImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartDocumentImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartElementImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/XMLEventImpl.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/AttributeImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/AttributeImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/AttributeImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/AttributeImpl.java Tue Dec 30 13:14:57 2008
@@ -36,12 +36,12 @@
/**
* Constructor.
*/
- public AttributeImpl(final QName name, final String value, final String dtdType, final boolean isSpecified, final Location location, final QName schemaType) {
- this(ATTRIBUTE, name, value, dtdType, isSpecified, location, schemaType);
+ public AttributeImpl(final QName name, final String value, final String dtdType, final boolean isSpecified, final Location location) {
+ this(ATTRIBUTE, name, value, dtdType, isSpecified, location);
}
- protected AttributeImpl(final int type, final QName name, final String value, final String dtdType, final boolean isSpecified, final Location location, final QName schemaType) {
- super(type, location, schemaType);
+ protected AttributeImpl(final int type, final QName name, final String value, final String dtdType, final boolean isSpecified, final Location location) {
+ super(type, location);
fName = name;
fValue = value;
fDtdType = dtdType;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CharactersImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CharactersImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CharactersImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CharactersImpl.java Tue Dec 30 13:14:57 2008
@@ -17,7 +17,6 @@
package org.apache.xerces.stax.events;
-import javax.xml.namespace.QName;
import javax.xml.stream.Location;
import javax.xml.stream.events.Characters;
@@ -40,8 +39,8 @@
* @param location
* @param schemaType
*/
- public CharactersImpl(final String data, final boolean isWS, final boolean isCData, final boolean isIgnorableWS, final Location location, final QName schemaType) {
- super(CHARACTERS, location, schemaType);
+ public CharactersImpl(final String data, final boolean isWS, final boolean isCData, final boolean isIgnorableWS, final Location location) {
+ super(CHARACTERS, location);
fData = data;
fIsWS = isWS;
fIsCData = isCData;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CommentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CommentImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CommentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/CommentImpl.java Tue Dec 30 13:14:57 2008
@@ -38,7 +38,7 @@
* @param location
*/
public CommentImpl(final String text, final Location location) {
- super(COMMENT, location, null);
+ super(COMMENT, location);
fText = text;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/DTDImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/DTDImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/DTDImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/DTDImpl.java Tue Dec 30 13:14:57 2008
@@ -37,7 +37,7 @@
* Constructor.
*/
public DTDImpl(final String dtd, final Location location) {
- super(XMLStreamConstants.DTD, location, null);
+ super(XMLStreamConstants.DTD, location);
fDtd = dtd;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndDocumentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndDocumentImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndDocumentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndDocumentImpl.java Tue Dec 30 13:14:57 2008
@@ -34,7 +34,7 @@
* @param location Location object for this event.
*/
public EndDocumentImpl(Location location) {
- super(XMLStreamConstants.END_DOCUMENT, location, null);
+ super(XMLStreamConstants.END_DOCUMENT, location);
}
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndElementImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndElementImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndElementImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EndElementImpl.java Tue Dec 30 13:14:57 2008
@@ -41,7 +41,7 @@
* @param location The location object for this event.
*/
public EndElementImpl(final QName name, final Location location) {
- super(XMLStreamConstants.END_ELEMENT, location, null);
+ super(XMLStreamConstants.END_ELEMENT, location);
fName = name;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityDeclarationImpl.java Tue Dec 30 13:14:57 2008
@@ -40,7 +40,7 @@
* @param schemaType
*/
public EntityDeclarationImpl(final String publicId, final String systemId, final String name, final String notationName, final Location location) {
- super(ENTITY_DECLARATION, location, null);
+ super(ENTITY_DECLARATION, location);
fPublicId = publicId;
fSystemId = systemId;
fName = name;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityReferenceImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityReferenceImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityReferenceImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/EntityReferenceImpl.java Tue Dec 30 13:14:57 2008
@@ -40,7 +40,7 @@
* @param location
*/
public EntityReferenceImpl(final EntityDeclaration decl, final Location location) {
- super(ENTITY_REFERENCE, location, null);
+ super(ENTITY_REFERENCE, location);
fDecl = decl;;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NamespaceImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NamespaceImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NamespaceImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NamespaceImpl.java Tue Dec 30 13:14:57 2008
@@ -39,7 +39,7 @@
* @param schemaType
*/
public NamespaceImpl(final String prefix, final String namespaceURI, final Location location) {
- super(NAMESPACE, makeAttributeQName(prefix), namespaceURI, null, true, location, null);
+ super(NAMESPACE, makeAttributeQName(prefix), namespaceURI, null, true, location);
fPrefix = (prefix == null ? "" : prefix);
fNamespaceURI = namespaceURI;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/NotationDeclarationImpl.java Tue Dec 30 13:14:57 2008
@@ -39,7 +39,7 @@
* @param schemaType
*/
public NotationDeclarationImpl(final String name, final String publicId, final String systemId, final Location location) {
- super(NOTATION_DECLARATION, location, null);
+ super(NOTATION_DECLARATION, location);
fName = name;
fPublicId = publicId;
fSystemId = systemId;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/ProcessingInstructionImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/ProcessingInstructionImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/ProcessingInstructionImpl.java Tue Dec 30 13:14:57 2008
@@ -38,7 +38,7 @@
* @param location
*/
public ProcessingInstructionImpl(final String target, final String data, final Location location) {
- super(PROCESSING_INSTRUCTION, location, null);
+ super(PROCESSING_INSTRUCTION, location);
fTarget = target;
fData = data;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartDocumentImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartDocumentImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartDocumentImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartDocumentImpl.java Tue Dec 30 13:14:57 2008
@@ -38,7 +38,7 @@
* @param location
*/
public StartDocumentImpl(final String charEncoding, final boolean encodingSet, final boolean isStandalone, final boolean standaloneSet, final String version, final Location location) {
- super(START_DOCUMENT, location, null);
+ super(START_DOCUMENT, location);
fCharEncoding = charEncoding;
fEncodingSet = encodingSet;
fIsStandalone = isStandalone;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartElementImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartElementImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartElementImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/StartElementImpl.java Tue Dec 30 13:14:57 2008
@@ -56,8 +56,8 @@
* @param location
* @param schemaType
*/
- public StartElementImpl(final QName name, final NamespaceContext namespaceContext, final Location location, final QName schemaType) {
- super(START_ELEMENT, location, schemaType);
+ public StartElementImpl(final QName name, final NamespaceContext namespaceContext, final Location location) {
+ super(START_ELEMENT, location);
fName = name;
fNamespaceContext = namespaceContext;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/XMLEventImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/XMLEventImpl.java?rev=730239&r1=730238&r2=730239&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/XMLEventImpl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/stax/events/XMLEventImpl.java Tue Dec 30 13:14:57 2008
@@ -29,7 +29,6 @@
import javax.xml.stream.events.XMLEvent;
/**
- *
* @author Lucian Holland
*
* @version $Id$
@@ -48,17 +47,11 @@
private Location fLocation;
/**
- * The QName of the schema type for this element.
- */
- private QName fSchemaType;
-
- /**
* Constructor.
*/
- public XMLEventImpl(final int eventType, final Location location, final QName schemaType) {
+ public XMLEventImpl(final int eventType, final Location location) {
fEventType = eventType;
fLocation = location;
- fSchemaType = schemaType;
}
/**
@@ -163,7 +156,7 @@
* @see javax.xml.stream.events.XMLEvent#getSchemaType()
*/
public QName getSchemaType() {
- return fSchemaType;
+ return null;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org