From 08799a8a00ca755b6d14201c885c3279d26aa617 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Fri, 15 Jun 2012 12:27:40 -0700 Subject: SDK Manager fix display of update revisions. A couple of occurences were displaying full revision for updates (e.g "Update available: rev. 20.0.0") instead of the short version (e.g. "rev. 20"). Change-Id: I593ba952df714b50e548dbb447aaf9ac4e4192ca --- .../com/android/sdklib/internal/repository/packages/AddonPackage.java | 4 ++-- .../android/sdkuilib/internal/repository/sdkman2/PackagesPage.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java index fff45b9..fd8545c 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java @@ -488,7 +488,7 @@ public class AddonPackage extends MajorRevisionPackage return String.format("%1$s, Android API %2$s, revision %3$s%4$s", getDisplayName(), mVersion.getApiString(), - getRevision(), + getRevision().toShortString(), isObsolete() ? " (Obsolete)" : ""); } @@ -503,7 +503,7 @@ public class AddonPackage extends MajorRevisionPackage String s = String.format("%1$s, Android API %2$s, revision %3$s%4$s\nBy %5$s", getDisplayName(), mVersion.getApiString(), - getRevision(), + getRevision().toShortString(), isObsolete() ? " (Obsolete)" : "", //$NON-NLS-2$ getDisplayVendor()); 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 109c061..0b6d725 100755 --- 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 @@ -1376,7 +1376,7 @@ public class PackagesPage extends UpdaterPage implements ISdkChangeListener { if (update != null) { return String.format( "Update available: rev. %1$s", - update.getRevision()); + update.getRevision().toShortString()); } return "Installed"; -- cgit v1.1