aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2009-11-06 16:13:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-06 16:13:41 -0800
commit286cf4fffab639182123fc0de1c87d29338e6571 (patch)
tree07fb52400d7a05d0b24c02f49fe0e42423290b01
parentb9a8e0d3dedcd3bc3abbe2e20feaf368b17d55c5 (diff)
parent2e6773b1fb755cd385e43e8e6ca08096532217aa (diff)
downloadsdk-286cf4fffab639182123fc0de1c87d29338e6571.zip
sdk-286cf4fffab639182123fc0de1c87d29338e6571.tar.gz
sdk-286cf4fffab639182123fc0de1c87d29338e6571.tar.bz2
am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair * commit '8e3442f1b0fc19c8213978d4e7ac005774462297': SDK Manager: refresh sources when HTTP/S pref is changed.
-rwxr-xr-xsdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
index fe94d86..7c793e4 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
@@ -21,8 +21,6 @@ import com.android.prefs.AndroidLocation.AndroidLocationException;
import com.android.sdklib.ISdkLog;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
import java.io.File;
import java.io.FileInputStream;
@@ -248,6 +246,10 @@ public class SettingsController {
mSettingsPage.retrieveSettings(mProperties);
applySettings();
saveSettings();
+
+ // In case the HTTP/HTTPS setting change, force sources to be reloaded
+ // (this only refreshes sources that the user has already tried to open.)
+ mUpdaterData.refreshSources(false /*forceFetching*/);
}
/**