From 09407f74000f057774f85cfd414e86909022eca0 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Tue, 21 Aug 2012 11:05:06 -0700 Subject: Fix nullability annotations Eclipse 3.8/4.2 requires that any method which overrides another method with a @NonNull parameter (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=381443). This changeset adds @NonNull on various overriding methods in newly added code such that Eclispe 4.2 doesn't show errors. Change-Id: Ice4a4b4dc31ba68c4e0911bb37c15da090076a0d --- sdkmanager/app/src/com/android/sdkmanager/Main.java | 7 ++++--- .../android/sdklib/internal/repository/NullTaskMonitor.java | 7 ++++--- .../com/android/sdklib/internal/repository/MockMonitor.java | 8 +++++--- .../sdklib/tests/src/com/android/sdklib/mock/MockLog.java | 6 +++--- .../sdkuilib/internal/repository/SdkUpdaterNoWindow.java | 13 +++++++------ .../android/sdkuilib/internal/tasks/TaskMonitorImpl.java | 13 +++++++------ .../android/sdkuilib/internal/widgets/MessageBoxLog.java | 7 ++++--- 7 files changed, 34 insertions(+), 27 deletions(-) (limited to 'sdkmanager') 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)); } -- cgit v1.1