From ae478193d99d074b3f1b4bc906f3acb9863a48a5 Mon Sep 17 00:00:00 2001 From: Sascha Weinreuter Date: Fri, 9 Dec 2011 15:58:56 +0100 Subject: [PATCH 1/3] Java 1.5 compatibility --- .../xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java b/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java index 26f61a84ff6a..3eb17a742629 100644 --- a/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java +++ b/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java @@ -186,12 +186,10 @@ class Saxon9StyleFrame extends AbstractSaxon9Frame extends AbstractSaxon9Frame Date: Fri, 9 Dec 2011 16:00:36 +0100 Subject: [PATCH 2/3] Attempt to fix IDEA-77406 - doesn't work as advertised though --- .../org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java index 4867c1b25173..c436629dc6dc 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltStackFrame.java @@ -33,7 +33,7 @@ public class XsltStackFrame extends XStackFrame { @Override public Object getEqualityObject() { - return super.getEqualityObject(); + return XsltStackFrame.class; } @Override From a9bfa6c639002a873533b292c18638ba7dab610e Mon Sep 17 00:00:00 2001 From: Sascha Weinreuter Date: Fri, 9 Dec 2011 16:01:25 +0100 Subject: [PATCH 3/3] IDEA-78479: XSLT debug: Saxon9: user function call evaluation gives just NPE --- .../engine/local/saxon9/Saxon9StyleFrame.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java b/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java index 3eb17a742629..0f32e4257f61 100644 --- a/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java +++ b/plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java @@ -21,17 +21,20 @@ import net.sf.saxon.expr.instruct.GeneralVariable; import net.sf.saxon.expr.instruct.GlobalVariable; import net.sf.saxon.expr.instruct.LocalVariable; import net.sf.saxon.expr.instruct.SlotManager; +import net.sf.saxon.functions.FunctionLibrary; import net.sf.saxon.om.*; import net.sf.saxon.style.*; import net.sf.saxon.trans.XPathException; import net.sf.saxon.type.ItemType; import net.sf.saxon.type.Type; import net.sf.saxon.type.TypeHierarchy; +import net.sf.saxon.value.SequenceType; import org.intellij.plugins.xsltDebugger.rt.engine.Debugger; import org.intellij.plugins.xsltDebugger.rt.engine.Value; import org.intellij.plugins.xsltDebugger.rt.engine.local.VariableImpl; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -238,6 +241,11 @@ class Saxon9StyleFrame extends AbstractSaxon9Frame extends AbstractSaxon9Frame