[eclipse-wtp-sourceediting] Add omitted rhino-debugger patch
Gerard Ryan
galileo at fedoraproject.org
Sun Apr 21 20:04:46 UTC 2013
commit ea6d1923ca9e7e877efbd57c023b772b20e1e4a2
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sun Apr 21 21:04:23 2013 +0100
Add omitted rhino-debugger patch
...e-wtp-sourceediting-rhino-debugger-update.patch | 84 ++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-wtp-sourceediting-rhino-debugger-update.patch b/eclipse-wtp-sourceediting-rhino-debugger-update.patch
new file mode 100644
index 0000000..57fd616
--- /dev/null
+++ b/eclipse-wtp-sourceediting-rhino-debugger-update.patch
@@ -0,0 +1,84 @@
+diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
+index f944ca2..92ac280 100644
+--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
++++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/internal/rhino/debugger/StackFrame.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2010 IBM Corporation and others All rights reserved. This
++ * Copyright (c) 2010, 2012 IBM Corporation and others All rights reserved. This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+@@ -178,7 +178,7 @@
+ RhinoDebuggerImpl rhinoDebugger = (RhinoDebuggerImpl) context.getDebugger();
+ rhinoDebugger.disableThread();
+
+- Context evalContext = context.getFactory().enter();
++ Context evalContext = context.getFactory().enterContext();
+ Debugger debugger = evalContext.getDebugger();
+ Object debuggerContextData = evalContext.getDebuggerContextData();
+ evalContext.setDebugger(null, null);
+@@ -207,7 +207,7 @@
+ RhinoDebuggerImpl rhinoDebugger = (RhinoDebuggerImpl) context.getDebugger();
+ rhinoDebugger.disableThread();
+
+- Context evalContext = context.getFactory().enter();
++ Context evalContext = context.getFactory().enterContext();
+ Debugger debugger = evalContext.getDebugger();
+ Object debuggerContextData = evalContext.getDebuggerContextData();
+ evalContext.setDebugger(null, null);
+@@ -234,7 +234,7 @@
+ RhinoDebuggerImpl rhinoDebugger = (RhinoDebuggerImpl) context.getDebugger();
+ rhinoDebugger.disableThread();
+
+- Context lookupContext = context.getFactory().enter();
++ Context lookupContext = context.getFactory().enterContext();
+ Debugger debugger = lookupContext.getDebugger();
+ Object debuggerContextData = lookupContext.getDebuggerContextData();
+ lookupContext.setDebugger(null, null);
+diff --git a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java
+index bb19337..72d0168 100644
+--- a/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java
++++ b/bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger/shell/DebugMain.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2010 IBM Corporation and others.
++ * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+@@ -10,6 +10,7 @@
+ *******************************************************************************/
+ package org.eclipse.wst.jsdt.debug.rhino.debugger.shell;
+
++import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.List;
+
+@@ -76,9 +77,10 @@
+ throw Kit.codeBug();
+ }
+ if(scriptsrc != null) {
+- Script script = Main.loadScriptFromSource(cx, scriptsrc, FROM_EVAL, 0, null);
++ Script script = cx.compileString(scriptsrc, scriptsrc, 0, null);/*Main.loadScriptFromSource(cx, scriptsrc, FROM_EVAL, 0, null);*/
+ if(script != null) {
+- Main.evaluateScript(script, cx, Main.getGlobal());
++ script.exec(cx, Main.getGlobal());
++ /*Main.evaluateScript(script, cx, Main.getGlobal());*/
+ }
+ }
+ Object[] array = new Object[scripts.length];
+@@ -86,7 +88,12 @@
+ Scriptable argsObj = cx.newArray(Main.global, array);
+ Main.global.defineProperty(GLOBAL_ARGUMENTS, argsObj, ScriptableObject.DONTENUM);
+ for (int i = 0; i < scripts.length; i++) {
+- Main.processFile(cx, Main.global, scripts[i]);
++ try {
++ Main.processFile(cx, Main.global, scripts[i]);
++ }
++ catch(IOException ioe) {
++ ioe.printStackTrace();
++ }
+ }
+ return null;
+ }
More information about the scm-commits
mailing list