diff options
Diffstat (limited to 'sdkmanager/libs')
75 files changed, 535 insertions, 20 deletions
diff --git a/sdkmanager/libs/sdklib/.settings/org.eclipse.jdt.core.prefs b/sdkmanager/libs/sdklib/.settings/org.eclipse.jdt.core.prefs index e755df2..9c7cb00 100644 --- a/sdkmanager/libs/sdklib/.settings/org.eclipse.jdt.core.prefs +++ b/sdkmanager/libs/sdklib/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -#Thu Jun 09 12:26:44 PDT 2011 +#Tue Dec 20 16:31:10 PST 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -9,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -69,3 +78,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java index 06b1f81..b30e0cc 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java @@ -47,18 +47,22 @@ final class AddOnTarget implements IAndroidTarget { mDescription = description; } + @Override public String getJarName() { return mJarName; } + @Override public String getJarPath() { return mJarPath; } + @Override public String getName() { return mName; } + @Override public String getDescription() { return mDescription; } @@ -136,14 +140,17 @@ final class AddOnTarget implements IAndroidTarget { } } + @Override public String getLocation() { return mLocation; } + @Override public String getName() { return mName; } + @Override public ISystemImage getSystemImage(String abiType) { for (ISystemImage sysImg : mSystemImages) { if (sysImg.getAbiType().equals(abiType)) { @@ -153,51 +160,63 @@ final class AddOnTarget implements IAndroidTarget { return null; } + @Override public ISystemImage[] getSystemImages() { return mSystemImages; } + @Override public String getVendor() { return mVendor; } + @Override public String getFullName() { return String.format("%1$s (%2$s)", mName, mVendor); } + @Override public String getClasspathName() { return String.format("%1$s [%2$s]", mName, mBasePlatform.getClasspathName()); } + @Override public String getShortClasspathName() { return String.format("%1$s [%2$s]", mName, mBasePlatform.getVersionName()); } + @Override public String getDescription() { return mDescription; } + @Override public AndroidVersion getVersion() { // this is always defined by the base platform return mBasePlatform.getVersion(); } + @Override public String getVersionName() { return mBasePlatform.getVersionName(); } + @Override public int getRevision() { return mRevision; } + @Override public boolean isPlatform() { return false; } + @Override public IAndroidTarget getParent() { return mBasePlatform; } + @Override public String getPath(int pathId) { switch (pathId) { case SKINS: @@ -232,6 +251,7 @@ final class AddOnTarget implements IAndroidTarget { File sampleLoc = new File(mLocation, SdkConstants.FD_SAMPLES); if (sampleLoc.isDirectory()) { File[] files = sampleLoc.listFiles(new FileFilter() { + @Override public boolean accept(File pathname) { return pathname.isDirectory(); } @@ -247,18 +267,22 @@ final class AddOnTarget implements IAndroidTarget { } } + @Override public boolean hasRenderingLibrary() { return mHasRenderingLibrary || mHasRenderingResources; } + @Override public String[] getSkins() { return mSkins; } + @Override public String getDefaultSkin() { return mDefaultSkin; } + @Override public IOptionalLibrary[] getOptionalLibraries() { return mLibraries; } @@ -268,30 +292,37 @@ final class AddOnTarget implements IAndroidTarget { * * {@inheritDoc} */ + @Override public String[] getPlatformLibraries() { return mBasePlatform.getPlatformLibraries(); } + @Override public String getProperty(String name) { return mBasePlatform.getProperty(name); } + @Override public Integer getProperty(String name, Integer defaultValue) { return mBasePlatform.getProperty(name, defaultValue); } + @Override public Boolean getProperty(String name, Boolean defaultValue) { return mBasePlatform.getProperty(name, defaultValue); } + @Override public Map<String, String> getProperties() { return mBasePlatform.getProperties(); } + @Override public int getUsbVendorId() { return mVendorId; } + @Override public boolean canRunOn(IAndroidTarget target) { // basic test if (target == this) { @@ -326,6 +357,7 @@ final class AddOnTarget implements IAndroidTarget { } + @Override public String hashString() { return String.format(ADD_ON_FORMAT, mVendor, mName, mBasePlatform.getVersion().getApiString()); @@ -354,6 +386,7 @@ final class AddOnTarget implements IAndroidTarget { * (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(IAndroidTarget target) { // quick check. if (this == target) { diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java index 903e1ad..996aee4 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java @@ -259,6 +259,7 @@ public final class AndroidVersion implements Comparable<AndroidVersion> { * @return a negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. */ + @Override public int compareTo(AndroidVersion o) { return compareTo(o.mApiLevel, o.mCodename); } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/NullSdkLog.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/NullSdkLog.java index fb4813b..09f49e2 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/NullSdkLog.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/NullSdkLog.java @@ -29,14 +29,17 @@ public class NullSdkLog implements ISdkLog { return sThis; } + @Override public void error(Throwable t, String errorFormat, Object... args) { // ignore } + @Override public void printf(String msgFormat, Object... args) { // ignore } + @Override public void warning(String warningFormat, Object... args) { // ignore } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java index 3db0d89..02688c0 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java @@ -139,6 +139,7 @@ final class PlatformTarget implements IAndroidTarget { return mLayoutlibVersion; } + @Override public ISystemImage getSystemImage(String abiType) { for (ISystemImage sysImg : mSystemImages) { if (sysImg.getAbiType().equals(abiType)) { @@ -148,10 +149,12 @@ final class PlatformTarget implements IAndroidTarget { return null; } + @Override public ISystemImage[] getSystemImages() { return mSystemImages; } + @Override public String getLocation() { return mRootFolderOsPath; } @@ -163,22 +166,27 @@ final class PlatformTarget implements IAndroidTarget { * * @see com.android.sdklib.IAndroidTarget#getVendor() */ + @Override public String getVendor() { return PLATFORM_VENDOR; } + @Override public String getName() { return mName; } + @Override public String getFullName() { return mName; } + @Override public String getClasspathName() { return mName; } + @Override public String getShortClasspathName() { return mName; } @@ -190,30 +198,37 @@ final class PlatformTarget implements IAndroidTarget { * * @see com.android.sdklib.IAndroidTarget#getDescription() */ + @Override public String getDescription() { return String.format("Standard Android platform %s", mVersionName); } + @Override public AndroidVersion getVersion() { return mVersion; } + @Override public String getVersionName() { return mVersionName; } + @Override public int getRevision() { return mRevision; } + @Override public boolean isPlatform() { return true; } + @Override public IAndroidTarget getParent() { return null; } + @Override public String getPath(int pathId) { return mPaths.get(pathId); } @@ -221,15 +236,18 @@ final class PlatformTarget implements IAndroidTarget { /** * Returns whether the target is able to render layouts. This is always true for platforms. */ + @Override public boolean hasRenderingLibrary() { return true; } + @Override public String[] getSkins() { return mSkins; } + @Override public String getDefaultSkin() { // only one skin? easy. if (mSkins.length == 1) { @@ -257,6 +275,7 @@ final class PlatformTarget implements IAndroidTarget { * {@inheritDoc} * @see com.android.sdklib.IAndroidTarget#getOptionalLibraries() */ + @Override public IOptionalLibrary[] getOptionalLibraries() { return null; } @@ -267,6 +286,7 @@ final class PlatformTarget implements IAndroidTarget { * TODO change the fixed library list to be build-dependent later. * {@inheritDoc} */ + @Override public String[] getPlatformLibraries() { return new String[] { SdkConstants.ANDROID_TEST_RUNNER_LIB }; } @@ -275,10 +295,12 @@ final class PlatformTarget implements IAndroidTarget { * The platform has no USB Vendor Id: always return {@link IAndroidTarget#NO_USB_ID}. * {@inheritDoc} */ + @Override public int getUsbVendorId() { return NO_USB_ID; } + @Override public boolean canRunOn(IAndroidTarget target) { // basic test if (target == this) { @@ -296,6 +318,7 @@ final class PlatformTarget implements IAndroidTarget { return target.getVersion().getApiLevel() >= mVersion.getApiLevel(); } + @Override public String hashString() { return String.format(PLATFORM_HASH, mVersion.getApiString()); } @@ -322,6 +345,7 @@ final class PlatformTarget implements IAndroidTarget { * (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(IAndroidTarget target) { // quick check. if (this == target) { @@ -357,10 +381,12 @@ final class PlatformTarget implements IAndroidTarget { getRevision()); } + @Override public String getProperty(String name) { return mProperties.get(name); } + @Override public Integer getProperty(String name, Integer defaultValue) { try { String value = getProperty(name); @@ -374,6 +400,7 @@ final class PlatformTarget implements IAndroidTarget { return defaultValue; } + @Override public Boolean getProperty(String name, Boolean defaultValue) { String value = getProperty(name); if (value != null) { @@ -383,6 +410,7 @@ final class PlatformTarget implements IAndroidTarget { return defaultValue; } + @Override public Map<String, String> getProperties() { return mProperties; // mProperties is unmodifiable. } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java index eab2dbe..df3defc 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java @@ -111,6 +111,7 @@ public class SdkManager { return mRevision; } + @Override public int compareTo(LayoutlibVersion rhs) { boolean useRev = this.mRevision > NOT_SPECIFIED && rhs.mRevision > NOT_SPECIFIED; int lhsValue = (this.mApi << 16) + (useRev ? this.mRevision : 0); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/StdSdkLog.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/StdSdkLog.java index 71ce0ad..5b1e237 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/StdSdkLog.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/StdSdkLog.java @@ -26,6 +26,7 @@ package com.android.sdklib; */ public class StdSdkLog implements ISdkLog { + @Override public void error(Throwable t, String errorFormat, Object... args) { if (errorFormat != null) { String msg = String.format("Error: " + errorFormat, args); @@ -48,6 +49,7 @@ public class StdSdkLog implements ISdkLog { } } + @Override public void warning(String warningFormat, Object... args) { String msg = String.format("Warning: " + warningFormat, args); @@ -65,6 +67,7 @@ public class StdSdkLog implements ISdkLog { } } + @Override public void printf(String msgFormat, Object... args) { String msg = String.format(msgFormat, args); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java index 2188329..422ae90 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SystemImage.java @@ -121,11 +121,13 @@ public class SystemImage implements ISystemImage { } /** Returns the actual location of an installed system image. */ + @Override public File getLocation() { return mLocation; } /** Indicates the location strategy for this system image in the SDK. */ + @Override public LocationType getLocationType() { return mLocationtype; } @@ -135,10 +137,12 @@ public class SystemImage implements ISystemImage { * {@link SdkConstants#ABI_ARMEABI_V7A} or {@link SdkConstants#ABI_INTEL_ATOM}. * Cannot be null nor empty. */ + @Override public String getAbiType() { return mAbiType; } + @Override public int compareTo(ISystemImage other) { // Sort by ABI name only. This is what matters from a user point of view. return this.getAbiType().compareToIgnoreCase(other.getAbiType()); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java index 774d9f4..5c95b81 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java @@ -18,9 +18,9 @@ package com.android.sdklib.build; import com.android.sdklib.SdkConstants; import com.android.sdklib.internal.build.DebugKeyProvider; -import com.android.sdklib.internal.build.SignedJarBuilder; import com.android.sdklib.internal.build.DebugKeyProvider.IKeyGenOutput; import com.android.sdklib.internal.build.DebugKeyProvider.KeytoolException; +import com.android.sdklib.internal.build.SignedJarBuilder; import com.android.sdklib.internal.build.SignedJarBuilder.IZipEntryFilter; import java.io.File; @@ -63,6 +63,7 @@ public final class ApkBuilder implements IArchiveBuilder { mInputFile = inputFile; } + @Override public boolean checkEntry(String archivePath) throws ZipAbortException { verbosePrintln("=> %s", archivePath); @@ -88,6 +89,7 @@ public final class ApkBuilder implements IArchiveBuilder { private boolean mNativeLibsConflict = false; private File mInputFile; + @Override public boolean checkEntry(String archivePath) throws ZipAbortException { // split the path into segments. String[] segments = archivePath.split("/"); @@ -193,10 +195,12 @@ public final class ApkBuilder implements IArchiveBuilder { mNativeLibsConflict = nativeLibsConflict; } + @Override public List<String> getNativeLibs() { return mLibs; } + @Override public boolean hasNativeLibsConflicts() { return mNativeLibsConflict; } @@ -251,10 +255,12 @@ public final class ApkBuilder implements IArchiveBuilder { IKeyGenOutput keygenOutput = null; if (verboseStream != null) { keygenOutput = new IKeyGenOutput() { + @Override public void out(String message) { verboseStream.println(message); } + @Override public void err(String message) { verboseStream.println(message); } @@ -482,6 +488,7 @@ public final class ApkBuilder implements IArchiveBuilder { * @throws DuplicateFileException if a file conflicts with another already added to the APK * at the same location inside the APK archive. */ + @Override public void addFile(File file, String archivePath) throws ApkCreationException, SealedApkException, DuplicateFileException { if (mIsSealed) { diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java index 0004153..805b74a 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilderMain.java @@ -143,6 +143,7 @@ public final class ApkBuilderMain { for (File jarFile : jarFiles) { if (jarFile.isDirectory()) { String[] filenames = jarFile.list(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return PATTERN_JAR_EXT.matcher(name).matches(); } diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java index 0b9a261..78c069a 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdInfo.java @@ -288,6 +288,7 @@ public final class AvdInfo implements Comparable<AvdInfo> { * @return a negative integer, zero, or a positive integer as this object is * less than, equal to, or greater than the specified object. */ + @Override public int compareTo(AvdInfo o) { // first handle possible missing targets (if the AVD failed to load for unresolved targets) if (mTarget == null && o != null && o.mTarget == null) { diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java index ac899c4..f6610c0 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java @@ -899,6 +899,7 @@ public class AvdManager { if (folder.isDirectory()) { String[] list = folder.list(new FilenameFilter() { + @Override public boolean accept(File dir, String name) { return IMAGE_NAME_PATTERN.matcher(name).matches(); } @@ -1217,6 +1218,7 @@ public class AvdManager { } File[] avds = folder.listFiles(new FilenameFilter() { + @Override public boolean accept(File parent, String name) { if (INI_NAME_PATTERN.matcher(name).matches()) { // check it's a file and not a folder diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java index 385bd73..09bf3c9 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java @@ -20,9 +20,9 @@ import com.android.annotations.VisibleForTesting; import com.android.annotations.VisibleForTesting.Visibility;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
+import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SdkManager;
-import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os;
import com.android.sdklib.repository.PkgProps;
@@ -218,6 +218,7 @@ public class AddonPackage extends Package archiveOsPath);
}
+ @Override
public int getExactApiLevel() {
return mVersion.getApiLevel();
}
@@ -287,6 +288,7 @@ public class AddonPackage extends Package * <p/>
* An add-on has the same {@link AndroidVersion} as the platform it depends on.
*/
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
@@ -308,6 +310,7 @@ public class AddonPackage extends Package *
* @since sdk-addon-2.xsd
*/
+ @Override
public Pair<Integer, Integer> getLayoutlibVersion() {
return mLayoutlibVersion.getLayoutlibVersion();
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java index 62cc9a4..919a30e 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonsListFetcher.java @@ -260,12 +260,15 @@ public class AddonsListFetcher { // We don't want the default handler which prints errors to stderr.
builder.setErrorHandler(new ErrorHandler() {
+ @Override
public void warning(SAXParseException e) throws SAXException {
// pass
}
+ @Override
public void fatalError(SAXParseException e) throws SAXException {
throw e;
}
+ @Override
public void error(SAXParseException e) throws SAXException {
throw e;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java index f56d202..52d9221 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java @@ -343,6 +343,7 @@ public class Archive implements IDescription, Comparable<Archive> { /**
* Generates a short description for this archive.
*/
+ @Override
public String getShortDescription() {
return String.format("Archive for %1$s", getOsDescription());
}
@@ -350,6 +351,7 @@ public class Archive implements IDescription, Comparable<Archive> { /**
* Generates a longer description for this archive.
*/
+ @Override
public String getLongDescription() {
long size = getSize();
String sizeStr;
@@ -390,6 +392,7 @@ public class Archive implements IDescription, Comparable<Archive> { *
* @see Package#compareTo(Package)
*/
+ @Override
public int compareTo(Archive rhs) {
if (mPackage != null && rhs != null) {
return mPackage.compareTo(rhs.getParentPackage());
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java index 8ac0188..6dcd9bb 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ArchiveReplacement.java @@ -16,9 +16,6 @@ package com.android.sdklib.internal.repository;
-import com.android.sdklib.internal.repository.Archive;
-import com.android.sdklib.internal.repository.IDescription;
-import com.android.sdklib.internal.repository.Package;
/**
* Represents an archive that we want to install and the archive that it is
@@ -66,6 +63,7 @@ public class ArchiveReplacement implements IDescription { * Returns the long description of the parent package of the new archive, if not null.
* Otherwise returns an empty string.
*/
+ @Override
public String getLongDescription() {
if (mNewArchive != null) {
Package p = mNewArchive.getParentPackage();
@@ -80,6 +78,7 @@ public class ArchiveReplacement implements IDescription { * Returns the short description of the parent package of the new archive, if not null.
* Otherwise returns an empty string.
*/
+ @Override
public String getShortDescription() {
if (mNewArchive != null) {
Package p = mNewArchive.getParentPackage();
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java index a8236ea..3e6b2e9 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/BrokenPackage.java @@ -89,6 +89,7 @@ public class BrokenPackage extends Package * Returns the minimal API level required by this package, if > 0,
* or {@link #MIN_API_LEVEL_NOT_SPECIFIED} if there is no such requirement.
*/
+ @Override
public int getMinApiLevel() {
return mMinApiLevel;
}
@@ -97,6 +98,7 @@ public class BrokenPackage extends Package * Returns the exact API level required by this package, if > 0,
* or {@link #API_LEVEL_INVALID} if the value was missing.
*/
+ @Override
public int getExactApiLevel() {
return mExactApiLevel;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java index ee24d6e..a64d151 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java @@ -121,6 +121,7 @@ public class DocPackage extends Package implements IPackageVersion { * Returns the version, for platform, add-on and doc packages.
* Can be 0 if this is a local package of unknown api-level.
*/
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java index 698861a..4bcaa6d 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java @@ -254,6 +254,7 @@ public class ExtraPackage extends MinToolsPackage * Returns the minimal API level required by this extra package, if > 0,
* or {@link #MIN_API_LEVEL_NOT_SPECIFIED} if there is no such requirement.
*/
+ @Override
public int getMinApiLevel() {
return mMinApiLevel;
}
@@ -381,7 +382,7 @@ public class ExtraPackage extends MinToolsPackage if (name != null) {
name = name.replaceAll("[ _\t\f-]+", " ").trim(); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (name == null || name.length() == 0) { //$NON-NLS-1$
+ if (name == null || name.length() == 0) {
name = "Unkown Extra";
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java index 6cbf789..eb819d7 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LayoutlibVersionMixin.java @@ -95,6 +95,7 @@ public class LayoutlibVersionMixin implements ILayoutlibVersion { *
* @since sdk-repository-4.xsd and sdk-addon-2.xsd
*/
+ @Override
public Pair<Integer, Integer> getLayoutlibVersion() {
return mLayoutlibVersion;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java index 351a421..9a9f416 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/MinToolsPackage.java @@ -87,6 +87,7 @@ public abstract class MinToolsPackage extends Package implements IMinToolsDepend * The minimal revision of the tools package required by this extra package, if > 0,
* or {@link #MIN_TOOLS_REV_NOT_SPECIFIED} if there is no such requirement.
*/
+ @Override
public int getMinToolsRevision() {
return mMinToolsRevision;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java index 55049ca..ac40f57 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/NullTaskMonitor.java @@ -45,68 +45,83 @@ public class NullTaskMonitor implements ITaskMonitor { mLog = log;
}
+ @Override
public void setDescription(String format, Object...args) {
// pass
}
+ @Override
public void log(String format, Object...args) {
mLog.printf(format, args);
}
+ @Override
public void logError(String format, Object...args) {
mLog.error(null /*throwable*/, format, args);
}
+ @Override
public void logVerbose(String format, Object...args) {
mLog.printf(format, args);
}
+ @Override
public void setProgressMax(int max) {
// pass
}
+ @Override
public int getProgressMax() {
return 0;
}
+ @Override
public void incProgress(int delta) {
// pass
}
/** Always return 1. */
+ @Override
public int getProgress() {
return 1;
}
/** Always return false. */
+ @Override
public boolean isCancelRequested() {
return false;
}
+ @Override
public ITaskMonitor createSubMonitor(int tickCount) {
return this;
}
/** Always return false. */
+ @Override
public boolean displayPrompt(final String title, final String message) {
return false;
}
/** Always return null. */
+ @Override
public UserCredentials displayLoginCredentialsPrompt(String title, String message) {
return null;
}
// --- ISdkLog ---
+ @Override
public void error(Throwable t, String errorFormat, Object... args) {
mLog.error(t, errorFormat, args);
}
+ @Override
public void warning(String warningFormat, Object... args) {
mLog.warning(warningFormat, args);
}
+ @Override
public void printf(String msgFormat, Object... args) {
mLog.printf(msgFormat, args);
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java index 01f713a..2091cb7 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java @@ -447,12 +447,14 @@ public abstract class Package implements IDescription, Comparable<Package> { * Returns a short description for an {@link IDescription}.
* Can be empty but not null.
*/
+ @Override
public abstract String getShortDescription();
/**
* Returns a long description for an {@link IDescription}.
* Can be empty but not null.
*/
+ @Override
public String getLongDescription() {
StringBuilder sb = new StringBuilder();
@@ -622,6 +624,7 @@ public abstract class Package implements IDescription, Comparable<Package> { * <em>Important</em>: Derived classes should consider overriding {@link #comparisonKey()}
* instead of this method.
*/
+ @Override
public int compareTo(Package other) {
String s1 = this.comparisonKey();
String s2 = other.comparisonKey();
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java index 270007e..937a4b4 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java @@ -142,6 +142,7 @@ public class PlatformPackage extends MinToolsPackage implements IPackageVersion, }
/** Returns the package version, for platform, add-on and doc packages. */
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
@@ -168,6 +169,7 @@ public class PlatformPackage extends MinToolsPackage implements IPackageVersion, *
* @since sdk-repository-4.xsd
*/
+ @Override
public Pair<Integer, Integer> getLayoutlibVersion() {
return mLayoutlibVersion.getLayoutlibVersion();
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java index 002561e..0462a9d 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SamplePackage.java @@ -17,10 +17,10 @@ package com.android.sdklib.internal.repository;
import com.android.sdklib.AndroidVersion;
+import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SdkManager;
-import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os;
import com.android.sdklib.repository.PkgProps;
@@ -169,11 +169,13 @@ public class SamplePackage extends MinToolsPackage * Returns the minimal API level required by this extra package, if > 0,
* or {@link #MIN_API_LEVEL_NOT_SPECIFIED} if there is no such requirement.
*/
+ @Override
public int getMinApiLevel() {
return mMinApiLevel;
}
/** Returns the matching platform version. */
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java index 112cf49..f757bfb 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSource.java @@ -164,6 +164,7 @@ public abstract class SdkSource implements IDescription, Comparable<SdkSource> { * Implementation of the {@link Comparable} interface.
* Simply compares the URL using the string's default ordering.
*/
+ @Override
public int compareTo(SdkSource rhs) {
return this.getUrl().compareTo(rhs.getUrl());
}
@@ -222,6 +223,7 @@ public abstract class SdkSource implements IDescription, Comparable<SdkSource> { return super.toString();
}
+ @Override
public String getShortDescription() {
if (mUiName != null && mUiName.length() > 0) {
@@ -240,6 +242,7 @@ public abstract class SdkSource implements IDescription, Comparable<SdkSource> { return mUrl;
}
+ @Override
public String getLongDescription() {
// Note: in a normal workflow, mDescription is filled by setDefaultDescription().
// However for packages made by unit tests or such, this can be null.
@@ -664,12 +667,15 @@ public abstract class SdkSource implements IDescription, Comparable<SdkSource> { // We don't want the default handler which prints errors to stderr.
builder.setErrorHandler(new ErrorHandler() {
+ @Override
public void warning(SAXParseException e) throws SAXException {
// pass
}
+ @Override
public void fatalError(SAXParseException e) throws SAXException {
throw e;
}
+ @Override
public void error(SAXParseException e) throws SAXException {
throw e;
}
@@ -761,12 +767,15 @@ public abstract class SdkSource implements IDescription, Comparable<SdkSource> { // We don't want the default handler, which by default dumps errors to stderr.
validator.setErrorHandler(new ErrorHandler() {
+ @Override
public void warning(SAXParseException e) throws SAXException {
// pass
}
+ @Override
public void fatalError(SAXParseException e) throws SAXException {
throw e;
}
+ @Override
public void error(SAXParseException e) throws SAXException {
throw e;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java index 3afa086..546e991 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SdkSourceCategory.java @@ -75,10 +75,12 @@ public enum SdkSourceCategory implements IDescription { return mAlwaysDisplay;
}
+ @Override
public String getLongDescription() {
return getUiName();
}
+ @Override
public String getShortDescription() {
return getUiName();
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java index c33d949..ad92294 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java @@ -19,9 +19,9 @@ package com.android.sdklib.internal.repository; import com.android.annotations.VisibleForTesting;
import com.android.annotations.VisibleForTesting.Visibility;
import com.android.sdklib.AndroidVersion;
+import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SdkManager;
-import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os;
import com.android.sdklib.repository.SdkRepoConstants;
@@ -177,6 +177,7 @@ public class SourcePackage extends Package implements IPackageVersion { /**
* Returns the android version of this package.
*/
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java index 877a1d1..5457a35 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java @@ -19,10 +19,10 @@ package com.android.sdklib.internal.repository; import com.android.annotations.VisibleForTesting;
import com.android.annotations.VisibleForTesting.Visibility;
import com.android.sdklib.AndroidVersion;
+import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SdkManager;
import com.android.sdklib.SystemImage;
-import com.android.sdklib.AndroidVersion.AndroidVersionException;
import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os;
import com.android.sdklib.repository.PkgProps;
@@ -212,6 +212,7 @@ public class SystemImagePackage extends Package * <p/>
* A system-image has the same {@link AndroidVersion} as the platform it depends on.
*/
+ @Override
public AndroidVersion getVersion() {
return mVersion;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java index 8670378..ee7265f 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java @@ -150,6 +150,7 @@ public class ToolPackage extends Package implements IMinPlatformToolsDependency * <p/>
* This attribute is mandatory and should not be normally missing.
*/
+ @Override
public int getMinPlatformToolsRevision() {
return mMinPlatformToolsRevision;
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java index efab4ad..9f8d600 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java @@ -91,6 +91,7 @@ public class FileOp implements IFileOp { * Files that cannot be deleted right away are marked for deletion on exit.
* The argument can be null.
*/
+ @Override
public void deleteFileOrFolder(File fileOrFolder) {
if (fileOrFolder != null) {
if (isDirectory(fileOrFolder)) {
@@ -147,6 +148,7 @@ public class FileOp implements IFileOp { * @param file The file to set permissions on.
* @throws IOException If an I/O error occurs
*/
+ @Override
public void setExecutablePermission(File file) throws IOException {
if (sFileSetExecutable != null) {
@@ -175,6 +177,7 @@ public class FileOp implements IFileOp { * @throws FileNotFoundException if the source file doesn't exist.
* @throws IOException if there's a problem reading or writing the file.
*/
+ @Override
public void copyFile(File source, File dest) throws IOException {
byte[] buffer = new byte[8192];
@@ -215,6 +218,7 @@ public class FileOp implements IFileOp { * @throws FileNotFoundException if the source files don't exist.
* @throws IOException if there's a problem reading the files.
*/
+ @Override
public boolean isSameFile(File source, File destination) throws IOException {
if (source.length() != destination.length()) {
@@ -270,21 +274,25 @@ public class FileOp implements IFileOp { }
/** Invokes {@link File#isFile()} on the given {@code file}. */
+ @Override
public boolean isFile(File file) {
return file.isFile();
}
/** Invokes {@link File#isDirectory()} on the given {@code file}. */
+ @Override
public boolean isDirectory(File file) {
return file.isDirectory();
}
/** Invokes {@link File#exists()} on the given {@code file}. */
+ @Override
public boolean exists(File file) {
return file.exists();
}
/** Invokes {@link File#length()} on the given {@code file}. */
+ @Override
public long length(File file) {
return file.length();
}
@@ -293,26 +301,31 @@ public class FileOp implements IFileOp { * Invokes {@link File#delete()} on the given {@code file}.
* Note: for a recursive folder version, consider {@link #deleteFileOrFolder(File)}.
*/
+ @Override
public boolean delete(File file) {
return file.delete();
}
/** Invokes {@link File#mkdirs()} on the given {@code file}. */
+ @Override
public boolean mkdirs(File file) {
return file.mkdirs();
}
/** Invokes {@link File#listFiles()} on the given {@code file}. */
+ @Override
public File[] listFiles(File file) {
return file.listFiles();
}
/** Invokes {@link File#renameTo(File)} on the given files. */
+ @Override
public boolean renameTo(File oldFile, File newFile) {
return oldFile.renameTo(newFile);
}
/** Creates a new {@link FileOutputStream} for the given {@code file}. */
+ @Override
public OutputStream newFileOutputStream(File file) throws FileNotFoundException {
return new FileOutputStream(file);
}
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidXPathFactory.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidXPathFactory.java index 641cd81..8373d8a 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidXPathFactory.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/xml/AndroidXPathFactory.java @@ -60,6 +60,7 @@ public class AndroidXPathFactory { mAndroidPrefixes.add(mAndroidPrefix); } + @Override public String getNamespaceURI(String prefix) { if (prefix != null) { if (prefix.equals(mAndroidPrefix)) { @@ -70,6 +71,7 @@ public class AndroidXPathFactory { return XMLConstants.NULL_NS_URI; } + @Override public String getPrefix(String namespaceURI) { if (SdkConstants.NS_RESOURCES.equals(namespaceURI)) { return mAndroidPrefix; @@ -78,6 +80,7 @@ public class AndroidXPathFactory { return null; } + @Override public Iterator<?> getPrefixes(String namespaceURI) { if (SdkConstants.NS_RESOURCES.equals(namespaceURI)) { return mAndroidPrefixes.iterator(); diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java index f680909..ead66ee 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/build/DebugKeyProviderTest.java @@ -105,10 +105,12 @@ public class DebugKeyProviderTest extends TestCase { private String mOut = ""; //$NON-NLS-1$ private String mErr = ""; //$NON-NLS-1$ + @Override public void out(String message) { mOut += message + "\n"; //$NON-NLS-1$ } + @Override public void err(String message) { mErr += message + "\n"; //$NON-NLS-1$ } diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java index 3b742ac..cdf7bcc 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockAddonPackage.java @@ -19,9 +19,9 @@ package com.android.sdklib.internal.repository; import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.ISystemImage;
+import com.android.sdklib.ISystemImage.LocationType;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SystemImage;
-import com.android.sdklib.ISystemImage.LocationType;
import com.android.sdklib.io.FileOp;
import java.util.Map;
@@ -80,26 +80,32 @@ public class MockAddonPackage extends AddonPackage { mRevision = revision;
}
+ @Override
public String getClasspathName() {
return getName();
}
+ @Override
public String getShortClasspathName() {
return getName();
}
+ @Override
public String getDefaultSkin() {
return null;
}
+ @Override
public String getDescription() {
return getName();
}
+ @Override
public String getFullName() {
return getName();
}
+ @Override
public ISystemImage[] getSystemImages() {
if (mSystemImages == null) {
SystemImage si = new SystemImage(
@@ -111,6 +117,7 @@ public class MockAddonPackage extends AddonPackage { return mSystemImages;
}
+ @Override
public ISystemImage getSystemImage(String abiType) {
if (SdkConstants.ABI_ARMEABI.equals(abiType)) {
return getSystemImages()[0];
@@ -118,87 +125,108 @@ public class MockAddonPackage extends AddonPackage { return null;
}
+ @Override
public String getLocation() {
return "/sdk/add-ons/addon-" + mName;
}
+ @Override
public IOptionalLibrary[] getOptionalLibraries() {
return null;
}
+ @Override
public IAndroidTarget getParent() {
return mParentTarget;
}
+ @Override
public String getPath(int pathId) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public String[] getPlatformLibraries() {
return null;
}
+ @Override
public String getProperty(String name) {
return null;
}
+ @Override
public Integer getProperty(String name, Integer defaultValue) {
return defaultValue;
}
+ @Override
public Boolean getProperty(String name, Boolean defaultValue) {
return defaultValue;
}
+ @Override
public Map<String, String> getProperties() {
return null;
}
+ @Override
public int getRevision() {
return mRevision;
}
+ @Override
public String[] getSkins() {
return null;
}
+ @Override
public int getUsbVendorId() {
return 0;
}
+ @Override
public AndroidVersion getVersion() {
return mParentTarget.getVersion();
}
+ @Override
public String getName() {
return mName;
}
+ @Override
public String getVendor() {
return mParentTarget.getVendor();
}
+ @Override
public String getVersionName() {
return String.format("mock-addon-%1$d", getVersion().getApiLevel());
}
+ @Override
public String hashString() {
return getVersionName();
}
/** Returns false for an addon. */
+ @Override
public boolean isPlatform() {
return false;
}
+ @Override
public boolean canRunOn(IAndroidTarget target) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public int compareTo(IAndroidTarget o) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public boolean hasRenderingLibrary() {
return false;
}
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java index 30c03bc..42ba916 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockMonitor.java @@ -44,57 +44,72 @@ public class MockMonitor implements ITaskMonitor { return mCapturedDescriptions;
}
+ @Override
public void log(String format, Object... args) {
mCapturedLog += String.format(format, args) + "\n"; //$NON-NLS-1$
}
+ @Override
public void logError(String format, Object... args) {
mCapturedErrorLog += String.format(format, args) + "\n"; //$NON-NLS-1$
}
+ @Override
public void logVerbose(String format, Object... args) {
mCapturedVerboseLog += String.format(format, args) + "\n"; //$NON-NLS-1$
}
+ @Override
public void setProgressMax(int max) {
}
+ @Override
public int getProgressMax() {
return 0;
}
+ @Override
public void setDescription(String format, Object... args) {
mCapturedDescriptions += String.format(format, args) + "\n"; //$NON-NLS-1$
}
+ @Override
public boolean isCancelRequested() {
return false;
}
+ @Override
public void incProgress(int delta) {
}
+ @Override
public int getProgress() {
return 0;
}
+ @Override
public boolean displayPrompt(String title, String message) {
return false;
}
+ @Override
public ITaskMonitor createSubMonitor(int tickCount) {
return null;
}
+ @Override
public void error(Throwable t, String errorFormat, Object... args) {
}
+ @Override
public void printf(String msgFormat, Object... args) {
}
+ @Override
public void warning(String warningFormat, Object... args) {
}
+ @Override
public UserCredentials displayLoginCredentialsPrompt(String title, String message) {
return null;
}
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java index 28026ed..903a276 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockPlatformTarget.java @@ -19,9 +19,9 @@ package com.android.sdklib.internal.repository; import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.ISystemImage;
+import com.android.sdklib.ISystemImage.LocationType;
import com.android.sdklib.SdkConstants;
import com.android.sdklib.SystemImage;
-import com.android.sdklib.ISystemImage.LocationType;
import com.android.sdklib.io.FileOp;
import java.util.Map;
@@ -41,26 +41,32 @@ class MockPlatformTarget implements IAndroidTarget { mRevision = revision;
}
+ @Override
public String getClasspathName() {
return getName();
}
+ @Override
public String getShortClasspathName() {
return getName();
}
+ @Override
public String getDefaultSkin() {
return null;
}
+ @Override
public String getDescription() {
return getName();
}
+ @Override
public String getFullName() {
return getName();
}
+ @Override
public ISystemImage[] getSystemImages() {
if (mSystemImages == null) {
SystemImage si = new SystemImage(
@@ -72,6 +78,7 @@ class MockPlatformTarget implements IAndroidTarget { return mSystemImages;
}
+ @Override
public ISystemImage getSystemImage(String abiType) {
if (SdkConstants.ABI_ARMEABI.equals(abiType)) {
return getSystemImages()[0];
@@ -79,50 +86,62 @@ class MockPlatformTarget implements IAndroidTarget { return null;
}
+ @Override
public String getLocation() {
return "/sdk/platforms/android-" + getVersion().getApiString();
}
+ @Override
public IOptionalLibrary[] getOptionalLibraries() {
return null;
}
+ @Override
public IAndroidTarget getParent() {
return null;
}
+ @Override
public String getPath(int pathId) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public String[] getPlatformLibraries() {
return null;
}
+ @Override
public String getProperty(String name) {
return null;
}
+ @Override
public Integer getProperty(String name, Integer defaultValue) {
return defaultValue;
}
+ @Override
public Boolean getProperty(String name, Boolean defaultValue) {
return defaultValue;
}
+ @Override
public Map<String, String> getProperties() {
return null;
}
+ @Override
public int getRevision() {
return mRevision;
}
+ @Override
public String[] getSkins() {
return null;
}
+ @Override
public int getUsbVendorId() {
return 0;
}
@@ -132,6 +151,7 @@ class MockPlatformTarget implements IAndroidTarget { * This works well in Unit Tests where we'll typically have different
* platforms as unique identifiers.
*/
+ @Override
public String getVendor() {
return "vendor " + Integer.toString(mApiLevel);
}
@@ -139,35 +159,43 @@ class MockPlatformTarget implements IAndroidTarget { /**
* Create a synthetic name using the target API level.
*/
+ @Override
public String getName() {
return "platform r" + Integer.toString(mApiLevel);
}
+ @Override
public AndroidVersion getVersion() {
return new AndroidVersion(mApiLevel, null /*codename*/);
}
+ @Override
public String getVersionName() {
return String.format("android-%1$d", mApiLevel);
}
+ @Override
public String hashString() {
return getVersionName();
}
/** Returns true for a platform. */
+ @Override
public boolean isPlatform() {
return true;
}
+ @Override
public boolean canRunOn(IAndroidTarget target) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public int compareTo(IAndroidTarget o) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
+ @Override
public boolean hasRenderingLibrary() {
return false;
}
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java index 564dfed..bd784e4 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SdkRepoSourceTest.java @@ -57,14 +57,17 @@ public class SdkRepoSourceTest extends TestCase { final StringBuilder output = new StringBuilder();
Document doc = super.findAlternateToolsXml(xml, new ErrorHandler() {
+ @Override
public void warning(SAXParseException exception) throws SAXException {
output.append("WARN: " + exception.getMessage()).append('\n');
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
output.append("FATAL: " + exception.getMessage()).append('\n');
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
output.append("ERROR: " + exception.getMessage()).append('\n');
}
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java index 7e2e94c..c4d4254 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/io/MockFileOp.java @@ -151,6 +151,7 @@ public class MockFileOp implements IFileOp { * Files that cannot be deleted right away are marked for deletion on exit.
* The argument can be null.
*/
+ @Override
public void deleteFileOrFolder(File fileOrFolder) {
if (fileOrFolder != null) {
if (isDirectory(fileOrFolder)) {
@@ -176,6 +177,7 @@ public class MockFileOp implements IFileOp { * @param file The file to set permissions on.
* @throws IOException If an I/O error occurs
*/
+ @Override
public void setExecutablePermission(File file) throws IOException {
// pass
}
@@ -188,6 +190,7 @@ public class MockFileOp implements IFileOp { * @throws FileNotFoundException if the source file doesn't exist.
* @throws IOException if there's a problem reading or writing the file.
*/
+ @Override
public void copyFile(File source, File dest) throws IOException {
// pass
}
@@ -200,17 +203,20 @@ public class MockFileOp implements IFileOp { * @throws FileNotFoundException if the source files don't exist.
* @throws IOException if there's a problem reading the files.
*/
+ @Override
public boolean isSameFile(File source, File destination) throws IOException {
throw new UnsupportedOperationException("MockFileUtils.isSameFile is not supported."); //$NON-NLS-1$
}
/** Invokes {@link File#isFile()} on the given {@code file}. */
+ @Override
public boolean isFile(File file) {
String path = getAgnosticAbsPath(file);
return mExistinfFiles.contains(path);
}
/** Invokes {@link File#isDirectory()} on the given {@code file}. */
+ @Override
public boolean isDirectory(File file) {
String path = getAgnosticAbsPath(file);
if (mExistinfFolders.contains(path)) {
@@ -238,15 +244,18 @@ public class MockFileOp implements IFileOp { }
/** Invokes {@link File#exists()} on the given {@code file}. */
+ @Override
public boolean exists(File file) {
return isFile(file) || isDirectory(file);
}
/** Invokes {@link File#length()} on the given {@code file}. */
+ @Override
public long length(File file) {
throw new UnsupportedOperationException("MockFileUtils.length is not supported."); //$NON-NLS-1$
}
+ @Override
public boolean delete(File file) {
String path = getAgnosticAbsPath(file);
@@ -276,6 +285,7 @@ public class MockFileOp implements IFileOp { }
/** Invokes {@link File#mkdirs()} on the given {@code file}. */
+ @Override
public boolean mkdirs(File file) {
for (; file != null; file = file.getParentFile()) {
String path = getAgnosticAbsPath(file);
@@ -288,6 +298,7 @@ public class MockFileOp implements IFileOp { * Invokes {@link File#listFiles()} on the given {@code file}.
* The returned list is sorted by alphabetic absolute path string.
*/
+ @Override
public File[] listFiles(File file) {
TreeSet<File> files = new TreeSet<File>();
@@ -310,6 +321,7 @@ public class MockFileOp implements IFileOp { }
/** Invokes {@link File#renameTo(File)} on the given files. */
+ @Override
public boolean renameTo(File oldFile, File newFile) {
boolean renamed = false;
@@ -352,6 +364,7 @@ public class MockFileOp implements IFileOp { * Returns an OutputStream that will capture the bytes written and associate
* them with the given file.
*/
+ @Override
public OutputStream newFileOutputStream(File file) throws FileNotFoundException {
StringOutputStream os = new StringOutputStream(file);
mOutputStreams.add(os);
diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java index 3ef0140..937a648 100644 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/mock/MockLog.java @@ -33,14 +33,17 @@ public class MockLog implements ISdkLog { mMessages.add(new Formatter().format(code + format, args).toString()); } + @Override public void warning(String format, Object... args) { add("W ", format, args); } + @Override public void printf(String format, Object... args) { add("P ", format, args); } + @Override public void error(Throwable t, String format, Object... args) { if (t != null) { add("T", "%s", t.toString()); diff --git a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java index 2e63f9a..b3315c3 100755 --- a/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java +++ b/sdkmanager/libs/sdklib/tests/src/com/android/sdklib/repository/CaptureErrorHandler.java @@ -56,6 +56,7 @@ class CaptureErrorHandler implements ErrorHandler { /**
* @throws SAXException
*/
+ @Override
public void error(SAXParseException ex) throws SAXException {
mErrors += "Error: " + ex.getMessage() + "\n";
}
@@ -63,6 +64,7 @@ class CaptureErrorHandler implements ErrorHandler { /**
* @throws SAXException
*/
+ @Override
public void fatalError(SAXParseException ex) throws SAXException {
mErrors += "Fatal Error: " + ex.getMessage() + "\n";
}
@@ -70,6 +72,7 @@ class CaptureErrorHandler implements ErrorHandler { /**
* @throws SAXException
*/
+ @Override
public void warning(SAXParseException ex) throws SAXException {
mWarnings += "Warning: " + ex.getMessage() + "\n";
}
diff --git a/sdkmanager/libs/sdkuilib/.settings/org.eclipse.jdt.core.prefs b/sdkmanager/libs/sdkuilib/.settings/org.eclipse.jdt.core.prefs index e755df2..9c7cb00 100644 --- a/sdkmanager/libs/sdkuilib/.settings/org.eclipse.jdt.core.prefs +++ b/sdkmanager/libs/sdkuilib/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,14 @@ -#Thu Jun 09 12:26:44 PDT 2011 +#Tue Dec 20 16:31:10 PST 2011 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -9,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -69,3 +78,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java index 88c27c4..d98af7e 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/ArchiveInfo.java @@ -150,6 +150,7 @@ class ArchiveInfo extends ArchiveReplacement implements Comparable<ArchiveInfo> *
* @see Archive#compareTo(Archive)
*/
+ @Override
public int compareTo(ArchiveInfo rhs) {
if (getNewArchive() != null && rhs != null) {
return getNewArchive().compareTo(rhs.getNewArchive());
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/MenuBarWrapper.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/MenuBarWrapper.java index 51c7899..f7bd97f 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/MenuBarWrapper.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/MenuBarWrapper.java @@ -35,14 +35,17 @@ public abstract class MenuBarWrapper { public MenuBarWrapper(String appName, Menu menu) {
MenuBarEnhancer.setupMenu(appName, menu, new IMenuBarCallback() {
+ @Override
public void onPreferencesMenuSelected() {
MenuBarWrapper.this.onPreferencesMenuSelected();
}
+ @Override
public void onAboutMenuSelected() {
MenuBarWrapper.this.onAboutMenuSelected();
}
+ @Override
public void printError(String format, Object... args) {
MenuBarWrapper.this.printError(format, args);
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java index 65c3e59..8577da4 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterChooserDialog.java @@ -739,14 +739,17 @@ final class SdkUpdaterChooserDialog extends GridDialog { private class NewArchivesContentProvider implements IStructuredContentProvider {
+ @Override
public void dispose() {
// pass
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// Ignore. The input is always mArchives
}
+ @Override
public Object[] getElements(Object inputElement) {
return mArchives.toArray();
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java index 60c0909..4f35b26 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterLogic.java @@ -1270,6 +1270,7 @@ class SdkUpdaterLogic { final boolean forceHttp = mUpdaterData.getSettingsController().getForceHttp();
mUpdaterData.getTaskFactory().start("Refresh Sources", new ITask() {
+ @Override
public void run(ITaskMonitor monitor) {
for (SdkSource remoteSrc : remoteSources) {
Package[] pkgs = remoteSrc.getPackages();
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java index 26dd5c5..7b94c94 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterNoWindow.java @@ -155,10 +155,12 @@ public class SdkUpdaterNoWindow { * provides {@link ConsoleTaskMonitor} objects. */ private class ConsoleTaskFactory implements ITaskFactory { + @Override public void start(String title, ITask task) { start(title, null /*parentMonitor*/, task); } + @Override public void start(String title, ITaskMonitor parentMonitor, ITask task) { if (parentMonitor == null) { task.run(new ConsoleTaskMonitor(title, task)); @@ -205,6 +207,7 @@ public class SdkUpdaterNoWindow { /** * Sets the description in the current task dialog. */ + @Override public void setDescription(String format, Object...args) { String last = mLastDesc; @@ -241,28 +244,34 @@ public class SdkUpdaterNoWindow { mSdkLog.printf("%s", line); //$NON-NLS-1$ } + @Override public void log(String format, Object...args) { setDescription(" " + format, args); //$NON-NLS-1$ } + @Override public void logError(String format, Object...args) { setDescription(format, args); } + @Override public void logVerbose(String format, Object...args) { // The ConsoleTask does not display verbose log messages. } // --- ISdkLog --- + @Override public void error(Throwable t, String errorFormat, Object... args) { mSdkLog.error(t, errorFormat, args); } + @Override public void warning(String warningFormat, Object... args) { mSdkLog.warning(warningFormat, args); } + @Override public void printf(String msgFormat, Object... args) { mSdkLog.printf(msgFormat, args); } @@ -274,6 +283,7 @@ public class SdkUpdaterNoWindow { * *after* {@link #incProgress(int)}: we don't try to adjust it on the * fly. */ + @Override public void setProgressMax(int max) { assert max > 0; // Always set the dialog's progress max to 10k since it only handles @@ -283,6 +293,7 @@ public class SdkUpdaterNoWindow { assert mIncCoef > 0; } + @Override public int getProgressMax() { return mIncCoef > 0 ? (int) (MAX_COUNT / mIncCoef) : 0; } @@ -290,6 +301,7 @@ public class SdkUpdaterNoWindow { /** * Increments the current value of the progress bar. */ + @Override public void incProgress(int delta) { if (delta > 0 && mIncCoef > 0) { internalIncProgress(delta * mIncCoef); @@ -308,6 +320,7 @@ public class SdkUpdaterNoWindow { * Returns the current value of the progress bar, * between 0 and up to {@link #setProgressMax(int)} - 1. */ + @Override public int getProgress() { assert mIncCoef > 0; return mIncCoef > 0 ? (int)(mValue / mIncCoef) : 0; @@ -316,6 +329,7 @@ public class SdkUpdaterNoWindow { /** * Returns true if the "Cancel" button was selected. */ + @Override public boolean isCancelRequested() { return false; } @@ -330,6 +344,7 @@ public class SdkUpdaterNoWindow { * @param message The error message * @return true if YES was clicked. */ + @Override public boolean displayPrompt(final String title, final String message) { // TODO Make it interactive if mForce==false mSdkLog.printf("\n%s\n%s\n[y/n] => %s\n", @@ -363,6 +378,7 @@ public class SdkUpdaterNoWindow { * be filled with empty strings. * @see ITaskMonitor#displayLoginCredentialsPrompt(String, String) */ + @Override public UserCredentials displayLoginCredentialsPrompt(String title, String message) { String login = ""; //$NON-NLS-1$ String password = ""; //$NON-NLS-1$ @@ -422,6 +438,7 @@ public class SdkUpdaterNoWindow { * Creates a sub-monitor that will use up to tickCount on the progress bar. * tickCount must be 1 or more. */ + @Override public ITaskMonitor createSubMonitor(int tickCount) { assert mIncCoef > 0; assert tickCount > 0; @@ -462,47 +479,57 @@ public class SdkUpdaterNoWindow { mSubValue = start; } + @Override public boolean isCancelRequested() { return mRoot.isCancelRequested(); } + @Override public void setDescription(String format, Object... args) { mRoot.setDescription(format, args); } + @Override public void log(String format, Object... args) { mRoot.log(format, args); } + @Override public void logError(String format, Object... args) { mRoot.logError(format, args); } + @Override public void logVerbose(String format, Object... args) { mRoot.logVerbose(format, args); } + @Override public void setProgressMax(int max) { assert max > 0; mSubCoef = max > 0 ? mSpan / max : 0; assert mSubCoef > 0; } + @Override public int getProgressMax() { return mSubCoef > 0 ? (int) (mSpan / mSubCoef) : 0; } + @Override public int getProgress() { assert mSubCoef > 0; return mSubCoef > 0 ? (int)((mSubValue - mStart) / mSubCoef) : 0; } + @Override public void incProgress(int delta) { if (delta > 0 && mSubCoef > 0) { subIncProgress(delta * mSubCoef); } } + @Override public void subIncProgress(double realDelta) { mSubValue += realDelta; if (mParent != null) { @@ -512,14 +539,17 @@ public class SdkUpdaterNoWindow { } } + @Override public boolean displayPrompt(String title, String message) { return mRoot.displayPrompt(title, message); } + @Override public UserCredentials displayLoginCredentialsPrompt(String title, String message) { return mRoot.displayLoginCredentialsPrompt(title, message); } + @Override public ITaskMonitor createSubMonitor(int tickCount) { assert mSubCoef > 0; assert tickCount > 0; @@ -531,14 +561,17 @@ public class SdkUpdaterNoWindow { // --- ISdkLog --- + @Override public void error(Throwable t, String errorFormat, Object... args) { mRoot.error(t, errorFormat, args); } + @Override public void warning(String warningFormat, Object... args) { mRoot.warning(warningFormat, args); } + @Override public void printf(String msgFormat, Object... args) { mRoot.printf(msgFormat, args); } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java index 449e6e3..672feed 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java @@ -147,6 +147,7 @@ public class SettingsController { settingsPage.loadSettings(mProperties);
settingsPage.setOnSettingsChanged(new ISettingsPage.SettingsChangedCallback() {
+ @Override
public void onSettingsChanged(ISettingsPage page) {
SettingsController.this.onSettingsChanged();
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index 0a89585..4f39b71 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -130,6 +130,7 @@ public class UpdaterData implements IUpdaterData { mTaskFactory = taskFactory;
}
+ @Override
public ITaskFactory getTaskFactory() {
return mTaskFactory;
}
@@ -142,6 +143,7 @@ public class UpdaterData implements IUpdaterData { return mLocalSdkParser;
}
+ @Override
public ISdkLog getSdkLog() {
return mSdkLog;
}
@@ -150,18 +152,22 @@ public class UpdaterData implements IUpdaterData { mImageFactory = imageFactory;
}
+ @Override
public ImageFactory getImageFactory() {
return mImageFactory;
}
+ @Override
public SdkManager getSdkManager() {
return mSdkManager;
}
+ @Override
public AvdManager getAvdManager() {
return mAvdManager;
}
+ @Override
public SettingsController getSettingsController() {
return mSettingsController;
}
@@ -182,6 +188,7 @@ public class UpdaterData implements IUpdaterData { mWindowShell = windowShell;
}
+ @Override
public Shell getWindowShell() {
return mWindowShell;
}
@@ -366,6 +373,7 @@ public class UpdaterData implements IUpdaterData { Collections.sort(archives, new InstallOrderComparator());
mTaskFactory.start("Installing Archives", new ITask() {
+ @Override
public void run(ITaskMonitor monitor) {
final int progressPerArchive = 2 * ArchiveInstaller.NUM_MONITOR_INC;
@@ -535,6 +543,7 @@ public class UpdaterData implements IUpdaterData { private final Map<ArchiveInfo, Integer> mOrders = new HashMap<ArchiveInfo, Integer>();
+ @Override
public int compare(ArchiveInfo o1, ArchiveInfo o2) {
int n1 = getDependencyOrder(o1);
int n2 = getDependencyOrder(o2);
@@ -589,6 +598,7 @@ public class UpdaterData implements IUpdaterData { final Shell shell = getWindowShell();
if (shell != null && !shell.isDisposed()) {
shell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!shell.isDisposed()) {
canRestart[0] = MessageDialog.openQuestion(shell,
@@ -630,6 +640,7 @@ public class UpdaterData implements IUpdaterData { final Shell shell = getWindowShell();
if (msg2 != null && shell != null && !shell.isDisposed()) {
shell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!shell.isDisposed()) {
MessageDialog.openInformation(shell,
@@ -977,6 +988,7 @@ public class UpdaterData implements IUpdaterData { final boolean forceHttp = getSettingsController().getForceHttp();
mTaskFactory.start("Refresh Sources", new ITask() {
+ @Override
public void run(ITaskMonitor monitor) {
if (mStateFetchRemoteAddonsList <= 0) {
@@ -1008,6 +1020,7 @@ public class UpdaterData implements IUpdaterData { }
mTaskFactory.start("Load Add-ons List", monitor, new ITask() {
+ @Override
public void run(ITaskMonitor subMonitor) {
loadRemoteAddonsListInTask(subMonitor);
}
@@ -1063,6 +1076,7 @@ public class UpdaterData implements IUpdaterData { public void broadcastOnSdkLoaded() {
if (mWindowShell != null && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
for (ISdkChangeListener listener : mListeners) {
try {
@@ -1083,6 +1097,7 @@ public class UpdaterData implements IUpdaterData { private void broadcastOnSdkReload() {
if (mWindowShell != null && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
for (ISdkChangeListener listener : mListeners) {
try {
@@ -1103,6 +1118,7 @@ public class UpdaterData implements IUpdaterData { private void broadcastPreInstallHook() {
if (mWindowShell != null && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
for (ISdkChangeListener listener : mListeners) {
try {
@@ -1123,6 +1139,7 @@ public class UpdaterData implements IUpdaterData { private void broadcastPostInstallHook() {
if (mWindowShell != null && mListeners.size() > 0) {
mWindowShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
for (ISdkChangeListener listener : mListeners) {
try {
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman1/AvdManagerPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman1/AvdManagerPage.java index 56fda08..84a549b 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman1/AvdManagerPage.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman1/AvdManagerPage.java @@ -100,18 +100,22 @@ public class AvdManagerPage extends UpdaterPage implements ISdkChangeListener { // --- Implementation of ISdkChangeListener ---
+ @Override
public void onSdkLoaded() {
onSdkReload();
}
+ @Override
public void onSdkReload() {
mAvdSelector.refresh(false /*reload*/);
}
+ @Override
public void preInstallHook() {
// nothing to be done for now.
}
+ @Override
public void postInstallHook() {
// nothing to be done for now.
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java index 48cf9f7..a600ad3 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AddonSitesDialog.java @@ -108,6 +108,7 @@ public class AddonSitesDialog extends SwtBaseDialog { mTableViewer = new TableViewer(shell, SWT.BORDER | SWT.FULL_SELECTION); mTableViewer.addPostSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { on_TableViewer_selectionChanged(event); } @@ -224,6 +225,7 @@ public class AddonSitesDialog extends SwtBaseDialog { msg, initialValue, new IInputValidator() { + @Override public String isValid(String newText) { newText = newText == null ? null : newText.trim(); @@ -360,14 +362,17 @@ public class AddonSitesDialog extends SwtBaseDialog { private static class SourcesContentProvider implements IStructuredContentProvider { + @Override public void dispose() { // pass } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // pass } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof SdkSource[]) { return (Object[]) inputElement; diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java index 6e7c611..ca1159d 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java @@ -45,8 +45,8 @@ import org.eclipse.swt.widgets.Shell; import java.io.File;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
/**
* This is a private implementation of UpdateWindow for ADT,
@@ -229,6 +229,7 @@ public class AdtUpdateDialog extends SwtBaseDialog { mPackageMananger.loadPackagesWithInstallTask(
mPackageFilter.installFlags(),
new IAutoInstallTask() {
+ @Override
public Package[] filterLoadedSource(SdkSource source, Package[] packages) {
for (Package pkg : packages) {
mPackageFilter.visit(pkg);
@@ -236,17 +237,20 @@ public class AdtUpdateDialog extends SwtBaseDialog { return packages;
}
+ @Override
public boolean acceptPackage(Package pkg) {
// Is this the package we want to install?
return mPackageFilter.accept(pkg);
}
+ @Override
public void setResult(boolean success, Map<Package, File> installPaths) {
// Capture the result from the installation.
mResultCode = Boolean.valueOf(success);
mResultPaths = installPaths;
}
+ @Override
public void taskCompleted() {
// We can close that window now.
close();
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java index 61f0140..23fde3f 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java @@ -28,9 +28,9 @@ import com.android.sdkuilib.internal.repository.UpdaterPage; import com.android.sdkuilib.internal.repository.UpdaterPage.Purpose;
import com.android.sdkuilib.internal.repository.icons.ImageFactory;
import com.android.sdkuilib.internal.repository.sdkman1.AvdManagerPage;
+import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
import com.android.sdkuilib.repository.ISdkChangeListener;
import com.android.sdkuilib.repository.SdkUpdaterWindow;
-import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
import com.android.sdkuilib.ui.GridDataBuilder;
import com.android.sdkuilib.ui.GridLayoutBuilder;
import com.android.sdkuilib.ui.SwtBaseDialog;
@@ -159,6 +159,7 @@ public class AvdManagerWindowImpl1 { mShell = new Shell(mParentShell, style);
mShell.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
ShellSizeAndPos.saveSizeAndPos(mShell, SIZE_POS_PREFIX);
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java index d2de5f9..3e6cc3d 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/LogWindow.java @@ -197,8 +197,10 @@ class LogWindow implements ILogUiProvider { * Sets the description in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setDescription(final String description) {
syncExec(mLogDescription, new Runnable() {
+ @Override
public void run() {
mLogDescription.setText(description);
@@ -217,9 +219,11 @@ class LogWindow implements ILogUiProvider { * Logs a "normal" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void log(final String log) {
if (acceptLog(log, false /*isDescription*/)) {
syncExec(mLogDescription, new Runnable() {
+ @Override
public void run() {
appendLine(TextStyle.DEFAULT, log);
}
@@ -235,9 +239,11 @@ class LogWindow implements ILogUiProvider { * Logs an "error" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logError(final String log) {
if (acceptLog(log, false /*isDescription*/)) {
syncExec(mLogDescription, new Runnable() {
+ @Override
public void run() {
appendLine(TextStyle.ERROR, log);
}
@@ -254,9 +260,11 @@ class LogWindow implements ILogUiProvider { * not that useful for the end-user and might be hidden until explicitly shown.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logVerbose(final String log) {
if (acceptLog(log, false /*isDescription*/)) {
syncExec(mLogDescription, new Runnable() {
+ @Override
public void run() {
appendLine(TextStyle.DEFAULT, " " + log); //$NON-NLS-1$
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java index fdef221..af7ce2c 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackageLoader.java @@ -21,8 +21,8 @@ import com.android.sdklib.internal.repository.ITask; import com.android.sdklib.internal.repository.ITaskMonitor; import com.android.sdklib.internal.repository.NullTaskMonitor; import com.android.sdklib.internal.repository.Package; -import com.android.sdklib.internal.repository.SdkSource; import com.android.sdklib.internal.repository.Package.UpdateInfo; +import com.android.sdklib.internal.repository.SdkSource; import com.android.sdkuilib.internal.repository.UpdaterData; import org.eclipse.swt.widgets.Display; @@ -151,6 +151,7 @@ class PackageLoader { } mUpdaterData.getTaskFactory().start("Loading Sources", new ITask() { + @Override public void run(ITaskMonitor monitor) { monitor.setProgressMax(10); @@ -239,6 +240,7 @@ class PackageLoader { List<Archive> mArchivesToInstall = new ArrayList<Archive>(); Map<Package, File> mInstallPaths = new HashMap<Package, File>(); + @Override public boolean onUpdateSource(SdkSource source, Package[] packages) { packages = installTask.filterLoadedSource(source, packages); if (packages == null || packages.length == 0) { @@ -277,6 +279,7 @@ class PackageLoader { return true; } + @Override public void onLoadCompleted() { if (!mArchivesToInstall.isEmpty()) { installArchives(mArchivesToInstall); @@ -306,6 +309,7 @@ class PackageLoader { Shell shell = mUpdaterData.getWindowShell(); if (shell != null && !shell.isDisposed()) { shell.getDisplay().syncExec(new Runnable() {; + @Override public void run() { List<Archive> archives = mUpdaterData.updateOrInstallAll_WithGUI( diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java index beef56f..e72c128 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java @@ -686,6 +686,7 @@ class PackagesDiffLogic { synchronized (getCategories()) { Collections.sort(getCategories(), new Comparator<PkgCategory>() { + @Override public int compare(PkgCategory cat1, PkgCategory cat2) { assert cat1 instanceof PkgCategoryApi; assert cat2 instanceof PkgCategoryApi; @@ -781,6 +782,7 @@ class PackagesDiffLogic { synchronized (getCategories()) { Collections.sort(getCategories(), new Comparator<PkgCategory>() { + @Override public int compare(PkgCategory cat1, PkgCategory cat2) { assert cat1 instanceof PkgCategorySource; assert cat2 instanceof PkgCategorySource; diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java index c3b3568..58d7daa 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java @@ -173,6 +173,7 @@ public class PackagesPage extends UpdaterPage postCreate(); //$hide$ } + @Override public void onPageSelected() { List<PkgCategory> cats = mDiffLogic.getCategories(isSortByApi()); if (cats == null || cats.isEmpty()) { @@ -210,12 +211,14 @@ public class PackagesPage extends UpdaterPage }); mTreeViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { onTreeCheckStateChanged(event); //$hide$ } }); mTreeViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { onTreeDoubleClick(event); //$hide$ } @@ -539,6 +542,7 @@ public class PackagesPage extends UpdaterPage mTreeFontItalic = new Font(mTree.getDisplay(), fontData); mTree.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { mTreeFontItalic.dispose(); mTreeFontItalic = null; @@ -593,6 +597,7 @@ public class PackagesPage extends UpdaterPage mDiffLogic.updateStart(); mDiffLogic.getPackageLoader().loadPackages(new ISourceLoadedCallback() { + @Override public boolean onUpdateSource(SdkSource source, Package[] newPackages) { // This runs in a thread and must not access UI directly. final boolean changed = mDiffLogic.updateSourcePackages( @@ -600,6 +605,7 @@ public class PackagesPage extends UpdaterPage if (!mGroupPackages.isDisposed()) { mGroupPackages.getDisplay().syncExec(new Runnable() { + @Override public void run() { if (changed || mTreeViewer.getInput() != mDiffLogic.getCategories(isSortByApi())) { @@ -615,12 +621,14 @@ public class PackagesPage extends UpdaterPage return !mGroupPackages.isDisposed(); } + @Override public void onLoadCompleted() { // This runs in a thread and must not access UI directly. final boolean changed = mDiffLogic.updateEnd(displaySortByApi); if (!mGroupPackages.isDisposed()) { mGroupPackages.getDisplay().syncExec(new Runnable() { + @Override public void run() { if (changed || mTreeViewer.getInput() != mDiffLogic.getCategories(isSortByApi())) { @@ -1152,6 +1160,7 @@ public class PackagesPage extends UpdaterPage beginOperationPending(); mUpdaterData.getTaskFactory().start("Delete Package", new ITask() { + @Override public void run(ITaskMonitor monitor) { monitor.setProgressMax(archives.size() + 1); for (Archive a : archives) { @@ -1532,6 +1541,7 @@ public class PackagesPage extends UpdaterPage // -- ITableFontProvider + @Override public Font getFont(Object element, int columnIndex) { if (element instanceof PkgItem) { if (((PkgItem) element).getState() == PkgState.NEW) { @@ -1586,6 +1596,7 @@ public class PackagesPage extends UpdaterPage private class PkgContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof ArrayList<?>) { return ((ArrayList<?>) parentElement).toArray(); @@ -1616,6 +1627,7 @@ public class PackagesPage extends UpdaterPage return new Object[0]; } + @Override @SuppressWarnings("unchecked") public Object getParent(Object element) { // This operation is expensive, so we do the minimum @@ -1635,6 +1647,7 @@ public class PackagesPage extends UpdaterPage return null; } + @Override public boolean hasChildren(Object parentElement) { if (parentElement instanceof ArrayList<?>) { return true; @@ -1663,15 +1676,18 @@ public class PackagesPage extends UpdaterPage return false; } + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } + @Override public void dispose() { // unused } + @Override public void inputChanged(Viewer arg0, Object arg1, Object arg2) { // unused } @@ -1679,20 +1695,24 @@ public class PackagesPage extends UpdaterPage // --- Implementation of ISdkChangeListener --- + @Override public void onSdkLoaded() { onSdkReload(); } + @Override public void onSdkReload() { // The sdkmanager finished reloading its data. We must not call localReload() from here // since we don't want to alter the sdkmanager's data that just finished loading. loadPackages(); } + @Override public void preInstallHook() { // nothing to be done for now. } + @Override public void postInstallHook() { // nothing to be done for now. } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java index 0f9dbc3..2c8b2d2 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PkgItem.java @@ -19,8 +19,8 @@ package com.android.sdkuilib.internal.repository.sdkman2; import com.android.sdklib.internal.repository.Archive; import com.android.sdklib.internal.repository.IPackageVersion; import com.android.sdklib.internal.repository.Package; -import com.android.sdklib.internal.repository.SdkSource; import com.android.sdklib.internal.repository.Package.UpdateInfo; +import com.android.sdklib.internal.repository.SdkSource; /** * A {@link PkgItem} represents one main {@link Package} combined with its state @@ -119,6 +119,7 @@ public class PkgItem implements Comparable<PkgItem> { return mMainPkg.getArchives(); } + @Override public int compareTo(PkgItem pkg) { return getMainPackage().compareTo(pkg.getMainPackage()); } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkLogAdapter.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkLogAdapter.java index 6ce8b1e..969d930 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkLogAdapter.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkLogAdapter.java @@ -41,6 +41,7 @@ public final class SdkLogAdapter implements ILogUiProvider { * Sets the description in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setDescription(final String description) {
if (acceptLog(description)) {
mSdkLog.printf("%1$s", description); //$NON-NLS-1$
@@ -51,6 +52,7 @@ public final class SdkLogAdapter implements ILogUiProvider { * Logs a "normal" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void log(String log) {
if (acceptLog(log)) {
mSdkLog.printf(" %1$s", log); //$NON-NLS-1$
@@ -61,6 +63,7 @@ public final class SdkLogAdapter implements ILogUiProvider { * Logs an "error" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logError(String log) {
if (acceptLog(log)) {
mSdkLog.error(null, " %1$s", log); //$NON-NLS-1$
@@ -72,6 +75,7 @@ public final class SdkLogAdapter implements ILogUiProvider { * not that useful for the end-user and might be hidden until explicitly shown.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logVerbose(String log) {
if (acceptLog(log)) {
mSdkLog.printf(" %1$s", log); //$NON-NLS-1$
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java index 7873700..5801aca 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java @@ -139,6 +139,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { * Opens the window.
* @wbp.parser.entryPoint
*/
+ @Override
public void open() {
if (mParentShell == null) {
Display.setAppName(APP_NAME); //$hide$ (hide from SWT designer)
@@ -174,6 +175,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { mShell = new Shell(mParentShell, style);
mShell.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
ShellSizeAndPos.saveSizeAndPos(mShell, SIZE_POS_PREFIX);
onAndroidSdkUpdaterDispose(); //$hide$ (hide from SWT designer)
@@ -219,6 +221,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { "Click to abort the current task",
""); //$NON-NLS-1$ nothing to abort
mButtonStop.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
onStopSelected();
}
@@ -230,6 +233,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { "Click to show the log window", // tooltip for state hidden=>shown
"Click to hide the log window"); // tooltip for state shown=>hidden
mButtonShowLog.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
onToggleLogWindow();
}
@@ -400,6 +404,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { * @param pageClass The {@link Composite}-derived class that will implement the page.
* @param purpose The purpose of this page, e.g. an about box, settings page or generic.
*/
+ @Override
@SuppressWarnings("unchecked")
public void registerPage(Class<? extends UpdaterPage> pageClass,
Purpose purpose) {
@@ -415,6 +420,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { * This must be called before the call to {@link #open()}.
* If null or if the page class is not found, the first page will be selected.
*/
+ @Override
public void setInitialPage(Class<? extends Composite> pageClass) {
// Unused in this case. This window display only one page.
}
@@ -424,6 +430,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { * <p/>
* This must be called before the call to {@link #open()}.
*/
+ @Override
public void setRequestAutoUpdate(boolean requestAutoUpdate) {
mRequestAutoUpdate = requestAutoUpdate;
}
@@ -431,6 +438,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { /**
* Adds a new listener to be notified when a change is made to the content of the SDK.
*/
+ @Override
public void addListener(ISdkChangeListener listener) {
mUpdaterData.addListeners(listener);
}
@@ -439,6 +447,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { * Removes a new listener to be notified anymore when a change is made to the content of
* the SDK.
*/
+ @Override
public void removeListener(ISdkChangeListener listener) {
mUpdaterData.removeListener(listener);
}
@@ -469,18 +478,22 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { // and filters errors to make sure the window is visible when
// an error is logged.
ILogUiProvider logAdapter = new ILogUiProvider() {
+ @Override
public void setDescription(String description) {
mLogWindow.setDescription(description);
}
+ @Override
public void log(String log) {
mLogWindow.log(log);
}
+ @Override
public void logVerbose(String log) {
mLogWindow.logVerbose(log);
}
+ @Override
public void logError(String log) {
mLogWindow.logError(log);
@@ -490,6 +503,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { // have a lot of error logging, so this should be acceptable. If not, we could
// cache the visibility state.
mShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mLogWindow.isVisible()) {
// Don't toggle the window visibility directly.
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/IProgressUiProvider.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/IProgressUiProvider.java index dc4f3ba..4e2c131 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/IProgressUiProvider.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/IProgressUiProvider.java @@ -37,6 +37,7 @@ interface IProgressUiProvider extends ILogUiProvider { * Sets the description in the current task dialog. * This method can be invoked from a non-UI thread. */ + @Override public abstract void setDescription(String description); /** diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskDialog.java index d01466b..c6ba8b7 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskDialog.java @@ -168,6 +168,7 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { // Hide everything down-below from SWT designer
//$hide>>$
+ @Override
public boolean isCancelRequested() {
return mCancelMode != CancelMode.ACTIVE;
}
@@ -183,6 +184,7 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { // and lock on the cancel button mode.
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
synchronized (mCancelMode) {
if (mCancelMode == CancelMode.ACTIVE) {
@@ -213,6 +215,7 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { // and lock on the cancel button mode.
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
synchronized (mCancelMode) {
if (mCancelMode != CancelMode.CLOSE_MANUAL &&
@@ -277,8 +280,10 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * Sets the description in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setDescription(final String description) {
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mLabel.isDisposed()) {
mLabel.setText(description);
@@ -291,9 +296,11 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * Adds to the log in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void log(final String info) {
if (!mDialogShell.isDisposed()) {
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mResultText.isDisposed()) {
mResultText.setVisible(true);
@@ -311,10 +318,12 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { }
}
+ @Override
public void logError(String info) {
log(info);
}
+ @Override
public void logVerbose(String info) {
log(info);
}
@@ -325,9 +334,11 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { *
* @see ProgressBar#setMaximum(int)
*/
+ @Override
public void setProgressMax(final int max) {
if (!mDialogShell.isDisposed()) {
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mProgressBar.isDisposed()) {
mProgressBar.setMaximum(max);
@@ -341,9 +352,11 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * Sets the current value of the progress bar.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setProgress(final int value) {
if (!mDialogShell.isDisposed()) {
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mProgressBar.isDisposed()) {
mProgressBar.setSelection(value);
@@ -358,11 +371,13 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * between 0 and up to {@link #setProgressMax(int)} - 1.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public int getProgress() {
final int[] result = new int[] { 0 };
if (!mDialogShell.isDisposed()) {
mDialogShell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mProgressBar.isDisposed()) {
result[0] = mProgressBar.getSelection();
@@ -384,12 +399,14 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * @param message The error message
* @return true if YES was clicked.
*/
+ @Override
public boolean displayPrompt(final String title, final String message) {
Display display = mDialogShell.getDisplay();
// we need to ask the user what he wants to do.
final boolean[] result = new boolean[] { false };
display.syncExec(new Runnable() {
+ @Override
public void run() {
result[0] = MessageDialog.openQuestion(mDialogShell, title, message);
}
@@ -411,6 +428,7 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { * If operation is <b>canceled</b> by user the return value must be <b>null</b>.
* @see ITaskMonitor#displayLoginCredentialsPrompt(String, String)
*/
+ @Override
public UserCredentials displayLoginCredentialsPrompt(
final String title, final String message) {
Display display = mDialogShell.getDisplay();
@@ -438,6 +456,7 @@ final class ProgressTaskDialog extends Dialog implements IProgressUiProvider { mMessage = message;
}
+ @Override
public void run() {
AuthenticationDialog authenticationDialog = new AuthenticationDialog(mShell,
mTitle, mMessage);
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskFactory.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskFactory.java index d80e8c2..ac0bc30 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskFactory.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressTaskFactory.java @@ -34,10 +34,12 @@ public final class ProgressTaskFactory implements ITaskFactory { mShell = shell;
}
+ @Override
public void start(String title, ITask task) {
start(title, null /*parentMonitor*/, task);
}
+ @Override
public void start(String title, ITaskMonitor parentMonitor, ITask task) {
if (parentMonitor == null) {
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressView.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressView.java index 3361a58..3090884 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressView.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressView.java @@ -86,6 +86,7 @@ public final class ProgressView implements IProgressUiProvider { mStopButton = stopButton;
if (mStopButton != null) {
mStopButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (mState == State.ACTIVE) {
changeState(State.STOP_PENDING);
@@ -113,6 +114,7 @@ public final class ProgressView implements IProgressUiProvider { }
Runnable r = new Runnable() {
+ @Override
public void run() {
if (parentMonitor == null) {
task.run(new TaskMonitorImpl(ProgressView.this));
@@ -179,6 +181,7 @@ public final class ProgressView implements IProgressUiProvider { private void syncExec(final Widget widget, final Runnable runnable) {
if (widget != null && !widget.isDisposed()) {
widget.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
// Check again whether the widget got disposed between the time where
// we requested the syncExec and the time it actually happened.
@@ -196,6 +199,7 @@ public final class ProgressView implements IProgressUiProvider { }
syncExec(mStopButton, new Runnable() {
+ @Override
public void run() {
mStopButton.setEnabled(mState == State.ACTIVE);
}
@@ -205,6 +209,7 @@ public final class ProgressView implements IProgressUiProvider { // --- Implementation of ITaskUiProvider ---
+ @Override
public boolean isCancelRequested() {
return mState != State.ACTIVE;
}
@@ -213,8 +218,10 @@ public final class ProgressView implements IProgressUiProvider { * Sets the description in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setDescription(final String description) {
syncExec(mLabel, new Runnable() {
+ @Override
public void run() {
mLabel.setText(description);
}
@@ -227,6 +234,7 @@ public final class ProgressView implements IProgressUiProvider { * Logs a "normal" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void log(String log) {
mLog.log(log);
}
@@ -235,6 +243,7 @@ public final class ProgressView implements IProgressUiProvider { * Logs an "error" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logError(String log) {
mLog.logError(log);
}
@@ -244,6 +253,7 @@ public final class ProgressView implements IProgressUiProvider { * not that useful for the end-user and might be hidden until explicitly shown.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logVerbose(String log) {
mLog.logVerbose(log);
}
@@ -254,8 +264,10 @@ public final class ProgressView implements IProgressUiProvider { *
* @see ProgressBar#setMaximum(int)
*/
+ @Override
public void setProgressMax(final int max) {
syncExec(mProgressBar, new Runnable() {
+ @Override
public void run() {
mProgressBar.setMaximum(max);
}
@@ -266,8 +278,10 @@ public final class ProgressView implements IProgressUiProvider { * Sets the current value of the progress bar.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setProgress(final int value) {
syncExec(mProgressBar, new Runnable() {
+ @Override
public void run() {
mProgressBar.setSelection(value);
}
@@ -279,11 +293,13 @@ public final class ProgressView implements IProgressUiProvider { * between 0 and up to {@link #setProgressMax(int)} - 1.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public int getProgress() {
final int[] result = new int[] { 0 };
if (!mProgressBar.isDisposed()) {
mProgressBar.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!mProgressBar.isDisposed()) {
result[0] = mProgressBar.getSelection();
@@ -295,10 +311,12 @@ public final class ProgressView implements IProgressUiProvider { return result[0];
}
+ @Override
public boolean displayPrompt(final String title, final String message) {
final boolean[] result = new boolean[] { false };
syncExec(mProgressBar, new Runnable() {
+ @Override
public void run() {
Shell shell = mProgressBar.getShell();
result[0] = MessageDialog.openQuestion(shell, title, message);
@@ -317,11 +335,13 @@ public final class ProgressView implements IProgressUiProvider { * If operation is <b>canceled</b> by user the return value must be <b>null</b>.
* @see ITaskMonitor#displayLoginCredentialsPrompt(String, String)
*/
+ @Override
public UserCredentials
displayLoginCredentialsPrompt(final String title, final String message) {
final String[] resultArray = new String[] {"", "", "", ""};
// open dialog and request login and password
syncExec(mProgressBar, new Runnable() {
+ @Override
public void run() {
Shell shell = mProgressBar.getShell();
AuthenticationDialog authenticationDialog = new AuthenticationDialog(shell,
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressViewFactory.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressViewFactory.java index db9fd7c..1d39c59 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressViewFactory.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/ProgressViewFactory.java @@ -35,10 +35,12 @@ public final class ProgressViewFactory implements ITaskFactory { mProgressView = progressView;
}
+ @Override
public void start(String title, ITask task) {
start(title, null /*monitor*/, task);
}
+ @Override
public void start(String title, ITaskMonitor parentMonitor, ITask task) {
assert mProgressView != null;
mProgressView.startTask(title, parentMonitor, task);
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java index ff207c5..9a796b7 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/tasks/TaskMonitorImpl.java @@ -62,6 +62,7 @@ class TaskMonitorImpl implements ITaskMonitor { * Sets the description in the current task dialog.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void setDescription(String format, Object... args) {
final String text = String.format(format, args);
mUi.setDescription(text);
@@ -71,6 +72,7 @@ class TaskMonitorImpl implements ITaskMonitor { * Logs a "normal" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void log(String format, Object... args) {
String text = String.format(format, args);
mUi.log(text);
@@ -80,6 +82,7 @@ class TaskMonitorImpl implements ITaskMonitor { * Logs an "error" information line.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logError(String format, Object... args) {
String text = String.format(format, args);
mUi.logError(text);
@@ -90,6 +93,7 @@ class TaskMonitorImpl implements ITaskMonitor { * not that useful for the end-user and might be hidden until explicitly shown.
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void logVerbose(String format, Object... args) {
String text = String.format(format, args);
mUi.logVerbose(text);
@@ -103,6 +107,7 @@ class TaskMonitorImpl implements ITaskMonitor { * *after* {@link #incProgress(int)}: we don't try to adjust it on the
* fly.
*/
+ @Override
public void setProgressMax(int max) {
assert max > 0;
// Always set the dialog's progress max to 10k since it only handles
@@ -113,6 +118,7 @@ class TaskMonitorImpl implements ITaskMonitor { assert mIncCoef > 0;
}
+ @Override
public int getProgressMax() {
return mIncCoef > 0 ? (int) (MAX_COUNT / mIncCoef) : 0;
}
@@ -122,6 +128,7 @@ class TaskMonitorImpl implements ITaskMonitor { *
* This method can be invoked from a non-UI thread.
*/
+ @Override
public void incProgress(int delta) {
if (delta > 0 && mIncCoef > 0) {
internalIncProgress(delta * mIncCoef);
@@ -139,6 +146,7 @@ class TaskMonitorImpl implements ITaskMonitor { *
* This method can be invoked from a non-UI thread.
*/
+ @Override
public int getProgress() {
// mIncCoef is 0 if setProgressMax hasn't been used yet.
return mIncCoef > 0 ? (int)(mUi.getProgress() / mIncCoef) : 0;
@@ -148,6 +156,7 @@ class TaskMonitorImpl implements ITaskMonitor { * Returns true if the "Cancel" button was selected.
* It is up to the task thread to pool this and exit.
*/
+ @Override
public boolean isCancelRequested() {
return mUi.isCancelRequested();
}
@@ -162,6 +171,7 @@ class TaskMonitorImpl implements ITaskMonitor { * @param message The error message
* @return true if YES was clicked.
*/
+ @Override
public boolean displayPrompt(final String title, final String message) {
return mUi.displayPrompt(title, message);
}
@@ -177,6 +187,7 @@ class TaskMonitorImpl implements ITaskMonitor { * element and Password is always the second. If any error occurs a
* pair with empty strings is returned.
*/
+ @Override
public UserCredentials displayLoginCredentialsPrompt(String title, String message) {
return mUi.displayLoginCredentialsPrompt(title, message);
}
@@ -185,6 +196,7 @@ class TaskMonitorImpl implements ITaskMonitor { * Creates a sub-monitor that will use up to tickCount on the progress bar.
* tickCount must be 1 or more.
*/
+ @Override
public ITaskMonitor createSubMonitor(int tickCount) {
assert mIncCoef > 0;
assert tickCount > 0;
@@ -193,6 +205,7 @@ class TaskMonitorImpl implements ITaskMonitor { // ----- ISdkLog interface ----
+ @Override
public void error(Throwable throwable, String errorFormat, Object... arg) {
if (errorFormat != null) {
logError("Error: " + errorFormat, arg);
@@ -203,10 +216,12 @@ class TaskMonitorImpl implements ITaskMonitor { }
}
+ @Override
public void warning(String warningFormat, Object... arg) {
log("Warning: " + warningFormat, arg);
}
+ @Override
public void printf(String msgFormat, Object... arg) {
log(msgFormat, arg);
}
@@ -242,48 +257,58 @@ class TaskMonitorImpl implements ITaskMonitor { mSubValue = start;
}
+ @Override
public boolean isCancelRequested() {
return mRoot.isCancelRequested();
}
+ @Override
public void setDescription(String format, Object... args) {
mRoot.setDescription(format, args);
}
+ @Override
public void log(String format, Object... args) {
mRoot.log(format, args);
}
+ @Override
public void logError(String format, Object... args) {
mRoot.logError(format, args);
}
+ @Override
public void logVerbose(String format, Object... args) {
mRoot.logVerbose(format, args);
}
+ @Override
public void setProgressMax(int max) {
assert max > 0;
mSubCoef = max > 0 ? mSpan / max : 0;
assert mSubCoef > 0;
}
+ @Override
public int getProgressMax() {
return mSubCoef > 0 ? (int) (mSpan / mSubCoef) : 0;
}
+ @Override
public int getProgress() {
// subCoef can be 0 if setProgressMax() and incProgress() haven't been called yet
assert mSubValue == mStart || mSubCoef > 0;
return mSubCoef > 0 ? (int)((mSubValue - mStart) / mSubCoef) : 0;
}
+ @Override
public void incProgress(int delta) {
if (delta > 0 && mSubCoef > 0) {
subIncProgress(delta * mSubCoef);
}
}
+ @Override
public void subIncProgress(double realDelta) {
mSubValue += realDelta;
if (mParent != null) {
@@ -293,14 +318,17 @@ class TaskMonitorImpl implements ITaskMonitor { }
}
+ @Override
public boolean displayPrompt(String title, String message) {
return mRoot.displayPrompt(title, message);
}
+ @Override
public UserCredentials displayLoginCredentialsPrompt(String title, String message) {
return mRoot.displayLoginCredentialsPrompt(title, message);
}
+ @Override
public ITaskMonitor createSubMonitor(int tickCount) {
assert mSubCoef > 0;
assert tickCount > 0;
@@ -312,14 +340,17 @@ class TaskMonitorImpl implements ITaskMonitor { // ----- ISdkLog interface ----
+ @Override
public void error(Throwable throwable, String errorFormat, Object... arg) {
mRoot.error(throwable, errorFormat, arg);
}
+ @Override
public void warning(String warningFormat, Object... arg) {
mRoot.warning(warningFormat, arg);
}
+ @Override
public void printf(String msgFormat, Object... arg) {
mRoot.printf(msgFormat, arg);
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java index 2359add..4e54da0 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java @@ -25,8 +25,8 @@ import com.android.sdklib.SdkConstants; import com.android.sdklib.SdkManager; import com.android.sdklib.internal.avd.AvdInfo; import com.android.sdklib.internal.avd.AvdManager; -import com.android.sdklib.internal.avd.HardwareProperties; import com.android.sdklib.internal.avd.AvdManager.AvdConflict; +import com.android.sdklib.internal.avd.HardwareProperties; import com.android.sdklib.internal.avd.HardwareProperties.HardwareProperty; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdkuilib.internal.repository.icons.ImageFactory; @@ -75,8 +75,8 @@ import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import java.util.TreeMap; import java.util.Map.Entry; +import java.util.TreeMap; import java.util.regex.Matcher; /** @@ -141,6 +141,7 @@ final class AvdCreationDialog extends GridDialog { * {@link VerifyListener} for {@link Text} widgets that should only contains numbers. */ private final VerifyListener mDigitVerifier = new VerifyListener() { + @Override public void verifyText(VerifyEvent event) { int count = event.text.length(); for (int i = 0 ; i < count ; i++) { @@ -159,6 +160,7 @@ final class AvdCreationDialog extends GridDialog { * When editing an existing AVD, it's OK for the name to match the existing AVD. */ private class CreateNameModifyListener implements ModifyListener { + @Override public void modifyText(ModifyEvent e) { String name = mAvdName.getText().trim(); if (mEditAvdInfo == null || !name.equals(mEditAvdInfo.getName())) { @@ -193,6 +195,7 @@ final class AvdCreationDialog extends GridDialog { * {@link ModifyListener} used for live-validation of the fields content. */ private class ValidateListener extends SelectionAdapter implements ModifyListener { + @Override public void modifyText(ModifyEvent e) { validatePage(); } @@ -553,6 +556,7 @@ final class AvdCreationDialog extends GridDialog { // -- Table viewer mHardwareViewer = new TableViewer(hardwareTable); mHardwareViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { // it's a single selection mode, we can just access the selection index // from the table directly. @@ -562,14 +566,17 @@ final class AvdCreationDialog extends GridDialog { // only a content provider. Use viewers per column below (for editing support) mHardwareViewer.setContentProvider(new IStructuredContentProvider() { + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // we can just ignore this. we just use mProperties directly. } + @Override public Object[] getElements(Object arg0) { return mProperties.keySet().toArray(); } + @Override public void dispose() { // pass } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java index 637a109..e2e148b 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java @@ -22,8 +22,8 @@ import com.android.sdklib.ISdkLog; import com.android.sdklib.NullSdkLog; import com.android.sdklib.SdkConstants; import com.android.sdklib.internal.avd.AvdInfo; -import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.avd.AvdInfo.AvdStatus; +import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.repository.ITask; import com.android.sdklib.internal.repository.ITaskMonitor; import com.android.sdkuilib.internal.repository.SettingsController; @@ -170,10 +170,12 @@ public final class AvdSelector { mTarget = target; } + @Override public void prepare() { // nothing to prepare } + @Override public boolean accept(AvdInfo avd) { if (avd != null) { return mTarget.canRunOn(avd.getTarget()); @@ -182,6 +184,7 @@ public final class AvdSelector { return false; } + @Override public void cleanup() { // nothing to clean up } @@ -227,6 +230,7 @@ public final class AvdSelector { group.setLayoutData(new GridData(GridData.FILL_BOTH)); group.setFont(parent.getFont()); group.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent arg0) { mImageFactory.dispose(); } @@ -664,6 +668,7 @@ public final class AvdSelector { * Handles single-click selection on the table. * {@inheritDoc} */ + @Override public void widgetSelected(SelectionEvent e) { if (e.item instanceof TableItem) { TableItem i = (TableItem) e.item; @@ -685,6 +690,7 @@ public final class AvdSelector { * * {@inheritDoc} */ + @Override public void widgetDefaultSelected(SelectionEvent e) { if (e.item instanceof TableItem) { TableItem i = (TableItem) e.item; @@ -756,6 +762,7 @@ public final class AvdSelector { if (avds != null && avds.length > 0) { Arrays.sort(avds, new Comparator<AvdInfo>() { + @Override public int compare(AvdInfo o1, AvdInfo o2) { return o1.compareTo(o2); } @@ -904,6 +911,7 @@ public final class AvdSelector { // check if the AVD is running if (avdInfo.isRunning()) { display.asyncExec(new Runnable() { + @Override public void run() { Shell shell = display.getActiveShell(); MessageDialog.openError(shell, @@ -919,6 +927,7 @@ public final class AvdSelector { // Confirm you want to delete this AVD final boolean[] result = new boolean[1]; display.syncExec(new Runnable() { + @Override public void run() { Shell shell = display.getActiveShell(); result[0] = MessageDialog.openQuestion(shell, @@ -1075,6 +1084,7 @@ public final class AvdSelector { new ProgressTask(mTable.getShell(), "Starting Android Emulator", new ITask() { + @Override public void run(ITaskMonitor monitor) { try { monitor.setDescription( diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java index 7731dc1..edecb17 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java @@ -154,6 +154,7 @@ final class AvdStartDialog extends GridDialog { mScreenSize.setText(getScreenSize()); mScreenSize.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); mScreenSize.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent event) { // combine the current content and the new text String text = mScreenSize.getText(); @@ -164,6 +165,7 @@ final class AvdStartDialog extends GridDialog { } }); mScreenSize.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent event) { onScaleChange(); } @@ -180,6 +182,7 @@ final class AvdStartDialog extends GridDialog { mMonitorDpi.setLayoutData(gd = new GridData(GridData.FILL_HORIZONTAL)); gd.widthHint = 50; mMonitorDpi.addVerifyListener(new VerifyListener() { + @Override public void verifyText(VerifyEvent event) { // check for digit only. for (int i = 0 ; i < event.text.length(); i++) { @@ -192,6 +195,7 @@ final class AvdStartDialog extends GridDialog { } }); mMonitorDpi.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent event) { onScaleChange(); } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java index 457d13f..4849e50 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/MessageBoxLog.java @@ -62,6 +62,7 @@ public final class MessageBoxLog implements ISdkLog { mLogErrorsOnly = logErrorsOnly; } + @Override public void error(Throwable throwable, String errorFormat, Object... arg) { if (errorFormat != null) { logMessages.add(String.format("Error: " + errorFormat, arg)); @@ -72,12 +73,14 @@ public final class MessageBoxLog implements ISdkLog { } } + @Override public void warning(String warningFormat, Object... arg) { if (!mLogErrorsOnly) { logMessages.add(String.format("Warning: " + warningFormat, arg)); } } + @Override public void printf(String msgFormat, Object... arg) { if (!mLogErrorsOnly) { logMessages.add(String.format(msgFormat, arg)); @@ -110,6 +113,7 @@ public final class MessageBoxLog implements ISdkLog { // dialog box only run in ui thread.. if (mDisplay != null && !mDisplay.isDisposed()) { mDisplay.asyncExec(new Runnable() { + @Override public void run() { // This is typically displayed at the end, so make sure the UI // instances are not disposed. diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/SdkTargetSelector.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/SdkTargetSelector.java index 3ea09a5..beb9254 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/SdkTargetSelector.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/SdkTargetSelector.java @@ -153,6 +153,7 @@ public class SdkTargetSelector { mTargets = targets; if (mTargets != null) { Arrays.sort(mTargets, new Comparator<IAndroidTarget>() { + @Override public int compare(IAndroidTarget o1, IAndroidTarget o2) { return o1.compareTo(o2); } @@ -282,6 +283,7 @@ public class SdkTargetSelector { // Add a selection listener that will check/uncheck items when they are double-clicked table.addSelectionListener(new SelectionListener() { /** Default selection means double-click on "most" platforms */ + @Override public void widgetDefaultSelected(SelectionEvent e) { if (e.item instanceof TableItem) { TableItem i = (TableItem) e.item; @@ -295,6 +297,7 @@ public class SdkTargetSelector { } } + @Override public void widgetSelected(SelectionEvent e) { if (e.item instanceof TableItem) { TableItem i = (TableItem) e.item; @@ -382,6 +385,7 @@ public class SdkTargetSelector { */ final Listener listener = new Listener() { + @Override public void handleEvent(Event event) { switch(event.type) { diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/ToggleButton.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/ToggleButton.java index 06a8c4b..24138bc 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/ToggleButton.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/ToggleButton.java @@ -52,10 +52,12 @@ public class ToggleButton extends CLabel { updateImageAndTooltip();
addMouseListener(new MouseListener() {
+ @Override
public void mouseDown(MouseEvent e) {
// pass
}
+ @Override
public void mouseUp(MouseEvent e) {
// We select on mouse-up, as it should be properly done since this is the
// only way a user can cancel a button click by moving out of the button.
@@ -64,6 +66,7 @@ public class ToggleButton extends CLabel { }
}
+ @Override
public void mouseDoubleClick(MouseEvent e) {
if (mMouseIn && e.button == 1) {
notifyListeners(SWT.DefaultSelection, new Event());
@@ -72,6 +75,7 @@ public class ToggleButton extends CLabel { });
addMouseTrackListener(new MouseTrackListener() {
+ @Override
public void mouseExit(MouseEvent e) {
if (mMouseIn) {
mMouseIn = false;
@@ -79,6 +83,7 @@ public class ToggleButton extends CLabel { }
}
+ @Override
public void mouseEnter(MouseEvent e) {
if (!mMouseIn) {
mMouseIn = true;
@@ -86,6 +91,7 @@ public class ToggleButton extends CLabel { }
}
+ @Override
public void mouseHover(MouseEvent e) {
// pass
}
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/AuthenticationDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/AuthenticationDialog.java index fedb513..07e65b7 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/AuthenticationDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/AuthenticationDialog.java @@ -92,6 +92,7 @@ public class AuthenticationDialog extends GridDialog { mTxtLogin.setFocus(); mTxtLogin.setText(sLogin); mTxtLogin.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { sLogin = mTxtLogin.getText().trim(); } @@ -108,6 +109,7 @@ public class AuthenticationDialog extends GridDialog { mTxtPassword.setLayoutData(data); mTxtPassword.setText(sPassword); mTxtPassword.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { sPassword = mTxtPassword.getText(); } @@ -131,6 +133,7 @@ public class AuthenticationDialog extends GridDialog { mTxtWorkstation.setLayoutData(data); mTxtWorkstation.setText(sWorkstation); mTxtWorkstation.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { sWorkstation = mTxtWorkstation.getText().trim(); } @@ -147,6 +150,7 @@ public class AuthenticationDialog extends GridDialog { mTxtDomain.setLayoutData(data); mTxtDomain.setText(sDomain); mTxtDomain.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { sDomain = mTxtDomain.getText().trim(); } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/SwtBaseDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/SwtBaseDialog.java index 6bb0cdd..6377ef7 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/SwtBaseDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/ui/SwtBaseDialog.java @@ -122,6 +122,7 @@ public abstract class SwtBaseDialog extends Dialog { mShell.setText(getText()); } mShell.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { saveSize(); } diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java index 897e012..fff0814 100755 --- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java +++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/MockUpdaterData.java @@ -86,10 +86,12 @@ public class MockUpdaterData extends UpdaterData { //------------ private class MockTaskFactory implements ITaskFactory { + @Override public void start(String title, ITask task) { start(title, null /*parentMonitor*/, task); } + @Override public void start(String title, ITaskMonitor parentMonitor, ITask task) { new MockTask(task); } diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java index 1bf7799..5d735e3 100755 --- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java +++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/UpdaterLogicTest.java @@ -44,30 +44,37 @@ public class UpdaterLogicTest extends TestCase { private static class NullUpdaterData implements IUpdaterData {
+ @Override
public AvdManager getAvdManager() {
return null;
}
+ @Override
public ImageFactory getImageFactory() {
return null;
}
+ @Override
public ISdkLog getSdkLog() {
return null;
}
+ @Override
public SdkManager getSdkManager() {
return null;
}
+ @Override
public SettingsController getSettingsController() {
return null;
}
+ @Override
public ITaskFactory getTaskFactory() {
return null;
}
+ @Override
public Shell getWindowShell() {
return null;
}
|