From 7e73e748de2f65ce418c0ede4f649fb6eba81ae0 Mon Sep 17 00:00:00 2001
From: Raphael Moll <ralf@android.com>
Date: Mon, 6 Dec 2010 20:32:05 -0800
Subject: [PATCH] Cherry-pick 0ec90f2b from tools_r8

Display output error in the exception's toString..

Change-Id: Idce557d2c172d27abaf474d14136f48d7c3396dc
---
 .../adt/internal/build/ExecResultException.java    | 25 ++++++++++++++++++++++
 .../internal/build/ProguardResultException.java    |  5 +++++
 2 files changed, 30 insertions(+)

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
index 37ab58184..63a7a6946 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ExecResultException.java
@@ -44,4 +44,29 @@ class ExecResultException extends Exception {
     public int getErrorCode() {
         return mErrorCode;
     }
+
+    public String getLabel() {
+        return "Command-line";
+    }
+
+    @Override
+    public String toString() {
+        String result = String.format("%1$s Error %2$d", getLabel(), mErrorCode);
+        if (mOutput != null && mOutput.length > 0) {
+            // Note : the "error detail" window in Eclipse seem to ignore the \n,
+            // so we prefix them with a space. It's not optimal but it's slightly readable.
+            result += " \nOutput:";
+            for (String o : mOutput) {
+                if (o != null) {
+                    result += " \n" + o;
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public String getMessage() {
+        return toString();
+    }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
index bfc7e8b79..54246b337 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ProguardResultException.java
@@ -26,4 +26,9 @@ public final class ProguardResultException extends ExecResultException {
     ProguardResultException(int errorCode, String[] output) {
         super(errorCode, output);
     }
+
+    @Override
+    public String getLabel() {
+        return "Proguard";
+    }
 }
-- 
2.11.0