From ecc85daf7b9676c8e94f1f295345c8f385de45d4 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 23 Jul 2009 14:43:49 -0700
Subject: [PATCH] Fix loading of user repository and add refresh when
 adding/removing.

---
 .../com/android/sdklib/internal/repository/RepoSources.java   | 3 +--
 .../sdkuilib/internal/repository/RemotePackagesPage.java      | 2 ++
 .../com/android/sdkuilib/internal/widgets/AvdSelector.java    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java
index a15014dd5..7af6657ae 100755
--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java
+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSources.java
@@ -93,7 +93,7 @@ public class RepoSources {
                 int count = Integer.parseInt(props.getProperty(KEY_COUNT, "0"));
 
                 for (int i = 0; i < count; i++) {
-                    String url = props.getProperty(String.format("%s%02d", KEY_SRC, count));  //$NON-NLS-1$
+                    String url = props.getProperty(String.format("%s%02d", KEY_SRC, i));  //$NON-NLS-1$
                     if (url != null) {
                         mSources.add(new RepoSource(url, true /*userSource*/));
                     }
@@ -117,7 +117,6 @@ public class RepoSources {
                 }
             }
         }
-
     }
 
     /**
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java
index 2b96b3182..232da444c 100755
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RemotePackagesPage.java
@@ -311,6 +311,7 @@ public class RemotePackagesPage extends Composite implements ISdkListener {
         if (dlg.open() == Window.OK) {
             String url = dlg.getValue();
             mUpdaterData.getSources().add(new RepoSource(url, true /*userSource*/));
+            onRefreshSelected();
         }
     }
 
@@ -345,6 +346,7 @@ public class RemotePackagesPage extends Composite implements ISdkListener {
         if (mUpdaterData != null) {
             mUpdaterData.refreshSources(false /*forceFetching*/);
         }
+        mTreeViewerSources.refresh();
         updateButtonsState();
     }
 
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
index 88ae697f1..c07af5a0c 100644
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
@@ -236,8 +236,8 @@ public final class AvdSelector {
         if (displayMode == DisplayMode.MANAGER) {
             mNewButton = new Button(buttons, SWT.PUSH | SWT.FLAT);
             mNewButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-            mNewButton.setText("Add...");
-            mNewButton.setToolTipText("Adds a new AVD.");
+            mNewButton.setText("New...");
+            mNewButton.setToolTipText("Creates a new AVD.");
             mNewButton.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent arg0) {