From cfaeb6a5c2c774f6dfd6dd597f772e7d0c89ccc2 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Thu, 30 Dec 2010 17:18:08 -0800 Subject: [PATCH] Minor method rename in SdkManager UI. Change-Id: I35447fe1ae9a21763207a07c0e205c1808f3b420 --- .../com/android/sdkuilib/internal/repository/LocalSdkAdapter.java | 2 +- .../android/sdkuilib/internal/repository/RepoSourcesAdapter.java | 2 +- .../src/com/android/sdkuilib/internal/repository/UpdaterData.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java index 83aa0c9f2..f09e144fb 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java @@ -93,7 +93,7 @@ class LocalSdkAdapter { */ public Object[] getElements(Object inputElement) { if (inputElement == LocalSdkAdapter.this) { - Package[] packages = mUpdaterData.getInstalledPackage(); + Package[] packages = mUpdaterData.getInstalledPackages(); if (packages != null) { return packages; diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java index e7fc74c85..8722e025d 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java @@ -314,7 +314,7 @@ public class RepoSourcesAdapter { */ private Package[] filterUpdateOnlyPackages(Package[] remotePackages) { // get the installed packages - Package[] installedPackages = mUpdaterData.getInstalledPackage(); + Package[] installedPackages = mUpdaterData.getInstalledPackages(); ArrayList filteredList = new ArrayList(); 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 0aa8a1504..e611e1539 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 @@ -351,8 +351,11 @@ class UpdaterData implements IUpdaterData { /** * Returns the list of installed packages, parsing them if this has not yet been done. + *

+ * The package list is cached in the {@link LocalSdkParser} and will be reset when + * {@link #reloadSdk()} is invoked. */ - public Package[] getInstalledPackage() { + public Package[] getInstalledPackages() { LocalSdkParser parser = getLocalSdkParser(); Package[] packages = parser.getPackages(); @@ -391,7 +394,7 @@ class UpdaterData implements IUpdaterData { // Mark all current local archives as already installed. HashSet installedArchives = new HashSet(); - for (Package p : getInstalledPackage()) { + for (Package p : getInstalledPackages()) { for (Archive a : p.getArchives()) { installedArchives.add(a); } -- 2.11.0