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

2 files changed, 8 insertions, 6 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));
             }
         });