You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/08/06 06:54:41 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/objects XObjectFactory.java XObject.java
sboag 01/08/05 21:54:41
Modified: java/src/org/apache/xpath/objects XObject.java
Added: java/src/org/apache/xpath/objects XObjectFactory.java
Log:
Move create methods from XObject to XObjectFactory, in response
to cyclic build problems encountered with javac 1.1.8.
Revision Changes Path
1.17 +2 -103 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XObject.java 2001/08/04 21:06:12 1.16
+++ XObject.java 2001/08/06 04:54:41 1.17
@@ -72,8 +72,6 @@
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xml.utils.XMLString;
-import org.apache.xpath.axes.OneStepIterator;
-import org.apache.xpath.axes.DescendantIterator;
/**
* <meta name="usage" content="general"/>
@@ -183,31 +181,7 @@
*/
static public XObject create(Object val)
{
-
- XObject result;
-
- if (val instanceof XObject)
- {
- result = (XObject) val;
- }
- else if (val instanceof String)
- {
- result = new XString((String) val);
- }
- else if (val instanceof Boolean)
- {
- result = new XBoolean((Boolean)val);
- }
- else if (val instanceof Double)
- {
- result = new XNumber(((Double) val));
- }
- else
- {
- result = new XObject(val);
- }
-
- return result;
+ return XObjectFactory.create(val);
}
/**
@@ -222,82 +196,7 @@
*/
static public XObject create(Object val, XPathContext xctxt)
{
-
- XObject result;
-
- if (val instanceof XObject)
- {
- result = (XObject) val;
- }
- else if (val instanceof String)
- {
- result = new XString((String) val);
- }
- else if (val instanceof Boolean)
- {
- result = new XBoolean((Boolean)val);
- }
- else if (val instanceof Number)
- {
- result = new XNumber(((Number) val));
- }
- else if (val instanceof DTM)
- {
- DTM dtm = (DTM)val;
- try
- {
- int dtmRoot = dtm.getDocument();
- DTMAxisIterator iter = dtm.getAxisIterator(Axis.SELF);
- iter.setStartNode(dtmRoot);
- DTMIterator iterator = new OneStepIterator(iter);
- iterator.setRoot(dtmRoot, xctxt);
- result = new XNodeSet(iterator);
- }
- catch(Exception ex)
- {
- throw new org.apache.xml.utils.WrappedRuntimeException(ex);
- }
- }
- else if (val instanceof DTMAxisIterator)
- {
- DTMAxisIterator iter = (DTMAxisIterator)val;
- try
- {
- DTMIterator iterator = new OneStepIterator(iter);
- iterator.setRoot(iter.getStartNode(), xctxt);
- result = new XNodeSet(iterator);
- }
- catch(Exception ex)
- {
- throw new org.apache.xml.utils.WrappedRuntimeException(ex);
- }
- }
- else if (val instanceof DTMIterator)
- {
- result = new XNodeSet((DTMIterator) val);
- }
- // This next three instanceofs are a little worrysome, since a NodeList
- // might also implement a Node!
- else if (val instanceof org.w3c.dom.Node)
- {
- result = new XNodeSetForDOM((org.w3c.dom.Node)val, xctxt);
- }
- // This must come after org.w3c.dom.Node, since many Node implementations
- // also implement NodeList.
- else if (val instanceof org.w3c.dom.NodeList)
- {
- result = new XNodeSetForDOM((org.w3c.dom.NodeList)val, xctxt);
- }
- else if (val instanceof org.w3c.dom.traversal.NodeIterator)
- {
- result = new XNodeSetForDOM((org.w3c.dom.traversal.NodeIterator)val, xctxt);
- }
- else
- {
- result = new XObject(val);
- }
-
- return result;
+ return XObjectFactory.create(val, xctxt);
}
/** Constant for NULL object type */
1.1 xml-xalan/java/src/org/apache/xpath/objects/XObjectFactory.java
Index: XObjectFactory.java
===================================================================
package org.apache.xpath.objects;
import org.apache.xml.dtm.*;
import org.apache.xpath.XPathContext;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.axes.OneStepIterator;
public class XObjectFactory
{
/**
* Create the right XObject based on the type of the object passed. This
* function can not make an XObject that exposes DOM Nodes, NodeLists, and
* NodeIterators to the XSLT stylesheet as node-sets.
*
* @param val The java object which this object will wrap.
*
* @return the right XObject based on the type of the object passed.
*/
static public XObject create(Object val)
{
XObject result;
if (val instanceof XObject)
{
result = (XObject) val;
}
else if (val instanceof String)
{
result = new XString((String) val);
}
else if (val instanceof Boolean)
{
result = new XBoolean((Boolean)val);
}
else if (val instanceof Double)
{
result = new XNumber(((Double) val));
}
else
{
result = new XObject(val);
}
return result;
}
/**
* Create the right XObject based on the type of the object passed.
* This function <emph>can</emph> make an XObject that exposes DOM Nodes, NodeLists, and
* NodeIterators to the XSLT stylesheet as node-sets.
*
* @param val The java object which this object will wrap.
* @param xctxt The XPath context.
*
* @return the right XObject based on the type of the object passed.
*/
static public XObject create(Object val, XPathContext xctxt)
{
XObject result;
if (val instanceof XObject)
{
result = (XObject) val;
}
else if (val instanceof String)
{
result = new XString((String) val);
}
else if (val instanceof Boolean)
{
result = new XBoolean((Boolean)val);
}
else if (val instanceof Number)
{
result = new XNumber(((Number) val));
}
else if (val instanceof DTM)
{
DTM dtm = (DTM)val;
try
{
int dtmRoot = dtm.getDocument();
DTMAxisIterator iter = dtm.getAxisIterator(Axis.SELF);
iter.setStartNode(dtmRoot);
DTMIterator iterator = new OneStepIterator(iter);
iterator.setRoot(dtmRoot, xctxt);
result = new XNodeSet(iterator);
}
catch(Exception ex)
{
throw new org.apache.xml.utils.WrappedRuntimeException(ex);
}
}
else if (val instanceof DTMAxisIterator)
{
DTMAxisIterator iter = (DTMAxisIterator)val;
try
{
DTMIterator iterator = new OneStepIterator(iter);
iterator.setRoot(iter.getStartNode(), xctxt);
result = new XNodeSet(iterator);
}
catch(Exception ex)
{
throw new org.apache.xml.utils.WrappedRuntimeException(ex);
}
}
else if (val instanceof DTMIterator)
{
result = new XNodeSet((DTMIterator) val);
}
// This next three instanceofs are a little worrysome, since a NodeList
// might also implement a Node!
else if (val instanceof org.w3c.dom.Node)
{
result = new XNodeSetForDOM((org.w3c.dom.Node)val, xctxt);
}
// This must come after org.w3c.dom.Node, since many Node implementations
// also implement NodeList.
else if (val instanceof org.w3c.dom.NodeList)
{
result = new XNodeSetForDOM((org.w3c.dom.NodeList)val, xctxt);
}
else if (val instanceof org.w3c.dom.traversal.NodeIterator)
{
result = new XNodeSetForDOM((org.w3c.dom.traversal.NodeIterator)val, xctxt);
}
else
{
result = new XObject(val);
}
return result;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org