You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2003/09/30 23:35:32 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/identity Selector.java XPathMatcher.java
elena 2003/09/30 14:35:32
Modified: java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xs/identity Selector.java
XPathMatcher.java
Log:
Additional clean up for identity constraint code: removing parameter that is not used.
Revision Changes Path
1.145 +2 -5 xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- XMLSchemaValidator.java 25 Sep 2003 22:59:21 -0000 1.144
+++ XMLSchemaValidator.java 30 Sep 2003 21:35:32 -0000 1.145
@@ -2013,10 +2013,7 @@
int count = fMatcherStack.getMatcherCount();
for (int i = 0; i < count; i++) {
XPathMatcher matcher = fMatcherStack.getMatcherAt(i);
- matcher.startElement(
- element,
- attributes,
- (fCurrentElemDecl != null) ? fCurrentElemDecl.fType : null);
+ matcher.startElement( element, attributes);
}
if (fAugPSVI) {
1.14 +5 -6 xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Selector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Selector.java 25 Sep 2003 22:59:21 -0000 1.13
+++ Selector.java 30 Sep 2003 21:35:32 -0000 1.14
@@ -246,9 +246,8 @@
* @param elementDecl: The element declaration
*
*/
- public void startElement(QName element, XMLAttributes attributes,
- XSTypeDefinition type) {
- super.startElement(element, attributes, type);
+ public void startElement(QName element, XMLAttributes attributes) {
+ super.startElement(element, attributes);
fElementDepth++;
// activate the fields, if selector is matched
int matched = isMatched();
@@ -261,7 +260,7 @@
for (int i = 0; i < count; i++) {
Field field = fIdentityConstraint.getFieldAt(i);
XPathMatcher matcher = fFieldActivator.activateField(field, fInitialDepth);
- matcher.startElement(element, attributes, type);
+ matcher.startElement(element, attributes);
}
}
1.17 +2 -3 xml-xerces/java/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java
Index: XPathMatcher.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/XPathMatcher.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XPathMatcher.java 25 Sep 2003 22:59:21 -0000 1.16
+++ XPathMatcher.java 30 Sep 2003 21:35:32 -0000 1.17
@@ -240,8 +240,7 @@
*
* @throws SAXException Thrown by handler to signal an error.
*/
- public void startElement(QName element, XMLAttributes attributes,
- XSTypeDefinition type){
+ public void startElement(QName element, XMLAttributes attributes){
if (DEBUG_METHODS2) {
System.out.println(toString()+"#startElement("+
"element={"+element+"},"+
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org