villard 2003/07/30 11:52:59
Modified: java/xpath_rwapi/src2/org/apache/xpath/impl Tag: xslt20
KindTestImpl.java XPathFactoryImpl.java
NameTestImpl.java ExpressionFactoryImpl.java
LetExprImpl.java StepExprImpl.java
VariableImpl.java package.html LiteralImpl.java
OperatorImpl.java
java/xpath_rwapi/src2/org/apache/xpath/expression Tag:
xslt20 LetExpr.java OperatorExpr.java StepExpr.java
ExpressionFactory.java Literal.java Variable.java
NodeTest.java
java/xpath_rwapi/src2/org/apache/xpath/impl/parser Tag:
xslt20 SimpleNode.java
java/xpath_rwapi/src2/org/apache/xpath/test Tag: xslt20
XalanEvaluator.java TestSamples.java
Added: java/xpath_rwapi/src2/org/apache/xpath/impl Tag: xslt20
DefaultNodeFactory.java
java/xpath_rwapi/src2/org/apache/xpath Tag: xslt20
XPath20Utilities.java XPath20Exception.java
XPath20Factory.java
Removed: java/xpath_rwapi/src2/org/apache/xpath Tag: xslt20
XPathException.java XPathUtilities.java
XPathFactory.java
java/xpath_rwapi/src2/org/apache/xpath/impl/parser Tag:
xslt20 xpath-grammar.jjt xpath-grammar.jj
DefaultNodeFactory.java
Log:
Renamed XPathException and XPathFactory to avoid name conflict with xalan
Revision Changes Path
No revision
No revision
1.1.2.5 +4 -4
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/KindTestImpl.java
Index: KindTestImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/KindTestImpl.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- KindTestImpl.java 25 Jul 2003 15:46:09 -0000 1.1.2.4
+++ KindTestImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.5
@@ -57,7 +57,7 @@
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.NodeTest;
import org.apache.xpath.impl.parser.Node;
import org.apache.xpath.impl.parser.SimpleNode;
@@ -146,7 +146,7 @@
/**
* @see org.apache.xpath.expression.NodeTest#getKindTest()
*/
- public short getKindTest() throws XPathException
+ public short getKindTest() throws XPath20Exception
{
return m_kindTest;
}
@@ -154,7 +154,7 @@
/**
* @see org.apache.xpath.expression.NodeTest#getLocalNameTest()
*/
- public QName getNameTest() throws XPathException
+ public QName getNameTest() throws XPath20Exception
{
if (m_kindTest == PROCESSING_INSTRUCTION_TEST)
{
@@ -162,7 +162,7 @@
}
else
{
- throw new XPathException("Invalid call this method on kind
test"); // I18N
+ throw new XPath20Exception("Invalid call this method on kind
test"); // I18N
}
}
1.1.2.2 +2 -2
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/XPathFactoryImpl.java
Index: XPathFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/XPathFactoryImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XPathFactoryImpl.java 13 Mar 2003 20:28:14 -0000 1.1.2.1
+++ XPathFactoryImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.2
@@ -55,13 +55,13 @@
*/
package org.apache.xpath.impl;
-import org.apache.xpath.XPathFactory;
+import org.apache.xpath.XPath20Factory;
import org.apache.xpath.expression.ExpressionFactory;
/**
* Default factory for Expressions.
*/
-public class XPathFactoryImpl extends XPathFactory {
+public class XPathFactoryImpl extends XPath20Factory {
/**
* @see org.apache.xpath.XPathFactory#newExpressionFactory()
1.1.2.5 +4 -4
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/NameTestImpl.java
Index: NameTestImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/NameTestImpl.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NameTestImpl.java 25 Jul 2003 20:16:25 -0000 1.1.2.4
+++ NameTestImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.5
@@ -57,7 +57,7 @@
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.NodeTest;
import org.apache.xpath.impl.parser.Node;
import org.apache.xpath.impl.parser.SimpleNode;
@@ -113,15 +113,15 @@
/**
* @see org.apache.xpath.expression.NodeTest#getKindTest()
*/
- public short getKindTest() throws XPathException
+ public short getKindTest() throws XPath20Exception
{
- throw new XPathException("Invalid call of this method on NameTest
node"); //I8
+ throw new XPath20Exception("Invalid call of this method on NameTest
node"); //I8
}
/**
* @see org.apache.xpath.expression.NodeTest#getLocalNameTest()
*/
- public QName getNameTest() throws XPathException
+ public QName getNameTest() throws XPath20Exception
{
return m_qname;
}
1.1.2.11 +5 -5
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExpressionFactoryImpl.java
Index: ExpressionFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExpressionFactoryImpl.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ExpressionFactoryImpl.java 29 Jul 2003 21:12:31 -0000 1.1.2.10
+++ ExpressionFactoryImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.11
@@ -60,7 +60,7 @@
import java.math.BigInteger;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.datamodel.SequenceType;
import org.apache.xpath.expression.CastOrTreatAsExpr;
import org.apache.xpath.expression.ConditionalExpr;
@@ -84,23 +84,23 @@
*/
public class ExpressionFactoryImpl implements ExpressionFactory {
- public Expr createExpr(String expr) throws XPathException {
+ public Expr createExpr(String expr) throws XPath20Exception {
XPath parser = new XPath(new StringReader(expr));
try {
return (Expr) parser.XPath2().jjtGetChild(0);
} catch (ParseException e) {
- throw new XPathException(e);
+ throw new XPath20Exception(e);
}
}
public Expr createExpr(StaticContext ctx, String expr)
- throws XPathException
+ throws XPath20Exception
{
XPath parser = new XPath(new StringReader(expr));
try {
return (Expr) parser.XPath2().jjtGetChild(0);
} catch (ParseException e) {
- throw new XPathException(e);
+ throw new XPath20Exception(e);
}
}
1.1.2.2 +6 -6
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/LetExprImpl.java
Index: LetExprImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/LetExprImpl.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetExprImpl.java 29 Jul 2003 21:12:31 -0000 1.1.2.1
+++ LetExprImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.2
@@ -59,7 +59,7 @@
import java.util.List;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.datamodel.SequenceType;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.LetExpr;
@@ -129,11 +129,11 @@
QName varName,
SequenceType type,
Expr expr)
- throws XPathException
+ throws XPath20Exception
{
if (i > m_varNameList.size())
{
- throw new XPathException("Index out of bounds");
+ throw new XPath20Exception("Index out of bounds");
}
m_varNameList.add(i, varName);
@@ -141,7 +141,7 @@
m_exprList.add(i, expr);
}
- public void removeClause(int i) throws XPathException
+ public void removeClause(int i) throws XPath20Exception
{
try
{
@@ -150,7 +150,7 @@
m_exprList.remove(i);
} catch (IndexOutOfBoundsException e)
{
- throw new XPathException(e);
+ throw new XPath20Exception(e);
}
}
1.1.2.8 +14 -14
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/StepExprImpl.java
Index: StepExprImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/StepExprImpl.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- StepExprImpl.java 14 Jul 2003 18:28:38 -0000 1.1.2.7
+++ StepExprImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.8
@@ -55,7 +55,7 @@
*/
package org.apache.xpath.impl;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.NodeTest;
import org.apache.xpath.expression.StepExpr;
@@ -202,11 +202,11 @@
/**
* @see org.apache.xpath.expression.StepExpr#getAxisType()
*/
- public short getAxisType() throws XPathException
+ public short getAxisType() throws XPath20Exception
{
if (m_axisType == STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this method on primary
expression");
+ throw new XPath20Exception("Invalid call of this method on
primary expression");
}
return m_axisType;
@@ -215,11 +215,11 @@
/**
* @see org.apache.xpath.expression.StepExpr#setAxisType(short)
*/
- public void setAxisType(short newType) throws XPathException
+ public void setAxisType(short newType) throws XPath20Exception
{
if (m_axisType == STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this method on primary
expression");
+ throw new XPath20Exception("Invalid call of this method on
primary expression");
}
m_axisType = newType;
@@ -228,11 +228,11 @@
/**
* @see org.apache.xpath.expression.StepExpr#getAxisName()
*/
- public String getAxisName() throws XPathException
+ public String getAxisName() throws XPath20Exception
{
if (m_axisType == STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this method on primary
expression");
+ throw new XPath20Exception("Invalid call of this method on
primary expression");
}
return StepExprImpl.FULL_AXIS_NAME[m_axisType];
@@ -241,11 +241,11 @@
/**
* @see org.apache.xpath.expression.StepExpr#getStepNodeTest()
*/
- public NodeTest getNodeTest() throws XPathException
+ public NodeTest getNodeTest() throws XPath20Exception
{
if (m_axisType == STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this method on step
compose of primary expression");
+ throw new XPath20Exception("Invalid call of this method on step
compose of primary expression");
}
return (NodeTest) m_children[0];
@@ -254,10 +254,10 @@
/* (non-Javadoc)
* @see
org.apache.xpath.expression.StepExpr#setNodeTest(org.apache.xpath.expression.NodeTest)
*/
- public void setNodeTest(NodeTest test) throws XPathException {
+ public void setNodeTest(NodeTest test) throws XPath20Exception {
if (m_axisType == STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this
method on step compose of primary expression");
+ throw new XPath20Exception("Invalid call of
this method on step compose of primary expression");
}
super.jjtAddChild((Node) test, 0);
}
@@ -266,11 +266,11 @@
/**
* @see org.apache.xpath.expression.StepExpr#getPrimaryExpr()
*/
- public Expr getPrimaryExpr() throws XPathException
+ public Expr getPrimaryExpr() throws XPath20Exception
{
if (m_axisType != STEP_IS_PRIMARYEXPR)
{
- throw new XPathException("Invalid call of this method on step
compose of node test");
+ throw new XPath20Exception("Invalid call of this method on step
compose of node test");
}
return (Expr) m_children[0];
@@ -455,7 +455,7 @@
expr.append(']');
}
}
- catch (XPathException e)
+ catch (XPath20Exception e)
{
// never
}
1.1.2.5 +2 -2
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/VariableImpl.java
Index: VariableImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/VariableImpl.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- VariableImpl.java 10 Jun 2003 19:17:24 -0000 1.1.2.4
+++ VariableImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.5
@@ -56,7 +56,7 @@
package org.apache.xpath.impl;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.Variable;
import org.apache.xpath.expression.Visitor;
@@ -118,7 +118,7 @@
/* (non-Javadoc)
* @see
org.apache.xpath.expression.Variable#setVariableName(java.lang.String)
*/
- public void setVariableName(QName name) throws XPathException {
+ public void setVariableName(QName name) throws XPath20Exception {
// TODO: check the validity of the var name
m_varName = name;
1.1.2.2 +5 -2
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/package.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- package.html 16 Apr 2003 14:39:47 -0000 1.1.2.1
+++ package.html 30 Jul 2003 18:52:58 -0000 1.1.2.2
@@ -1,9 +1,12 @@
<html>
<title>XPath 2.0 API Implementation</title>
<body>
-<p>Default implementations for XPath expression Abstract Syntax Tree nodes.
+<p>Default implementations for XPath expression Abstract Syntax Tree
nodes.</p>
+
+<p>
May be overridden by implementation-specific versions; will likely need
-separate factories for Xalan and XSLTC.<p>
+separate factories for Xalan and XSLTC.</p>
+
</body>
</html>
1.1.2.4 +11 -11
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/LiteralImpl.java
Index: LiteralImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/LiteralImpl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LiteralImpl.java 27 Mar 2003 21:53:24 -0000 1.1.2.3
+++ LiteralImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.4
@@ -55,7 +55,7 @@
*/
package org.apache.xpath.impl;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.Literal;
import org.apache.xpath.expression.Visitor;
@@ -139,21 +139,21 @@
/**
* @see org.apache.xpath.expression.Literal#getDecimalLiteral()
*/
- public BigDecimal getDecimalLiteral() throws XPathException
+ public BigDecimal getDecimalLiteral() throws XPath20Exception
{
if (getLiteralType() == DECIMAL_LITERAL)
{
return (BigDecimal) m_literal;
}
- throw new XPathException(
+ throw new XPath20Exception(
"Invalid method call: the literal is not a decimal");
}
/* (non-Javadoc)
* @see org.apache.xpath.expression.Literal#getDecimalLiteralAsDouble()
*/
- public double getDecimalLiteralAsDouble() throws XPathException
+ public double getDecimalLiteralAsDouble() throws XPath20Exception
{
return getDecimalLiteral().doubleValue();
}
@@ -161,35 +161,35 @@
/**
* @see org.apache.xpath.expression.Literal#getDoubleLiteral()
*/
- public double getDoubleLiteral() throws XPathException
+ public double getDoubleLiteral() throws XPath20Exception
{
if (getLiteralType() == DOUBLE_LITERAL)
{
return ((Double) m_literal).doubleValue();
}
- throw new XPathException(
+ throw new XPath20Exception(
"Invalid method call: the literal is not a double");
}
/**
* @see org.apache.xpath.expression.Literal#getIntegerLiteral()
*/
- public BigInteger getIntegerLiteral() throws XPathException
+ public BigInteger getIntegerLiteral() throws XPath20Exception
{
if (getLiteralType() == INTEGER_LITERAL)
{
return (BigInteger) m_literal;
}
- throw new XPathException(
+ throw new XPath20Exception(
"Invalid method call: the literal is not a integer"); //I16
}
/* (non-Javadoc)
* @see org.apache.xpath.expression.Literal#getIntLiteral()
*/
- public int getIntegerLiteralAsInt() throws XPathException
+ public int getIntegerLiteralAsInt() throws XPath20Exception
{
return getIntegerLiteral().intValue();
}
@@ -227,14 +227,14 @@
/**
* @see org.apache.xpath.expression.Literal#getStringLiteral()
*/
- public String getStringLiteral() throws XPathException
+ public String getStringLiteral() throws XPath20Exception
{
if (getLiteralType() == STRING_LITERAL)
{
return (String) m_literal;
}
- throw new XPathException(
+ throw new XPath20Exception(
"Invalid method call: the literal is not a string");
}
1.1.2.9 +5 -5
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/OperatorImpl.java
Index: OperatorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/OperatorImpl.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- OperatorImpl.java 14 Jul 2003 18:28:38 -0000 1.1.2.8
+++ OperatorImpl.java 30 Jul 2003 18:52:58 -0000 1.1.2.9
@@ -55,7 +55,7 @@
*/
package org.apache.xpath.impl;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.OperatorExpr;
import org.apache.xpath.expression.Visitor;
@@ -263,7 +263,7 @@
/**
* @see org.apache.xpath.expression.OperatorExpr#addOperand(Expr)
*/
- public void addOperand(Expr operand) throws XPathException
+ public void addOperand(Expr operand) throws XPath20Exception
{
// do not performed the reduction during edition
super.jjtAddChild((Node) operand,
@@ -273,14 +273,14 @@
/* (non-Javadoc)
* @see
org.apache.xpath.expression.OperatorExpr#append(org.apache.xpath.expression.OperatorExpr)
*/
- public void append(OperatorExpr expr) throws XPathException {
+ public void append(OperatorExpr expr) throws XPath20Exception {
if (expr.getExprType() == m_exprType && expr.getOperatorType()
== m_opType ) {
int size = expr.getOperandCount();
for (int i = 0; i < size ; i ++ ) {
addOperand(expr.getOperand(i));
}
} else {
- throw new XPathException("Mismatched operator
expressions"); // I16 + better msg
+ throw new XPath20Exception("Mismatched operator
expressions"); // I16 + better msg
}
}
@@ -316,7 +316,7 @@
/**
* @see org.apache.xpath.expression.OperatorExpr#removeOperand(Expr)
*/
- public void removeOperand(Expr operand) throws XPathException
+ public void removeOperand(Expr operand) throws XPath20Exception
{
super.jjtRemoveChild((Node) operand);
}
No revision
No revision
1.1.2.1 +152 -0
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/DefaultNodeFactory.java
No revision
No revision
1.1.2.1 +156 -0
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/Attic/XPath20Utilities.java
1.1.2.1 +140 -0
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/Attic/XPath20Exception.java
1.1.2.1 +110 -0
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/Attic/XPath20Factory.java
No revision
No revision
1.1.2.2 +14 -14
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/LetExpr.java
Index: LetExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/LetExpr.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetExpr.java 29 Jul 2003 21:12:31 -0000 1.1.2.1
+++ LetExpr.java 30 Jul 2003 18:52:58 -0000 1.1.2.2
@@ -57,7 +57,7 @@
package org.apache.xpath.expression;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.datamodel.SequenceType;
/**
@@ -86,34 +86,34 @@
* Gets the variable name of the ith let clause
* @param i
* @return QName
- * @throws XPathException when the specified index is out of bounds
+ * @throws XPath20Exception when the specified index is out of bounds
*/
- QName getVariableName(int i) throws XPathException;
+ QName getVariableName(int i) throws XPath20Exception;
/**
* Gets the type of the ith let clause
* @param i
* @return A [EMAIL PROTECTED] SequenceType} or null when no type is
specified.
- * @throws XPathException when the specified index is out of bounds
+ * @throws XPath20Exception when the specified index is out of bounds
*/
- SequenceType getType(int i) throws XPathException;
+ SequenceType getType(int i) throws XPath20Exception;
/**
* Gets the expression of the ith let clause
* @param i
* @return An expression
- * @throws XPathException when the specified index is out of bounds
+ * @throws XPath20Exception when the specified index is out of bounds
*/
- Expr getExpr(int i) throws XPathException;
+ Expr getExpr(int i) throws XPath20Exception;
/**
* Append a clause at the end of the clause list
* @param varName
* @param type
* @param expr
- * @throws XPathException when the specified expression is not a single
expression
+ * @throws XPath20Exception when the specified expression is not a
single expression
*/
- void appendClause(QName varName, SequenceType type, Expr expr) throws
XPathException;
+ void appendClause(QName varName, SequenceType type, Expr expr) throws
XPath20Exception;
/**
* Insert a clause before the ith position.
@@ -121,15 +121,15 @@
* @param varName
* @param type
* @param expr
- * @throws XPathException when the specified expression is not a single
expression
+ * @throws XPath20Exception when the specified expression is not a
single expression
* or when the specified index is out of bounds
*/
- void insertClause(int i, QName varName, SequenceType type, Expr expr)
throws XPathException;
+ void insertClause(int i, QName varName, SequenceType type, Expr expr)
throws XPath20Exception;
/**
* Remove the clause at the ith position
* @param i
- * @throws XPathException when the specified index is out of bounds
+ * @throws XPath20Exception when the specified index is out of bounds
*/
- void removeClause(int i) throws XPathException;
+ void removeClause(int i) throws XPath20Exception;
}
1.1.2.7 +6 -6
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/OperatorExpr.java
Index: OperatorExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/OperatorExpr.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- OperatorExpr.java 29 Jul 2003 21:12:31 -0000 1.1.2.6
+++ OperatorExpr.java 30 Jul 2003 18:52:58 -0000 1.1.2.7
@@ -55,7 +55,7 @@
*/
package org.apache.xpath.expression;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
/**
@@ -303,7 +303,7 @@
/**
* Gets the operand at the ith position.
*/
- Expr getOperand(int i) throws XPathException;
+ Expr getOperand(int i) throws XPath20Exception;
/**
* Gets the operand count
@@ -312,15 +312,15 @@
/**
* Append an operand at the end of this expression.
- * @throws XPathException when the specified operand do not match
+ * @throws XPath20Exception when the specified operand do not match
* the operator type
*/
- void addOperand(Expr operand) throws XPathException;
+ void addOperand(Expr operand) throws XPath20Exception;
/**
* Remove an operand
*/
- void removeOperand(Expr operand) throws XPathException;
+ void removeOperand(Expr operand) throws XPath20Exception;
// TODO
// void setOperand(Expr operand)
@@ -334,6 +334,6 @@
* in the expression <code>a/b</code> is <code>a/b/c/d</code></p>
* @param expr The expression to append
*/
- void append(OperatorExpr expr) throws XPathException;
+ void append(OperatorExpr expr) throws XPath20Exception;
}
1.1.2.5 +12 -12
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/StepExpr.java
Index: StepExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/StepExpr.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- StepExpr.java 11 Jul 2003 21:29:26 -0000 1.1.2.4
+++ StepExpr.java 30 Jul 2003 18:52:58 -0000 1.1.2.5
@@ -55,7 +55,7 @@
*/
package org.apache.xpath.expression;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
/**
@@ -169,45 +169,45 @@
* Gets the type of step axis
*
* @return short The axis type corresponding to one of the constants
defined above.
- * @throws XPathException whenever the step is neither a forward step
nor a reverse
+ * @throws XPath20Exception whenever the step is neither a forward step
nor a reverse
* step.
*/
- short getAxisType() throws XPathException;
+ short getAxisType() throws XPath20Exception;
/**
* Sets the type of the step axis
* @param newType The new axis type
- * @throws XPathException whenever the step is not a forward or reverse
+ * @throws XPath20Exception whenever the step is not a forward or reverse
* step.
*/
- void setAxisType(short newType) throws XPathException;
+ void setAxisType(short newType) throws XPath20Exception;
/**
* Gets the name of the step axis
*
* @return String Full name of the step axis
- * @throws XPathException whenever the step is not a forward or reverse
+ * @throws XPath20Exception whenever the step is not a forward or reverse
* step.
*/
- String getAxisName() throws XPathException;
+ String getAxisName() throws XPath20Exception;
/**
* Gets the node test
*
* @return NodeTest
- * @throws XPathException whenever the step is not a forward or reverse
+ * @throws XPath20Exception whenever the step is not a forward or reverse
* step.
*/
- NodeTest getNodeTest() throws XPathException;
+ NodeTest getNodeTest() throws XPath20Exception;
/**
* Sets the node test
*
* @param NodeTest
- * @throws XPathException whenever the step is not a forward or reverse
+ * @throws XPath20Exception whenever the step is not a forward or
reverse
* step.
*/
- void setNodeTest(NodeTest test) throws XPathException;
+ void setNodeTest(NodeTest test) throws XPath20Exception;
/**
@@ -215,7 +215,7 @@
*
* @return Expr The primary expression
*/
- Expr getPrimaryExpr() throws XPathException;
+ Expr getPrimaryExpr() throws XPath20Exception;
/**
* Gets the predicate expression at the specified position
1.1.2.11 +6 -6
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/ExpressionFactory.java
Index: ExpressionFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/ExpressionFactory.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- ExpressionFactory.java 29 Jul 2003 21:12:31 -0000 1.1.2.10
+++ ExpressionFactory.java 30 Jul 2003 18:52:58 -0000 1.1.2.11
@@ -59,7 +59,7 @@
import java.math.BigInteger;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.datamodel.SequenceType;
@@ -80,20 +80,20 @@
* Moreover, various checking are not performed, like the existence test
* of variable declaration</p>
* @return A XPath expression
- * @throws XPathException whenever the specified expression is not valid
+ * @throws XPath20Exception whenever the specified expression is not
valid
* syntaxically or semantically.
*/
- public Expr createExpr(String expr) throws XPathException;
+ public Expr createExpr(String expr) throws XPath20Exception;
/**
* Creates a new XPath expression from a string representation.
* Use the specified static context to resolve namespaces and perform
* various static type checking.
* @return A XPath expression
- * @throws XPathException whenever the specified expression is not
valid
+ * @throws XPath20Exception whenever the specified expression is not
valid
* syntaxically or semantically.
*/
- public Expr createExpr(StaticContext ctx, String expr) throws
XPathException;
+ public Expr createExpr(StaticContext ctx, String expr) throws
XPath20Exception;
/**
* Creates a new empty [EMAIL PROTECTED] OperatorExpr expression
sequence}
1.1.2.4 +13 -13
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/Literal.java
Index: Literal.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/Literal.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Literal.java 27 Mar 2003 15:11:27 -0000 1.1.2.3
+++ Literal.java 30 Jul 2003 18:52:58 -0000 1.1.2.4
@@ -58,7 +58,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
/**
@@ -111,53 +111,53 @@
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't an integer or cannot be
+ * @throws XPath20Exception when the literal isn't an integer or cannot
be
* represented by the primitive int type (in case of big integer)
*/
- int getIntegerLiteralAsInt() throws XPathException;
+ int getIntegerLiteralAsInt() throws XPath20Exception;
/**
* Gets the integer literal
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't an integer
+ * @throws XPath20Exception when the literal isn't an integer
*/
- BigInteger getIntegerLiteral() throws XPathException;
+ BigInteger getIntegerLiteral() throws XPath20Exception;
/**
* Gets the decimal literal
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't a decimal
+ * @throws XPath20Exception when the literal isn't a decimal
*/
- BigDecimal getDecimalLiteral() throws XPathException;
+ BigDecimal getDecimalLiteral() throws XPath20Exception;
/**
* Gets the decimal literal as a double
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't a decimal
+ * @throws XPath20Exception when the literal isn't a decimal
*/
- double getDecimalLiteralAsDouble() throws XPathException;
+ double getDecimalLiteralAsDouble() throws XPath20Exception;
/**
* Gets the double literal
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't a double
+ * @throws XPath20Exception when the literal isn't a double
*/
- double getDoubleLiteral() throws XPathException;
+ double getDoubleLiteral() throws XPath20Exception;
/**
* Gets the string literal
*
* @return DOCUMENT ME!
*
- * @throws XPathException when the literal isn't a string
+ * @throws XPath20Exception when the literal isn't a string
*/
- String getStringLiteral() throws XPathException;
+ String getStringLiteral() throws XPath20Exception;
}
1.1.2.4 +3 -3
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/Variable.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Variable.java 27 Mar 2003 21:53:24 -0000 1.1.2.3
+++ Variable.java 30 Jul 2003 18:52:58 -0000 1.1.2.4
@@ -56,7 +56,7 @@
package org.apache.xpath.expression;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
/**
* Represents variable.
@@ -72,8 +72,8 @@
/**
* Sets the name of the variable.
* @param name New name of the variable
- * @throws XPathException whenever the given name is not a valid
variable name
+ * @throws XPath20Exception whenever the given name is not a valid
variable name
*/
- void setVariableName(QName name) throws XPathException;
+ void setVariableName(QName name) throws XPath20Exception;
}
1.1.2.4 +5 -5
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/NodeTest.java
Index: NodeTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/expression/Attic/NodeTest.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- NodeTest.java 25 Jul 2003 15:46:09 -0000 1.1.2.3
+++ NodeTest.java 30 Jul 2003 18:52:58 -0000 1.1.2.4
@@ -56,7 +56,7 @@
package org.apache.xpath.expression;
import org.apache.xml.QName;
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
/**
* Represents item test. An item test includes both node tests and the
context item
@@ -130,19 +130,19 @@
/**
* Gets the kind test code.
* @return short One of the kind test constant value
- * @throws XPathException whenever this node test isn't a kind test
+ * @throws XPath20Exception whenever this node test isn't a kind test
*/
- short getKindTest() throws XPathException;
+ short getKindTest() throws XPath20Exception;
/**
* Gets the qualified name of the name test or the name of the 'PITarget'
* when the node test is pi kind test. For the later, only the local
* part of the qualified name is relevant.
* @return QName The name test or [EMAIL PROTECTED] #WILDCARD}
- * @throws XPathException whenever this node test isn't a name test
+ * @throws XPath20Exception whenever this node test isn't a name test
* or a pi kind test
*/
- QName getNameTest() throws XPathException;
+ QName getNameTest() throws XPath20Exception;
}
No revision
No revision
1.1.2.13 +2 -1
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/SimpleNode.java
Index: SimpleNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/parser/Attic/SimpleNode.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- SimpleNode.java 29 Jul 2003 21:12:31 -0000 1.1.2.12
+++ SimpleNode.java 30 Jul 2003 18:52:59 -0000 1.1.2.13
@@ -4,6 +4,7 @@
import org.apache.xpath.impl.CastOrTreatAsExprImpl;
import org.apache.xpath.impl.CastableAsExprImpl;
import org.apache.xpath.impl.ConditionalExprImpl;
+import org.apache.xpath.impl.DefaultNodeFactory;
import org.apache.xpath.impl.ForAndQuantifiedExprImpl;
import org.apache.xpath.impl.FunctionCallImpl;
import org.apache.xpath.impl.InstanceOfExprImpl;
@@ -240,7 +241,7 @@
break;
- case XPathTreeConstants.JJTTREATEXPR: //50;
+ case XPathTreeConstants.JJTTREATEXPR:
newNode = nodeFactory.createTreatAsNode(id);
if (newNode == null)
No revision
No revision
1.1.2.2 +10 -14
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/test/Attic/XalanEvaluator.java
Index: XalanEvaluator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/test/Attic/XalanEvaluator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XalanEvaluator.java 13 Mar 2003 20:28:18 -0000 1.1.2.1
+++ XalanEvaluator.java 30 Jul 2003 18:52:59 -0000 1.1.2.2
@@ -55,12 +55,7 @@
*/
package org.apache.xpath.test;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
-
-import org.apache.xpath.XPathException;
+import org.apache.xpath.XPath20Exception;
import org.apache.xpath.expression.Expr;
import org.apache.xpath.expression.ExprContext;
import org.apache.xpath.impl.ExprContextImpl;
@@ -82,20 +77,21 @@
* Evaluate an XPath using Xalan's old XPathAPI.
* //@TODO change to use ctx.getDynamicContext() once designed.
*/
- public Object evaluate(ExprContextImpl ctx, Expr expr) throws
XPathException {
- try {
- XObject xobj = XPathAPI.eval((org.w3c.dom.Node)
ctx.getContextItem(), expr.getString(true));
- return xobj;
- } catch (TransformerException e) {
- throw new XPathException(e);
- }
+ public Object evaluate(ExprContextImpl ctx, Expr expr) throws
XPath20Exception {
+// try {
+// XObject xobj = XPathAPI.eval((org.w3c.dom.Node)
ctx.getContextItem(), expr.getString(true));
+// return xobj;
+// } catch (TransformerException e) {
+// throw new XPathException(e);
+// }
+ return null;
}
/**
* Evaluate an match pattern using Xalan's old XPathAPI.
* //@TODO not implemented
*/
- public boolean match(ExprContext ctx, Expr expr, Object node) throws
XPathException {
+ public boolean match(ExprContext ctx, Expr expr, Object node) throws
XPath20Exception {
return false;
}
1.1.2.11 +2 -2
xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/test/Attic/TestSamples.java
Index: TestSamples.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/test/Attic/TestSamples.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- TestSamples.java 25 Jul 2003 20:16:26 -0000 1.1.2.10
+++ TestSamples.java 30 Jul 2003 18:52:59 -0000 1.1.2.11
@@ -61,7 +61,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.xpath.XPathFactory;
+import org.apache.xpath.XPath20Factory;
import org.apache.xpath.expression.CastableAsExpr;
import org.apache.xpath.expression.ConditionalExpr;
import org.apache.xpath.expression.Expr;
@@ -133,7 +133,7 @@
}
// Test adhoc manual creation
- ExpressionFactory exprFct = XPathFactory.newInstance()
+ ExpressionFactory exprFct = XPath20Factory.newInstance()
.newExpressionFactory();
Expr expr = exprFct.createExpr("child::tutu[10]");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
