diff options
Diffstat (limited to 'lint')
7 files changed, 32 insertions, 14 deletions
diff --git a/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java b/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java index a6f4aaf..9fa310f 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/LintCliXmlParserTest.java @@ -16,6 +16,8 @@ package com.android.tools.lint; +import com.android.annotations.NonNull; +import com.android.annotations.Nullable; import com.android.tools.lint.checks.BuiltinIssueRegistry; import com.android.tools.lint.client.api.LintClient; import com.android.tools.lint.client.api.LintDriver; @@ -154,8 +156,13 @@ public class LintCliXmlParserTest extends TestCase { private static class TestClient extends Main { @Override - public void report(Context context, Issue issue, Severity severity, Location location, - String message, Object data) { + public void report( + @NonNull Context context, + @NonNull Issue issue, + @NonNull Severity severity, + @Nullable Location location, + @NonNull String message, + @Nullable Object data) { System.out.println(location + ":" + message); } } diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java index 4f427a2..b73db8c 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/checks/AbstractCheckTest.java @@ -348,7 +348,7 @@ public abstract class AbstractCheckTest extends SdkTestCase { } @Override - public Configuration getConfiguration(Project project) { + public Configuration getConfiguration(@NonNull Project project) { return AbstractCheckTest.this.getConfiguration(this, project); } @@ -434,18 +434,18 @@ public abstract class AbstractCheckTest extends SdkTestCase { } @Override - public boolean isEnabled(Issue issue) { + public boolean isEnabled(@NonNull Issue issue) { return AbstractCheckTest.this.isEnabled(issue); } @Override - public void ignore(Context context, Issue issue, Location location, String message, - Object data) { + public void ignore(@NonNull Context context, @NonNull Issue issue, + @Nullable Location location, @NonNull String message, @Nullable Object data) { fail("Not supported in tests."); } @Override - public void setSeverity(Issue issue, Severity severity) { + public void setSeverity(@NonNull Issue issue, @Nullable Severity severity) { fail("Not supported in tests."); } } diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java index 252ec5e..eaba6e6 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ApiLookupTest.java @@ -16,6 +16,8 @@ package com.android.tools.lint.checks; +import com.android.annotations.NonNull; +import com.android.annotations.Nullable; import com.android.tools.lint.detector.api.Detector; import com.android.tools.lint.detector.api.Severity; @@ -189,8 +191,11 @@ public class ApiLookupTest extends AbstractCheckTest { } @Override - public void log(Severity severity, Throwable exception, String format, - Object... args) { + public void log( + @NonNull Severity severity, + @Nullable Throwable exception, + @Nullable String format, + @Nullable Object... args) { if (format != null) { mLogBuffer.append(String.format(format, args)); mLogBuffer.append('\n'); diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java index e2c20ba..7cbbdc5 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/checks/IconDetectorTest.java @@ -16,6 +16,7 @@ package com.android.tools.lint.checks; +import com.android.annotations.NonNull; import com.android.tools.lint.client.api.LintClient; import com.android.tools.lint.client.api.LintDriver; import com.android.tools.lint.detector.api.Detector; @@ -67,7 +68,7 @@ public class IconDetectorTest extends AbstractCheckTest { protected TestConfiguration getConfiguration(LintClient client, Project project) { return new TestConfiguration(client, project, null) { @Override - public boolean isEnabled(Issue issue) { + public boolean isEnabled(@NonNull Issue issue) { return super.isEnabled(issue) && mEnabled.contains(issue); } }; diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java index e845b57..06e6fba 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/checks/ManifestOrderDetectorTest.java @@ -16,6 +16,7 @@ package com.android.tools.lint.checks; +import com.android.annotations.NonNull; import com.android.tools.lint.client.api.LintClient; import com.android.tools.lint.detector.api.Detector; import com.android.tools.lint.detector.api.Issue; @@ -40,7 +41,7 @@ public class ManifestOrderDetectorTest extends AbstractCheckTest { protected TestConfiguration getConfiguration(LintClient client, Project project) { return new TestConfiguration(client, project, null) { @Override - public boolean isEnabled(Issue issue) { + public boolean isEnabled(@NonNull Issue issue) { return super.isEnabled(issue) && mEnabled.contains(issue); } }; diff --git a/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java index e255ede..34116d0 100644 --- a/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java +++ b/lint/libs/lint_api/src/main/java/com/android/tools/lint/detector/api/Location.java @@ -648,7 +648,7 @@ public class Location { */ private boolean mConstructor; - private SearchHints(SearchDirection direction) { + private SearchHints(@NonNull SearchDirection direction) { super(); mDirection = direction; } @@ -659,7 +659,8 @@ public class Location { * @param direction the direction to search in for the pattern * @return a new @link SearchHints} object */ - public static SearchHints create(SearchDirection direction) { + @NonNull + public static SearchHints create(@NonNull SearchDirection direction) { return new SearchHints(direction); } @@ -668,6 +669,7 @@ public class Location { * @return this, for constructor chaining */ + @NonNull public SearchHints matchWholeWord() { mWholeWord = true; @@ -684,6 +686,7 @@ public class Location { * * @return this, for constructor chaining */ + @NonNull public SearchHints matchJavaSymbol() { mJavaSymbol = true; mWholeWord = true; @@ -702,6 +705,7 @@ public class Location { * * @return this, for constructor chaining */ + @NonNull public SearchHints matchConstructor() { mConstructor = true; mWholeWord = true; diff --git a/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java index 2c0d773..ab6e48a 100644 --- a/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java +++ b/lint/libs/lint_checks/src/main/java/com/android/tools/lint/checks/ApiDetector.java @@ -804,7 +804,7 @@ public class ApiDetector extends ResourceXmlDetector } /** - * Return the {@code @TargeTApi} level to use for the given {@code classNode}; + * Return the {@code @TargetApi} level to use for the given {@code classNode}; * this will be the {@code @TargetApi} annotation on the class, or any outer * methods (for anonymous inner classes) or outer classes (for inner classes) * of the given class. |