You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2009/12/23 00:59:42 UTC
svn commit: r893356 - in
/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery:
datamodel/ datamodel/dom/ datamodel/dtm/ runtime/functions/
Author: tillw
Date: Tue Dec 22 23:59:41 2009
New Revision: 893356
URL: http://svn.apache.org/viewvc?rev=893356&view=rev
Log:
- removed XDMNode.getTypedValue (which was never used)
- renamed XDMNode.getAtomizedValue to getTypedValue
Modified:
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/XDMNode.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dom/DOMNode.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dtm/DTMNodeImpl.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/AbstractGeneralComparisonIterator.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnCodepointsToStringIterator.java
incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnDataIterator.java
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/XDMNode.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/XDMNode.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/XDMNode.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/XDMNode.java Tue Dec 22 23:59:41 2009
@@ -19,7 +19,6 @@
import org.apache.vxquery.datamodel.atomic.AnyUriValue;
import org.apache.vxquery.datamodel.atomic.QNameValue;
import org.apache.vxquery.runtime.base.CloseableIterator;
-import org.apache.vxquery.runtime.base.OpenableCloseableIterator;
public interface XDMNode extends XDMItem {
public Object getImplementationIdentifier();
@@ -42,9 +41,7 @@
public boolean getIsNilled();
- public OpenableCloseableIterator getTypedValue();
-
- public XDMValue getAtomizedValue();
+ public XDMValue getTypedValue();
public boolean hasChildren();
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dom/DOMNode.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dom/DOMNode.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dom/DOMNode.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dom/DOMNode.java Tue Dec 22 23:59:41 2009
@@ -23,8 +23,6 @@
import org.apache.vxquery.datamodel.atomic.AnyUriValue;
import org.apache.vxquery.datamodel.atomic.QNameValue;
import org.apache.vxquery.runtime.base.CloseableIterator;
-import org.apache.vxquery.runtime.base.OpenableCloseableIterator;
-import org.apache.vxquery.runtime.core.SingletonCloseableIterator;
import org.w3c.dom.Attr;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -152,12 +150,7 @@
return parent;
}
- @Override
- public OpenableCloseableIterator getTypedValue() {
- return new SingletonCloseableIterator(getAtomizedValue());
- }
-
- public XDMValue getAtomizedValue() {
+ public XDMValue getTypedValue() {
switch (node.getNodeType()) {
case Node.COMMENT_NODE:
case Node.PROCESSING_INSTRUCTION_NODE:
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dtm/DTMNodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dtm/DTMNodeImpl.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dtm/DTMNodeImpl.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/datamodel/dtm/DTMNodeImpl.java Tue Dec 22 23:59:41 2009
@@ -24,8 +24,6 @@
import org.apache.vxquery.datamodel.atomic.AnyUriValue;
import org.apache.vxquery.datamodel.atomic.QNameValue;
import org.apache.vxquery.runtime.base.CloseableIterator;
-import org.apache.vxquery.runtime.base.OpenableCloseableIterator;
-import org.apache.vxquery.runtime.core.SingletonCloseableIterator;
final class DTMNodeImpl implements XDMNode {
private DTM dtm;
@@ -59,7 +57,7 @@
}
@Override
- public XDMValue getAtomizedValue() {
+ public XDMValue getTypedValue() {
switch (dtm.nodeKind[index]) {
case DTM.DTM_ATTRIBUTE:
case DTM.DTM_ELEMENT:
@@ -100,11 +98,6 @@
}
@Override
- public OpenableCloseableIterator getTypedValue() {
- return new SingletonCloseableIterator(getAtomizedValue());
- }
-
- @Override
public boolean isID() {
return false;
}
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/AbstractGeneralComparisonIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/AbstractGeneralComparisonIterator.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/AbstractGeneralComparisonIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/AbstractGeneralComparisonIterator.java Tue Dec 22 23:59:41 2009
@@ -104,7 +104,7 @@
default:
XDMNode node = (XDMNode) v;
- XDMValue av = node.getAtomizedValue();
+ XDMValue av = node.getTypedValue();
if (av != null) {
atomize(av, aList);
}
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnCodepointsToStringIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnCodepointsToStringIterator.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnCodepointsToStringIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnCodepointsToStringIterator.java Tue Dec 22 23:59:41 2009
@@ -46,7 +46,7 @@
return StringValue.EMPTY_STRING;
}
if (value.getDMOKind() != DMOKind.ATOMIC_VALUE && value.getDMOKind() != DMOKind.SEQUENCE) {
- value = ((XDMNode) value).getAtomizedValue();
+ value = ((XDMNode) value).getTypedValue();
}
if (value.getDMOKind() == DMOKind.ATOMIC_VALUE) {
return frame.getRuntimeControlBlock().getAtomicValueFactory().createString(
Modified: incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnDataIterator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnDataIterator.java?rev=893356&r1=893355&r2=893356&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnDataIterator.java (original)
+++ incubator/vxquery/trunk/vxquery/src/main/java/org/apache/vxquery/runtime/functions/FnDataIterator.java Tue Dec 22 23:59:41 2009
@@ -53,7 +53,7 @@
return v;
default:
- return ((XDMNode) v).getAtomizedValue();
+ return ((XDMNode) v).getTypedValue();
}
}
}