From 58b6098f88ef88e7724d49e76d6ca8ea07035016 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 6 Mar 2010 19:09:22 -0800 Subject: [PATCH] SDK Manager: fix displayed dependencies at installation. 2 changes: - No longer display packages already locally installed as dependencies. - Changed the wording at install time to clearly indicate that "installing package X also requires installing Y and Z". That's just wording but I think it should clear the confusion and really says what the code is actually going to do, e.g.: - if X depends on tools r5 and you don't have r5, it will correctly state "requires installing missing tools r5" - if X depends on tools r5 and you have r6 in the repo, it will correctly state "requires installing tools r6". SDK Bug 2418140 Change-Id: I84f8d145d896102410349241ad39eadd09215de8 --- .../android/sdkuilib/internal/repository/UpdateChooserDialog.java | 5 +++-- .../src/com/android/sdkuilib/internal/repository/UpdaterLogic.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java index 627c5a037..2f64edd50 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java @@ -184,7 +184,8 @@ final class UpdateChooserDialog extends GridDialog { mPackageTextGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1)); mPackageTextGroup.setLayout(new GridLayout(1, false/*makeColumnsEqual*/)); - mPackageText = new StyledText(mPackageTextGroup, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL); + mPackageText = new StyledText(mPackageTextGroup, + SWT.MULTI | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL); mPackageText.setBackground( getParentShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); mPackageText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); @@ -451,7 +452,7 @@ final class UpdateChooserDialog extends GridDialog { addSectionTitle("Dependencies\n"); if (aDeps != null && aDeps.length > 0) { - addText("This package depends on:"); + addText("Installing this package also requires installing:"); for (ArchiveInfo aDep : aDeps) { addText(String.format("\n- %1$s", aDep.getShortDescription())); diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterLogic.java index 36f277b0b..14f3da86e 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterLogic.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterLogic.java @@ -425,7 +425,7 @@ class UpdaterLogic { if (p instanceof ToolPackage) { if (((ToolPackage) p).getRevision() >= rev) { // We found one already installed. - return ai; + return null; } } } @@ -520,7 +520,7 @@ class UpdaterLogic { if (p instanceof PlatformPackage) { if (v.equals(((PlatformPackage) p).getVersion())) { // We found one already installed. - return ai; + return null; } } } @@ -623,7 +623,7 @@ class UpdaterLogic { if (p instanceof PlatformPackage) { if (((PlatformPackage) p).getVersion().isGreaterOrEqualThan(api)) { // We found one already installed. - return ai; + return null; } } } -- 2.11.0