aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xeclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java11
-rwxr-xr-xsdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java2
2 files changed, 10 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java
index 26a51d6..ddf180f 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java
@@ -52,11 +52,18 @@ public class SdkManagerAction implements IWorkbenchWindowActionDelegate, IObject
final Sdk sdk = Sdk.getCurrent();
if (sdk != null) {
- // Runs the updater window, directing all logs to the ADT console.
+ // Runs the updater window, directing only warning/errors logs to the ADT console
+ // (normal log is just dropped, which is fine since the SDK Manager has its own
+ // log window now.)
SdkUpdaterWindow window = new SdkUpdaterWindow(
AdtPlugin.getDisplay().getActiveShell(),
- new AdtConsoleSdkLog(),
+ new AdtConsoleSdkLog() {
+ @Override
+ public void printf(String msgFormat, Object... args) {
+ // Do not show non-error/warning log in Eclipse.
+ };
+ },
sdk.getSdkLocation(),
SdkInvocationContext.IDE);
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java
index 3e6cc3d..699edda 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java
@@ -250,7 +250,7 @@ class LogWindow implements ILogUiProvider {
});
if (mSecondaryLog != null) {
- mSecondaryLog.printf("ERROR: %1$s", log); //$NON-NLS-1$
+ mSecondaryLog.error(null, "%1$s", log); //$NON-NLS-1$
}
}
}