jkesselm 2002/08/26 13:33:34
Modified: java/src/org/apache/xpath/functions Tag: xslt20
FuncNodeName.java
java/src/org/apache/xpath/objects Tag: xslt20 XObject.java
Added: java/src/org/apache/xpath/objects Tag: xslt20
XExpandedQName.java
Log:
Introducing an XObject type for Expanded QNames. Note that as
of this date, the WD currently says Expanded QNames may be
tested for equality, or may have their values examined via the
xf:get-*-from-QName() functions, but may _not_ be converted to
strings; they have no lexical representation at this time. There are
open issues on this topic, so that may change.
Still to be done in this space: Those accessor functions, and
xf:expanded-QName().
Revision Changes Path
No revision
No revision
1.1.2.2 +4 -5
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncNodeName.java
Index: FuncNodeName.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncNodeName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FuncNodeName.java 19 Aug 2002 20:21:33 -0000 1.1.2.1
+++ FuncNodeName.java 26 Aug 2002 20:33:33 -0000 1.1.2.2
@@ -70,8 +70,7 @@
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
import org.apache.xpath.objects.XSequence;
-import org.apache.xpath.objects.XJavaObject;
-import org.apache.xml.utils.QName;
+import org.apache.xpath.objects.XExpandedQName;
/**
* <meta name="usage" content="advanced"/>
@@ -95,7 +94,7 @@
public XObject execute(XPathContext xctxt) throws
javax.xml.transform.TransformerException
{
int context = getArg0AsNode(xctxt);
- QName qn=null;
+ XExpandedQName qn=null;
if(DTM.NULL != context)
{
@@ -104,7 +103,7 @@
{
case DTM.ATTRIBUTE_NODE:
case DTM.ELEMENT_NODE:
- qn=new QName(dtm.getNamespaceURI(context),
+ qn=new XExpandedQName(dtm.getNamespaceURI(context),
dtm.getLocalName(context));
break;
default:
@@ -127,6 +126,6 @@
if(qn==null)
return XSequence.EMPTY;
else
- return new XJavaObject(qn);
+ return qn;
}
}
No revision
No revision
1.20.6.1.2.1 +3 -0
xml-xalan/java/src/org/apache/xpath/objects/XObject.java
Index: XObject.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObject.java,v
retrieving revision 1.20.6.1
retrieving revision 1.20.6.1.2.1
diff -u -r1.20.6.1 -r1.20.6.1.2.1
--- XObject.java 14 Aug 2002 20:07:03 -0000 1.20.6.1
+++ XObject.java 26 Aug 2002 20:33:34 -0000 1.20.6.1.2.1
@@ -278,6 +278,9 @@
/** Constant for GYEARMONTH object type */
public static final int CLASS_GYEARMONTH = XType.GYEARMONTH;
+ /** Constant for Expanded QName object type */
+ public static final int CLASS_QNAME = XType.QNAME;
+
/** Represents an unresolved variable type as an integer. */
public static final int CLASS_UNRESOLVEDVARIABLE = 600;
No revision
No revision
1.1.2.1 +183 -0
xml-xalan/java/src/org/apache/xpath/objects/Attic/XExpandedQName.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
