am eecf776a: SDK Updater: select specific archives in the remote page also triggers the license/install overview dialog.

Merge commit 'eecf776ac46a1eec86de5f79903bd3e7c464b0fe'

* commit 'eecf776ac46a1eec86de5f79903bd3e7c464b0fe':
  SDK Updater: select specific archives in the remote page

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalPackagesPage.java

@@ -241,7 +241,7 @@ public class LocalPackagesPage extends Composite implements ISdkListener {
     }
 
     private void onUpdateInstalledPackage() {
-        mUpdaterData.updateAll();
+        mUpdaterData.updateAll(null /*selectedArchives*/);
     }
 
     private void onDeleteSelected() {

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java

@@ -292,7 +292,7 @@ public class RemotePackagesPage extends Composite implements ISdkListener {
         }
 
         if (mUpdaterData != null) {
-            mUpdaterData.installArchives(archives);
+            mUpdaterData.updateAll(archives);
         }
     }
 

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java

@@ -263,11 +263,6 @@ class UpdaterData {
 
         final boolean forceHttp = getSettingsController().getForceHttp();
 
-        // TODO filter the archive list to: a/ display a list of what is going to be installed,
-        // b/ display licenses and c/ check that the selected packages are actually upgrades
-        // or ask user to confirm downgrades. All this should be done in a separate class+window
-        // which will then call this method with the final list.
-
         mTaskFactory.start("Installing Archives", new ITask() {
             public void run(ITaskMonitor monitor) {
 
@@ -320,13 +315,17 @@ class UpdaterData {
      * This first refreshes all sources, then compares the available remote packages when
      * the current local ones and suggest updates to be done to the user. Finally all
      * selected updates are installed.
+     *
+     * @param selectedArchives The list of remote archive to consider for the update.
+     *  This can be null, in which case a list of remote archive is fetched from all
+     *  available sources.
      */
-    public void updateAll() {
+    public void updateAll(Collection<Archive> selectedArchives) {
-        assert mTaskFactory != null;
+        if (selectedArchives == null) {
+            refreshSources(true);
+        }
 
-        refreshSources(true);
+        final Map<Archive, Archive> updates = findUpdates(selectedArchives);
-
-        final Map<Archive, Archive> updates = findUpdates();
 
         UpdateChooserDialog dialog = new UpdateChooserDialog(this, updates);
         dialog.open();
@@ -369,8 +368,12 @@ class UpdaterData {
      * Return a map [remote archive => local archive] of suitable update candidates.
      * Returns null if there's an unexpected error. Otherwise returns a map that can be
      * empty but not null.
+     *
+     * @param selectedArchives The list of remote archive to consider for the update.
+     *  This can be null, in which case a list of remote archive is fetched from all
+     *  available sources.
      */
-    private Map<Archive, Archive> findUpdates() {
+    private Map<Archive, Archive> findUpdates(Collection<Archive> selectedArchives) {
         // Map [remote archive => local archive] of suitable update candidates
         Map<Archive, Archive> result = new HashMap<Archive, Archive>();
 
@@ -379,23 +382,43 @@ class UpdaterData {
         HashMap<Class<? extends Package>, ArrayList<Archive>> availPkgs =
             new HashMap<Class<? extends Package>, ArrayList<Archive>>();
 
-        ArrayList<RepoSource> remoteSources = getSources().getSources();
+        if (selectedArchives != null) {
+            // Only consider the archives given
 
-        for (RepoSource remoteSrc : remoteSources) {
+            for (Archive a : selectedArchives) {
-            Package[] remotePkgs = remoteSrc.getPackages();
+                // Only add compatible archives
-            if (remotePkgs != null) {
+                if (a.isCompatible()) {
-                for (Package remotePkg : remotePkgs) {
+                    Class<? extends Package> clazz = a.getParentPackage().getClass();
-                    Class<? extends Package> clazz = remotePkg.getClass();
 
                     ArrayList<Archive> list = availPkgs.get(clazz);
                     if (list == null) {
                         availPkgs.put(clazz, list = new ArrayList<Archive>());
                     }
 
-                    for (Archive a : remotePkg.getArchives()) {
+                    list.add(a);
-                        // Only add compatible archives
+                }
-                        if (a.isCompatible()) {
+            }
-                            list.add(a);
+
+        } else {
+            // Get all the available archives from all loaded sources
+            ArrayList<RepoSource> remoteSources = getSources().getSources();
+
+            for (RepoSource remoteSrc : remoteSources) {
+                Package[] remotePkgs = remoteSrc.getPackages();
+                if (remotePkgs != null) {
+                    for (Package remotePkg : remotePkgs) {
+                        Class<? extends Package> clazz = remotePkg.getClass();
+
+                        ArrayList<Archive> list = availPkgs.get(clazz);
+                        if (list == null) {
+                            availPkgs.put(clazz, list = new ArrayList<Archive>());
+                        }
+
+                        for (Archive a : remotePkg.getArchives()) {
+                            // Only add compatible archives
+                            if (a.isCompatible()) {
+                                list.add(a);
+                            }
                         }
                     }
                 }