diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-02-08 12:31:44 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-02-08 12:32:06 -0800 |
| commit | 53bee7d7bccef7dda55a979b180d88c782f8ff0c (patch) | |
| tree | c61406aacd42f53c59844c29227134c0fab36e24 /eclipse/plugins | |
| parent | 1e0629a1d419796de929ac71551871a6abee2e4b (diff) | |
| download | sdk-53bee7d7bccef7dda55a979b180d88c782f8ff0c.zip sdk-53bee7d7bccef7dda55a979b180d88c782f8ff0c.tar.gz sdk-53bee7d7bccef7dda55a979b180d88c782f8ff0c.tar.bz2 | |
Update nullness annotations
Also remove test dependency on ddmuilib project
Change-Id: I90c62bcfeca86110a6604ebda4425369aa3cc889
Diffstat (limited to 'eclipse/plugins')
4 files changed, 6 insertions, 5 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index 752bbc6..88e9c15 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -1884,7 +1884,7 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { // --------- ILogger methods ----------- @Override - public void error(Throwable t, String format, Object... args) { + public void error(@Nullable Throwable t, @Nullable String format, Object... args) { if (t != null) { log(t, format, args); } else { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java index a85bfd5..0f0cbcc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java @@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.internal.build.builders; import com.android.SdkConstants; import com.android.annotations.NonNull; +import com.android.annotations.Nullable; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; @@ -897,7 +898,8 @@ public class PreCompilerBuilder extends BaseBuilder { } @Override - public void error(Throwable t, String errorFormat, Object... args) { + public void error(@Nullable Throwable t, @Nullable String errorFormat, + Object... args) { errors.add(String.format(errorFormat, args)); } }), diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java index 26afebd..2396a4c 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java @@ -17,6 +17,7 @@ package com.android.ide.eclipse.adt.internal.sdk; import com.android.annotations.NonNull; +import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.utils.ILogger; @@ -28,7 +29,7 @@ public class AdtConsoleSdkLog implements ILogger { private static final String TAG = "SDK Manager"; //$NON-NLS-1$ @Override - public void error(Throwable t, String errorFormat, Object... args) { + public void error(@Nullable Throwable t, @Nullable String errorFormat, Object... args) { if (t != null) { AdtPlugin.logAndPrintError(t, TAG, "Error: " + errorFormat, args); } else { diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index ae0cb35..ab36b62 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -7,8 +7,6 @@ <classpathentry kind="lib" path="kxml2-2.3.0.jar"/> <classpathentry kind="lib" path="easymock.jar"/> <classpathentry kind="lib" path="sdktestutils.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> - <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/> <classpathentry kind="lib" path="/plugin-adt/libs/ninepatch.jar" sourcepath="/ninepatch"/> <classpathentry kind="lib" path="/plugin-base/libs/sdklib.jar" sourcepath="/SdkLib"/> <classpathentry kind="lib" path="/plugin-adt/libs/sdkuilib.jar" sourcepath="/SdkUiLib"/> |