Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Siplified code to extract error message from Throwable to reflect recent changes in exception-related API semantics.

Browse Source
This commit is contained in:
igor%mir2.org 2003-09-11 15:41:06 +00:00
parent 7d55aba05a
commit ca657b86ae
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/Main.java
View File

@ -2624,23 +2624,23 @@ public class Main extends JFrame implements Debugger, ContextListener {
interrupted(cx);
}
private static Object unwrapException(Object ex) {
for (;;) {
if (ex instanceof JavaScriptException) {
ex = ((JavaScriptException)ex).getValue();
} else if (ex instanceof EcmaError) {
ex = ((EcmaError)ex).getErrorObject();
} else if (ex instanceof NativeJavaObject) {
ex = ((NativeJavaObject)ex).unwrap();
break;
} else if (ex instanceof WrappedException) {
ex = ((WrappedException)ex).getWrappedException();
continue;
} else {
break;
private static String exceptionString(Throwable ex) {
if (ex instanceof JavaScriptException) {
JavaScriptException jse = (JavaScriptException)ex;
return ScriptRuntime.toString(jse.getValue());
} else if (ex instanceof EcmaError) {
return ex.toString();
} else if (ex instanceof WrappedException) {
Throwable wrapped = ((WrappedException)ex).getWrappedException();
if (wrapped != null) {
ex = wrapped;
}
}
return ex;
String msg = ex.toString();
if (msg == null || msg.length() == 0) {
msg = ex.getClass().toString();
}
return msg;
}
void handleExceptionThrown(Context cx, Throwable ex, FrameHelper frame) {
@ -2648,11 +2648,7 @@ public class Main extends JFrame implements Debugger, ContextListener {
String url = frame.getUrl();
int lineNumber = frame.getLineNumber();
FileWindow w = getFileWindow(url);
Object e = unwrapException(ex);
String msg = e.toString();
if (msg == null || msg.length() == 0) {
msg = e.getClass().toString();
}
String msg = exceptionString(ex);
msg += " (" + url + ", line " + lineNumber + ")";
if (w != null) {
swingInvoke(new SetFilePosition(this, w, lineNumber));