sboag 00/08/08 21:01:16
Modified: java/src/org/apache/xalan/extensions MethodResolver.java
Log:
Reversed the incorrect isAssignableFrom expressions -- left/right problem,
probably caused by dyslexia.
Revision Changes Path
1.8 +8 -8
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MethodResolver.java 2000/08/07 03:01:23 1.7
+++ MethodResolver.java 2000/08/09 04:01:15 1.8
@@ -57,7 +57,7 @@
{
Class javaClass = paramTypes[0];
// System.out.println("first javaClass: "+javaClass.getName());
- if(javaClass.isAssignableFrom(org.w3c.xslt.ExpressionContext.class))
+ if(org.w3c.xslt.ExpressionContext.class.isAssignableFrom(javaClass))
{
isFirstExpressionContext = true;
scoreStart = 0;
@@ -142,7 +142,7 @@
if(numberMethodParams == (argsLen+1))
{
Class javaClass = paramTypes[0];
-
if(javaClass.isAssignableFrom(org.w3c.xslt.ExpressionContext.class))
+
if(org.w3c.xslt.ExpressionContext.class.isAssignableFrom(javaClass))
{
isFirstExpressionContext = true;
scoreStart = 0;
@@ -201,7 +201,7 @@
int nMethods = (null != argsIn) ? argsIn.length : 0;
int paramIndex = 0;
if((paramTypes.length > 0)
- &&
paramTypes[0].isAssignableFrom(org.w3c.xslt.ExpressionContext.class))
+ &&
org.w3c.xslt.ExpressionContext.class.isAssignableFrom(paramTypes[0]))
{
argsOut[0] = new Object[nMethods+1];
argsOut[0][0] = exprContext;
@@ -482,20 +482,20 @@
case XObject.CLASS_RTREEFRAG:
{
- if((javaClass.isAssignableFrom(NodeIterator.class)) ||
+ if((NodeIterator.class.isAssignableFrom(javaClass)) ||
(javaClass == java.lang.Object.class))
{
// This will fail in Xalan right now, since RTFs aren't
// convertable to node-sets.
return xobj.nodeset();
}
- else if(javaClass.isAssignableFrom(Node.class))
+ else if(Node.class.isAssignableFrom(javaClass))
{
// This will return a Document fragment in Xalan right
// now, which isn't what the we specify.
return xobj.rtree();
}
- else
if(javaClass.isAssignableFrom(org.w3c.dom.DocumentFragment.class))
+ else
if(org.w3c.dom.DocumentFragment.class.isAssignableFrom(javaClass))
{
// This will return a Document fragment in Xalan right
// now, which isn't what the we specify.
@@ -518,14 +518,14 @@
case XObject.CLASS_NODESET:
{
- if((javaClass.isAssignableFrom(NodeIterator.class)) ||
+ if((NodeIterator.class.isAssignableFrom(javaClass)) ||
(javaClass == java.lang.Object.class))
{
// This will fail in Xalan right now, since RTFs aren't
// convertable to node-sets.
return xobj.nodeset();
}
- else if(javaClass.isAssignableFrom(Node.class))
+ else if(Node.class.isAssignableFrom(javaClass))
{
// Xalan ensures that nodeset() always returns an
// iterator positioned at the beginning.
