From eca0b3d9ec1cff4ee1d1a0dc41ef4c0f482033f8 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Wed, 15 Apr 2015 17:54:34 -0700 Subject: Nullity annotations to some tests. Change-Id: I2939d7fab30f3b8fe32f2fdf720c630d677373ff --- .../src/com/android/layoutlib/bridge/intensive/Main.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index ac23564..1ddc83e 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -261,7 +261,7 @@ public class Main { new ResourceRepository(new FolderWrapper(TEST_RES_DIR + APP_TEST_RES), false) { @NonNull @Override - protected ResourceItem createResourceItem(String name) { + protected ResourceItem createResourceItem(@NonNull String name) { return new ResourceItem(name); } }; @@ -381,17 +381,17 @@ public class Main { } @Override - public void warning(String msgFormat, Object... args) { + public void warning(@NonNull String msgFormat, Object... args) { failWithMsg(msgFormat, args); } @Override - public void info(String msgFormat, Object... args) { + public void info(@NonNull String msgFormat, Object... args) { // pass. } @Override - public void verbose(String msgFormat, Object... args) { + public void verbose(@NonNull String msgFormat, Object... args) { // pass. } }; @@ -399,7 +399,7 @@ public class Main { return mLogger; } - private static void failWithMsg(String msgFormat, Object... args) { - fail(msgFormat == null || args == null ? "" : String.format(msgFormat, args)); + private static void failWithMsg(@NonNull String msgFormat, Object... args) { + fail(args == null ? "" : String.format(msgFormat, args)); } } -- cgit v1.1