garyp 00/10/16 12:29:35
Modified: java/src/org/apache/xalan/extensions ExtensionHandler.java
ExtensionHandlerGeneral.java
ExtensionHandlerJavaClass.java
ExtensionHandlerJavaPackage.java
ExtensionsTable.java MethodResolver.java
Added: java/src/org/apache/xalan/extensions ExpressionContext.java
Log:
Move ExpressionContext from org.w3c.xslt to org.apache.xalan.extensions
Revision Changes Path
1.4 +0 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java
Index: ExtensionHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensionHandler.java 2000/10/10 19:14:12 1.3
+++ ExtensionHandler.java 2000/10/16 19:29:28 1.4
@@ -59,8 +59,6 @@
import java.util.Vector;
import java.io.IOException;
-import org.w3c.xslt.ExpressionContext;
-
import org.xml.sax.SAXException;
import org.w3c.dom.Element;
1.5 +0 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
Index: ExtensionHandlerGeneral.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExtensionHandlerGeneral.java 2000/10/10 21:59:27 1.4
+++ ExtensionHandlerGeneral.java 2000/10/16 19:29:29 1.5
@@ -67,8 +67,6 @@
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.utils.QName;
-import org.w3c.xslt.ExpressionContext;
-
import org.xml.sax.SAXException;
// Temp??
1.4 +1 -3
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
Index: ExtensionHandlerJavaClass.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensionHandlerJavaClass.java 2000/10/10 19:14:15 1.3
+++ ExtensionHandlerJavaClass.java 2000/10/16 19:29:29 1.4
@@ -63,8 +63,6 @@
import java.lang.reflect.Constructor;
import java.io.IOException;
-import org.w3c.xslt.ExpressionContext;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.xalan.transformer.TransformerImpl;
@@ -285,7 +283,7 @@
// This is tricky. We get the actual number of target
arguments (excluding any
// ExpressionContext). If we passed in the same number, we
need the implied object.
int nTargetArgs = convertedArgs[0].length;
- if
(org.w3c.xslt.ExpressionContext.class.isAssignableFrom(paramTypes[0]))
+ if (ExpressionContext.class.isAssignableFrom(paramTypes[0]))
nTargetArgs--;
if (methodArgs.length <= nTargetArgs)
return m.invoke(m_defaultInstance, convertedArgs[0]);
1.4 +0 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
Index: ExtensionHandlerJavaPackage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensionHandlerJavaPackage.java 2000/10/10 19:14:16 1.3
+++ ExtensionHandlerJavaPackage.java 2000/10/16 19:29:30 1.4
@@ -63,8 +63,6 @@
import java.lang.reflect.Constructor;
import java.io.IOException;
-import org.w3c.xslt.ExpressionContext;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.xalan.transformer.TransformerImpl;
1.8 +0 -1
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java
Index: ExtensionsTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExtensionsTable.java 2000/10/08 03:33:56 1.7
+++ ExtensionsTable.java 2000/10/16 19:29:30 1.8
@@ -60,7 +60,6 @@
import java.util.Vector;
import org.apache.xpath.objects.XNull;
import org.apache.xpath.XPathProcessorException;
-import org.w3c.xslt.ExpressionContext;
public class ExtensionsTable
{
1.13 +3 -4
xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java
Index: MethodResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MethodResolver.java 2000/10/10 19:14:19 1.12
+++ MethodResolver.java 2000/10/16 19:29:31 1.13
@@ -11,7 +11,6 @@
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.w3c.xslt.ExpressionContext;
import org.xml.sax.SAXException;
/**
@@ -85,7 +84,7 @@
{
Class javaClass = paramTypes[0];
// System.out.println("first javaClass: "+javaClass.getName());
- if(org.w3c.xslt.ExpressionContext.class.isAssignableFrom(javaClass))
+ if(ExpressionContext.class.isAssignableFrom(javaClass))
{
isFirstExpressionContext = true;
scoreStart = 0;
@@ -207,7 +206,7 @@
if(numberMethodParams == (argsLen-xsltParamStart+1))
{
Class javaClass = paramTypes[0];
-
if(org.w3c.xslt.ExpressionContext.class.isAssignableFrom(javaClass))
+ if(ExpressionContext.class.isAssignableFrom(javaClass))
{
isFirstExpressionContext = true;
scoreStart = 0;
@@ -349,7 +348,7 @@
argsOut[0] = new Object[nParams];
int paramIndex = 0;
if((nParams > 0)
- &&
org.w3c.xslt.ExpressionContext.class.isAssignableFrom(paramTypes[0]))
+ && ExpressionContext.class.isAssignableFrom(paramTypes[0]))
{
argsOut[0][0] = exprContext;
// System.out.println("Incrementing paramIndex in convertParams:
"+paramIndex);
1.1
xml-xalan/java/src/org/apache/xalan/extensions/ExpressionContext.java
Index: ExpressionContext.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xalan" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, Lotus
* Development Corporation., http://www.lotus.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.xalan.extensions;
import org.w3c.dom.traversal.NodeIterator;
import org.w3c.dom.Node;
/**
* An object that implements this interface can supply
* information about the current XPath expression context.
*/
public interface ExpressionContext
{
/**
* Get the current context node.
* @return The current context node.
*/
public Node getContextNode();
/**
* Get the current context node list.
* @return An iterator for the current context list, as
* defined in XSLT.
*/
public NodeIterator getContextNodes();
/**
* Get the value of a node as a number.
* @param n Node to be converted to a number. May be null.
* @return value of n as a number.
*/
public double toNumber(Node n);
/**
* Get the value of a node as a string.
* @param n Node to be converted to a string. May be null.
* @return value of n as a string, or an empty string if n is null.
*/
public String toString(Node n);
}
