Author: jukka
Date: Tue Mar 18 15:39:22 2008
New Revision: 638616
URL: http://svn.apache.org/viewvc?rev=638616&view=rev
Log:
TIKA-130: self-or-descendant axis does not match self in streaming XPath
- Also added @Override annotations to SubtreeMatcher
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/src/main/java/org/apache/tika/sax/xpath/SubtreeMatcher.java
Modified: incubator/tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=638616&r1=638615&r2=638616&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Tue Mar 18 15:39:22 2008
@@ -26,6 +26,8 @@
11. TIKA-129 - node() support for the streaming XPath utility (Jukka Zitting)
+12. TIKA-130 - self-or-descendant axis does not match self in streaming XPath
+ (Jukka Zitting)
Release 0.1-incubating - 12/27/2007
Modified:
incubator/tika/trunk/src/main/java/org/apache/tika/sax/xpath/SubtreeMatcher.java
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/java/org/apache/tika/sax/xpath/SubtreeMatcher.java?rev=638616&r1=638615&r2=638616&view=diff
==============================================================================
---
incubator/tika/trunk/src/main/java/org/apache/tika/sax/xpath/SubtreeMatcher.java
(original)
+++
incubator/tika/trunk/src/main/java/org/apache/tika/sax/xpath/SubtreeMatcher.java
Tue Mar 18 15:39:22 2008
@@ -28,6 +28,7 @@
this.then = then;
}
+ @Override
public Matcher descend(String namespace, String name) {
Matcher next = then.descend(namespace, name);
if (next == FAIL || next == then) {
@@ -37,10 +38,17 @@
}
}
+ @Override
+ public boolean matchesElement() {
+ return then.matchesElement();
+ }
+
+ @Override
public boolean matchesAttribute(String namespace, String name) {
return then.matchesAttribute(namespace, name);
}
+ @Override
public boolean matchesText() {
return then.matchesText();
}
