commit d0900d13fb7bb1706aff5205af7e2d6517335bee
author jeffhao <jeffhao@google.com> Fri Jan 21 13:37:57 2011 -0800
committer jeffhao <jeffhao@google.com> Fri Jan 21 13:58:18 2011 -0800
tree 53cc17ae6abf2536382e5a236b65b1f3925d4400
parent 0b8f90f247dfae611fbae3f3849e7d904aee52aa

Made handling of sim exceptions nicer.

Change-Id: I089512c046d90ea37da4a33433edc4ec308a628d

dx/src/com/android/dx/command/dexer/Main.java

diff --git a/dx/src/com/android/dx/command/dexer/Main.java b/dx/src/com/android/dx/command/dexer/Main.java
index b261d31..d5902e2 100644
--- a/dx/src/com/android/dx/command/dexer/Main.java
+++ b/dx/src/com/android/dx/command/dexer/Main.java
@@ -17,6 +17,7 @@
 package com.android.dx.command.dexer;
 
 import com.android.dx.Version;
+import com.android.dx.cf.code.SimException;
 import com.android.dx.cf.direct.ClassPathOpener;
 import com.android.dx.cf.iface.ParseException;
 import com.android.dx.command.DxConsole;
@@ -348,9 +349,14 @@
             public void onException(Exception ex) {
                 if (ex instanceof StopProcessing) {
                     throw (StopProcessing) ex;
+                } else if (ex instanceof SimException) {
+                    DxConsole.err.println("\nEXCEPTION FROM SIMULATION:");
+                    DxConsole.err.println(ex.getMessage() + "\n");
+                    DxConsole.err.println(((SimException) ex).getContext());
+                } else {
+                    DxConsole.err.println("\nUNEXPECTED TOP-LEVEL EXCEPTION:");
+                    ex.printStackTrace(DxConsole.err);
                 }
-                DxConsole.err.println("\nUNEXPECTED TOP-LEVEL EXCEPTION:");
-                ex.printStackTrace(DxConsole.err);
                 errors++;
             }
             public void onProcessArchiveStart(File file) {