SDK Manager: display source of packages in tooltip.

Change-Id: I52484e7b61100d0c1656769cdce419416ed060c6

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 0b866ff..48cf9f7 100755 (executable)
--- 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
@@ -84,6 +84,7 @@ public class AddonSitesDialog extends SwtBaseDialog {
     /**
      * Create contents of the dialog.
      */
+    @SuppressWarnings("unused")
     @Override
     protected void createContents() {
         Shell shell = getShell();

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 a26e7ef..301239c 100755 (executable)
--- 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
@@ -190,6 +190,7 @@ public class AvdManagerWindowImpl1 {
         mAvdPage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));\r
     }\r
 \r
+    @SuppressWarnings("unused") // MenuBarWrapper works using side effects\r
     private void createMenuBar() {\r
 \r
         if (mContext != AvdInvocationContext.STANDALONE) {\r

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 818b7de..120fe4f 100755 (executable)
--- 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
@@ -75,6 +75,8 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -176,6 +178,7 @@ public class PackagesPage extends UpdaterPage
         }
     }
 
+    @SuppressWarnings("unused")
     private void createContents(Composite parent) {
         GridLayoutBuilder.create(parent).noMargins().columns(2);
 
@@ -1516,7 +1519,23 @@ public class PackagesPage extends UpdaterPage
                 element = ((PkgItem) element).getMainPackage();
             }
             if (element instanceof IDescription) {
-                return ((IDescription) element).getLongDescription();
+                String s = ((IDescription) element).getLongDescription();
+                if (element instanceof Package) {
+                    SdkSource src = ((Package) element).getParentSource();
+                    if (src != null) {
+                        try {
+                            URL url = new URL(src.getUrl());
+                            String host = url.getHost();
+                            if (((Package) element).isLocal()) {
+                                s += String.format("\nInstalled from %1$s", host);
+                            } else {
+                                s += String.format("\nProvided by %1$s", host);
+                            }
+                        } catch (MalformedURLException ignore) {
+                        }
+                    }
+                }
+                return s;
             }
             return super.getToolTipText(element);
         }

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 d7d8dc6..6740dbb 100755 (executable)
--- 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
@@ -236,6 +236,7 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
         });\r
     }\r
 \r
+    @SuppressWarnings("unused") // MenuItem works using side effects\r
     private void createMenuBar() {\r
 \r
         Menu menuBar = new Menu(mShell, SWT.BAR);\r