diff options
16 files changed, 65 insertions, 51 deletions
diff --git a/anttasks/src/com/android/ant/GetTargetTask.java b/anttasks/src/com/android/ant/GetTargetTask.java index 426b01b..d79ffee 100644 --- a/anttasks/src/com/android/ant/GetTargetTask.java +++ b/anttasks/src/com/android/ant/GetTargetTask.java @@ -17,6 +17,7 @@ package com.android.ant; import com.android.SdkConstants; +import com.android.annotations.NonNull; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget.IOptionalLibrary; @@ -129,17 +130,17 @@ public class GetTargetTask extends Task { } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { messages.add(String.format(msgFormat, args)); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { info(msgFormat, args); } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { messages.add(String.format("Warning: " + warningFormat, args)); } }); diff --git a/anttasks/src/com/android/ant/GetUiTargetTask.java b/anttasks/src/com/android/ant/GetUiTargetTask.java index 5c34fa1..e45d2bc 100644 --- a/anttasks/src/com/android/ant/GetUiTargetTask.java +++ b/anttasks/src/com/android/ant/GetUiTargetTask.java @@ -16,6 +16,7 @@ package com.android.ant; +import com.android.annotations.NonNull; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget.IOptionalLibrary; import com.android.sdklib.SdkManager; @@ -78,17 +79,17 @@ public class GetUiTargetTask extends Task { } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { messages.add(String.format(msgFormat, args)); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { info(msgFormat, args); } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { messages.add(String.format("Warning: " + warningFormat, args)); } }); diff --git a/common/src/com/android/utils/ILogger.java b/common/src/com/android/utils/ILogger.java index df3a636..7df5d10 100644 --- a/common/src/com/android/utils/ILogger.java +++ b/common/src/com/android/utils/ILogger.java @@ -72,6 +72,6 @@ public interface ILogger { * @param msgFormat is a string format to be used with a {@link Formatter}. Cannot be null. * @param args provides the arguments for msgFormat. */ - void verbose(String msgFormat, Object... args); + void verbose(@NonNull String msgFormat, Object... args); } diff --git a/common/src/com/android/utils/NullLogger.java b/common/src/com/android/utils/NullLogger.java index 77f1ad5..8b1a3d9 100644 --- a/common/src/com/android/utils/NullLogger.java +++ b/common/src/com/android/utils/NullLogger.java @@ -16,6 +16,8 @@ package com.android.utils; +import com.android.annotations.NonNull; + /** * Dummy implementation of an {@link ILogger}. * <p/> @@ -35,17 +37,17 @@ public class NullLogger implements ILogger { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { // ignore } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { // ignore } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { // ignore } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index dddffef..ce6ef7c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -1890,17 +1890,17 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { } @Override - public void info(String format, Object... args) { + public void info(@NonNull String format, Object... args) { log(IStatus.INFO, format, args); } @Override - public void verbose(String format, Object... args) { + public void verbose(@NonNull String format, Object... args) { log(IStatus.INFO, format, args); } @Override - public void warning(String format, Object... args) { + public void warning(@NonNull String format, Object... args) { log(IStatus.WARNING, format, args); } 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 91bc411..9cae8a4 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 @@ -17,6 +17,7 @@ package com.android.ide.eclipse.adt.internal.actions; import com.android.SdkConstants; +import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.build.DexWrapper; @@ -264,11 +265,11 @@ public class SdkManagerAction implements IWorkbenchWindowActionDelegate, IObject AdtPlugin.getDisplay().getActiveShell(), new AdtConsoleSdkLog() { @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { // Do not show non-error/warning log in Eclipse. }; @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { // Do not show non-error/warning log in Eclipse. }; }, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java index 4da8004..d5b1b9a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java @@ -17,6 +17,7 @@ package com.android.ide.eclipse.adt.internal.build.builders; import com.android.SdkConstants; +import com.android.annotations.NonNull; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; @@ -830,17 +831,17 @@ public class PreCompilerBuilder extends BaseBuilder { ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(new ILogger() { @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { AdtPlugin.printToConsole(getProject(), String.format(warningFormat, args)); } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { AdtPlugin.printToConsole(getProject(), String.format(msgFormat, args)); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { info(msgFormat, args); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java index 268fc53..26afebd 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java @@ -16,6 +16,7 @@ package com.android.ide.eclipse.adt.internal.sdk; +import com.android.annotations.NonNull; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.utils.ILogger; @@ -36,7 +37,7 @@ public class AdtConsoleSdkLog implements ILogger { } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { String msg = String.format(msgFormat, args); for (String s : msg.split("\n")) { if (s.trim().length() > 0) { @@ -46,12 +47,12 @@ public class AdtConsoleSdkLog implements ILogger { } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { info(msgFormat, args); } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { AdtPlugin.printToConsole(TAG, String.format("Warning: " + warningFormat, args)); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java index 8c2ad4d..29ad9fa 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java @@ -245,17 +245,17 @@ public final class Sdk { } @Override - public void warning(String warningFormat, Object... arg) { + public void warning(@NonNull String warningFormat, Object... arg) { logMessages.add(String.format("Warning: " + warningFormat, arg)); } @Override - public void info(String msgFormat, Object... arg) { + public void info(@NonNull String msgFormat, Object... arg) { logMessages.add(String.format(msgFormat, arg)); } @Override - public void verbose(String msgFormat, Object... arg) { + public void verbose(@NonNull String msgFormat, Object... arg) { info(msgFormat, arg); } }; diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 91d544f..3b2afc8 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -17,6 +17,7 @@ package com.android.sdkmanager; import com.android.SdkConstants; +import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; import com.android.annotations.VisibleForTesting.Visibility; import com.android.io.FileWrapper; @@ -139,7 +140,7 @@ public class Main { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { if (mSdkCommandLine.isVerbose()) { System.out.printf("Warning: " + warningFormat, args); if (!warningFormat.endsWith("\n")) { @@ -149,12 +150,12 @@ public class Main { } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { System.out.printf(msgFormat, args); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { System.out.printf(msgFormat, args); } }; diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java index 6464484..e0defb3 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java @@ -16,6 +16,7 @@ package com.android.sdklib.internal.repository; +import com.android.annotations.NonNull; import com.android.utils.ILogger; @@ -116,17 +117,17 @@ public class NullTaskMonitor implements ITaskMonitor { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { mLog.warning(warningFormat, args); } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { mLog.info(msgFormat, args); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { mLog.verbose(msgFormat, args); } } diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java index cae5921..72e7d93 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java @@ -16,6 +16,8 @@ package com.android.sdklib.internal.repository; +import com.android.annotations.NonNull; + /** * Mock implementation of {@link ITaskMonitor} that simply captures * the output in local strings. Does not provide any UI and has no @@ -102,15 +104,15 @@ public class MockMonitor implements ITaskMonitor { } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { } @Override diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java index e92db51..f2e30d2 100644 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java @@ -38,17 +38,17 @@ public class MockLog implements ILogger { } @Override - public void warning(String format, Object... args) { + public void warning(@NonNull String format, Object... args) { add("W ", format, args); } @Override - public void info(String format, Object... args) { + public void info(@NonNull String format, Object... args) { add("P ", format, args); } @Override - public void verbose(String format, Object... args) { + public void verbose(@NonNull String format, Object... args) { add("V ", format, args); } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java index b5bd011..5e7143d 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java @@ -16,6 +16,7 @@ package com.android.sdkuilib.internal.repository; +import com.android.annotations.NonNull; import com.android.sdklib.SdkManager; import com.android.sdklib.internal.repository.ITask; import com.android.sdklib.internal.repository.ITaskFactory; @@ -267,17 +268,17 @@ public class SdkUpdaterNoWindow { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { mSdkLog.warning(warningFormat, args); } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { mSdkLog.info(msgFormat, args); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { mSdkLog.verbose(msgFormat, args); } @@ -606,17 +607,17 @@ public class SdkUpdaterNoWindow { } @Override - public void warning(String warningFormat, Object... args) { + public void warning(@NonNull String warningFormat, Object... args) { mRoot.warning(warningFormat, args); } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { mRoot.info(msgFormat, args); } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { mRoot.verbose(msgFormat, args); } } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java index e77ec13..4d4f3c9 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java @@ -16,6 +16,7 @@ package com.android.sdkuilib.internal.tasks; +import com.android.annotations.NonNull; import com.android.sdklib.internal.repository.ITaskMonitor; import com.android.sdklib.internal.repository.UserCredentials; @@ -217,17 +218,17 @@ class TaskMonitorImpl implements ITaskMonitor { } @Override - public void warning(String warningFormat, Object... arg) { + public void warning(@NonNull String warningFormat, Object... arg) { log("Warning: " + warningFormat, arg); } @Override - public void info(String msgFormat, Object... arg) { + public void info(@NonNull String msgFormat, Object... arg) { log(msgFormat, arg); } @Override - public void verbose(String msgFormat, Object... arg) { + public void verbose(@NonNull String msgFormat, Object... arg) { log(msgFormat, arg); } @@ -351,17 +352,17 @@ class TaskMonitorImpl implements ITaskMonitor { } @Override - public void warning(String warningFormat, Object... arg) { + public void warning(@NonNull String warningFormat, Object... arg) { mRoot.warning(warningFormat, arg); } @Override - public void info(String msgFormat, Object... arg) { + public void info(@NonNull String msgFormat, Object... arg) { mRoot.info(msgFormat, arg); } @Override - public void verbose(String msgFormat, Object... arg) { + public void verbose(@NonNull String msgFormat, Object... arg) { mRoot.verbose(msgFormat, arg); } } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java index 147f7ce..f5b75e0 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java @@ -16,6 +16,7 @@ package com.android.sdkuilib.internal.widgets; +import com.android.annotations.NonNull; import com.android.utils.ILogger; import org.eclipse.jface.dialogs.MessageDialog; @@ -74,21 +75,21 @@ public final class MessageBoxLog implements ILogger { } @Override - public void warning(String warningFormat, Object... arg) { + public void warning(@NonNull String warningFormat, Object... arg) { if (!mLogErrorsOnly) { logMessages.add(String.format("Warning: " + warningFormat, arg)); } } @Override - public void info(String msgFormat, Object... arg) { + public void info(@NonNull String msgFormat, Object... arg) { if (!mLogErrorsOnly) { logMessages.add(String.format(msgFormat, arg)); } } @Override - public void verbose(String msgFormat, Object... arg) { + public void verbose(@NonNull String msgFormat, Object... arg) { if (!mLogErrorsOnly) { logMessages.add(String.format(msgFormat, arg)); } |