diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-07 15:05:43 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-06-07 15:10:46 -0700 |
| commit | 0a3d789a9aaad345871ce82321f9f84080b2d559 (patch) | |
| tree | 45ac706a91e8e4e461848d2414737048a1a9414d /manifmerger | |
| parent | efa919d7857fb380237d48d30e177d58d1075a31 (diff) | |
| download | sdk-0a3d789a9aaad345871ce82321f9f84080b2d559.zip sdk-0a3d789a9aaad345871ce82321f9f84080b2d559.tar.gz sdk-0a3d789a9aaad345871ce82321f9f84080b2d559.tar.bz2 | |
Add @NonNull annotations to overridden method
Eclipse 4.2's new null analysis is useful, but (unfortunately)
requires nullness annotations to be repeated on methods overriding or
implementing interfaces where there are other nullness annotations.
This changeset adds this for the manifest merger.
(Eclipse Issue 381443 tracks a request for making the null analysis
not require this and simply pick up annotations from the overridden or
implemented method signature.)
Change-Id: I063b7713c5dbca642a8afd3231bbe4002ec130e1
Diffstat (limited to 'manifmerger')
| -rwxr-xr-x | manifmerger/src/com/android/manifmerger/MergerLog.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/manifmerger/src/com/android/manifmerger/MergerLog.java b/manifmerger/src/com/android/manifmerger/MergerLog.java index 417e6bb..c1f8cb2 100755 --- a/manifmerger/src/com/android/manifmerger/MergerLog.java +++ b/manifmerger/src/com/android/manifmerger/MergerLog.java @@ -36,9 +36,9 @@ public abstract class MergerLog { return new IMergerLog() { @Override public void error( - Severity severity, - FileAndLine location, - String message, + @NonNull Severity severity, + @NonNull FileAndLine location, + @NonNull String message, Object...msgParams) { switch(severity) { @@ -64,10 +64,10 @@ public abstract class MergerLog { } @Override - public void conflict(Severity severity, - FileAndLine location1, - FileAndLine location2, - String message, + public void conflict(@NonNull Severity severity, + @NonNull FileAndLine location1, + @NonNull FileAndLine location2, + @NonNull String message, Object...msgParams) { switch(severity) { @@ -116,9 +116,9 @@ public abstract class MergerLog { return new IMergerLog() { @Override public void error( - Severity severity, - FileAndLine location, - String message, + @NonNull Severity severity, + @NonNull FileAndLine location, + @NonNull String message, Object...msgParams) { if (filePath1 != null) { @@ -129,10 +129,10 @@ public abstract class MergerLog { } @Override - public void conflict(Severity severity, - FileAndLine location1, - FileAndLine location2, - String message, + public void conflict(@NonNull Severity severity, + @NonNull FileAndLine location1, + @NonNull FileAndLine location2, + @NonNull String message, Object...msgParams) { if (filePath1 != null) { |