Merge: Minor method rename in SdkManager UI.

Change-Id: I723a97aaff7f67507007806391b494998d99f058

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 444e998..f430381 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java
@@ -94,7 +94,7 @@ class LocalSdkAdapter  {
          */\r
         public Object[] getElements(Object inputElement) {\r
             if (inputElement == LocalSdkAdapter.this) {\r
-                Package[] packages = mUpdaterData.getInstalledPackage();\r
+                Package[] packages = mUpdaterData.getInstalledPackages();\r
 \r
                 if (packages != null) {\r
                     return packages;\r

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 05d0d43..64fb7c7 100755 (executable)
--- 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 {
      */\r
     private Package[] filterUpdateOnlyPackages(Package[] remotePackages) {\r
         // get the installed packages\r
-        Package[] installedPackages = mUpdaterData.getInstalledPackage();\r
+        Package[] installedPackages = mUpdaterData.getInstalledPackages();\r
 \r
         ArrayList<Package> filteredList = new ArrayList<Package>();\r
 \r

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 e569eba..33d756a 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -353,8 +353,11 @@ class UpdaterData implements IUpdaterData {
 \r
     /**\r
      * Returns the list of installed packages, parsing them if this has not yet been done.\r
+     * <p/>\r
+     * The package list is cached in the {@link LocalSdkParser} and will be reset when\r
+     * {@link #reloadSdk()} is invoked.\r
      */\r
-    public Package[] getInstalledPackage() {\r
+    public Package[] getInstalledPackages() {\r
         LocalSdkParser parser = getLocalSdkParser();\r
 \r
         Package[] packages = parser.getPackages();\r
@@ -416,7 +419,7 @@ class UpdaterData implements IUpdaterData {
 \r
                 // Mark all current local archives as already installed.\r
                 HashSet<Archive> installedArchives = new HashSet<Archive>();\r
-                for (Package p : getInstalledPackage()) {\r
+                for (Package p : getInstalledPackages()) {\r
                     for (Archive a : p.getArchives()) {\r
                         installedArchives.add(a);\r
                     }\r