You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@apache.org on 2001/01/18 23:53:05 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema/identity Selector.java XPathMatcher.java
lehors 01/01/18 14:53:05
Modified: java/src/org/apache/xerces/validators/schema/identity
Selector.java XPathMatcher.java
Log:
fixed compilations pb with regard to static references to inner
classes. Instead of accessing the static field through the inner class itself
we neeed to go through the instance variable.
Revision Changes Path
1.2 +3 -3 xml-xerces/java/src/org/apache/xerces/validators/schema/identity/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/identity/Selector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Selector.java 2001/01/18 07:10:55 1.1
+++ Selector.java 2001/01/18 22:53:05 1.2
@@ -68,7 +68,7 @@
* Schema identity constraint selector.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1 2001/01/18 07:10:55 andyc Exp $
+ * @version $Id: Selector.java,v 1.2 2001/01/18 22:53:05 lehors Exp $
*/
public class Selector {
@@ -131,7 +131,7 @@
* Schema identity constraint selector XPath expression.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1 2001/01/18 07:10:55 andyc Exp $
+ * @version $Id: Selector.java,v 1.2 2001/01/18 22:53:05 lehors Exp $
*/
public static class XPath
extends org.apache.xerces.validators.schema.identity.XPath {
@@ -151,7 +151,7 @@
// verify that an attribute is not selected
XPath.Axis axis = fLocationPath.steps[fLocationPath.steps.length-1].axis;
- if (axis.type == XPath.Axis.ATTRIBUTE) {
+ if (axis.type == axis.ATTRIBUTE) {
throw new XPathException("selectors cannot select attributes");
}
1.2 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/schema/identity/XPathMatcher.java
Index: XPathMatcher.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/identity/XPathMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathMatcher.java 2001/01/18 07:10:55 1.1
+++ XPathMatcher.java 2001/01/18 22:53:05 1.2
@@ -72,7 +72,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: XPathMatcher.java,v 1.1 2001/01/18 07:10:55 andyc Exp $
+ * @version $Id: XPathMatcher.java,v 1.2 2001/01/18 22:53:05 lehors Exp $
*/
public class XPathMatcher {
@@ -293,7 +293,7 @@
}
XPath.Axis axis = step.axis;
switch (axis.type) {
- case XPath.Axis.SELF: {
+ case axis.SELF: {
if (DEBUG_MATCH) {
System.out.println("XPATH["+toString()+"]: "+
"axis: SELF");
@@ -313,7 +313,7 @@
}
continue;
}
- case XPath.Axis.CHILD: {
+ case axis.CHILD: {
int elementStep = fCurrentStep + 1;
if (DEBUG_MATCH) {
System.out.println("XPATH["+toString()+"]: "+
@@ -321,7 +321,7 @@
}
// check element match
XPath.NodeTest nodeTest = step.nodeTest;
- if (nodeTest.type == XPath.NodeTest.QNAME) {
+ if (nodeTest.type == nodeTest.QNAME) {
if (DEBUG_MATCH) {
System.out.println("XPATH["+toString()+"]: "+
"nodeTest: QNAME");
@@ -377,10 +377,10 @@
if (fCurrentStep < fLocationPath.steps.length) {
step = fLocationPath.steps[fCurrentStep];
axis = step.axis;
- if (axis.type == XPath.Axis.ATTRIBUTE) {
+ if (axis.type == axis.ATTRIBUTE) {
fCurrentStep++;
nodeTest = step.nodeTest;
- if (nodeTest.type == XPath.NodeTest.QNAME) {
+ if (nodeTest.type == nodeTest.QNAME) {
boolean matched = true;
QName name = nodeTest.name;
if (name.uri == -1) {
@@ -618,7 +618,7 @@
org.apache.xerces.parsers.SAXParser parser =
new org.apache.xerces.parsers.SAXParser(symbols) {
public void startDocument() throws Exception {
- matcher.startDocumentFragment(fStringPool, null);
+ matcher.startDocumentFragment(matcher.fStringPool, null);
}
public void startElement(QName element, XMLAttrList attributes, int handle) throws Exception {
matcher.startElement(element, attributes, handle);