From 64cc0e21c489faa2fa03187674c80a006481ea1e Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 11 Jan 2011 13:12:23 -0800
Subject: [PATCH] Remove error(tag, throwable) from LayoutLog.

We should never only log an exception with no associated
message.
Also, I've found several case in the layoutlib where there
is a message in place of the tag.

This new API makes it more clear that there's both a tag and a message
since both are required for error()

Change-Id: I6d5f45c07b1cb8df96311d930170526bb729fae6
---
 .../adt/internal/editors/layout/gle2/RenderLogger.java  | 17 -----------------
 .../ide/eclipse/adt/internal/sdk/AndroidTargetData.java |  5 -----
 .../com/android/ide/common/rendering/LayoutLibrary.java |  2 +-
 .../com/android/ide/common/rendering/api/LayoutLog.java |  9 +++------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderLogger.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderLogger.java
index bc89b24de..1dc5b782c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderLogger.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderLogger.java
@@ -96,23 +96,6 @@ class RenderLogger extends LayoutLog {
     }
 
     @Override
-    public void error(String tag, Throwable throwable) {
-        AdtPlugin.log(throwable, "%1$s: %2$s", mName, tag);
-        assert throwable != null;
-        mHaveExceptions = true;
-
-        String message = throwable.getMessage();
-        if (message == null) {
-            message = throwable.getClass().getName();
-        } else if (tag == null && throwable instanceof ClassNotFoundException
-                && !message.contains(ClassNotFoundException.class.getSimpleName())) {
-            tag = ClassNotFoundException.class.getSimpleName();
-        }
-        String description = describe(tag, message);
-        addError(description);
-    }
-
-    @Override
     public void error(String tag, String message, Throwable throwable) {
         String description = describe(tag, message);
         AdtPlugin.log(throwable, "%1$s: %2$s", mName, description);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
index b75d6fd3a..216502c61 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
@@ -268,11 +268,6 @@ public class AndroidTargetData {
                         }
 
                         @Override
-                        public void error(String tag, Throwable throwable) {
-                            AdtPlugin.log(throwable, null);
-                        }
-
-                        @Override
                         public void warning(String tag, String message) {
                             AdtPlugin.log(IStatus.WARNING, message);
                         }
diff --git a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
index a9611350b..e1ce53b1c 100644
--- a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
+++ b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
@@ -350,7 +350,7 @@ public class LayoutLibrary {
             }
 
             public void error(Throwable t) {
-                log.error(null, t);
+                log.error(null, "error!", t);
             }
 
             public void error(String message) {
diff --git a/layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java b/layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java
index a735f81aa..979b873ed 100644
--- a/layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java
+++ b/layoutlib_api/src/com/android/ide/common/rendering/api/LayoutLog.java
@@ -18,13 +18,13 @@ package com.android.ide.common.rendering.api;
 
 public class LayoutLog {
 
-    public void error(String tag, String message) {
+    public void warning(String tag, String message) {
     }
 
-    public void error(String tag, Throwable t) {
+    public void fidelityWarning(String tag, String message, Throwable throwable) {
     }
 
-    public void warning(String tag, String message) {
+    public void error(String tag, String message) {
     }
 
     /**
@@ -36,7 +36,4 @@ public class LayoutLog {
 
     }
 
-    public void fidelityWarning(String tag, String message, Throwable throwable) {
-
-    }
 }
-- 
2.11.0