aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app/src/com
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-05-27 18:03:33 -0700
committerRaphael Moll <ralf@android.com>2011-05-27 18:18:16 -0700
commit9f5f7f1bba88a85f9fbb827e36cbc93d4a8bb499 (patch)
tree568cac8fb07851b6de792ccd7e245082c5b56049 /sdkmanager/app/src/com
parent59199019ddcca9e8baf13ff73225a47debcae667 (diff)
downloadsdk-9f5f7f1bba88a85f9fbb827e36cbc93d4a8bb499.zip
sdk-9f5f7f1bba88a85f9fbb827e36cbc93d4a8bb499.tar.gz
sdk-9f5f7f1bba88a85f9fbb827e36cbc93d4a8bb499.tar.bz2
SdkManager: Refactor name of UpdaterWindow.
Since the sdkmanager now contains separate windows for the "SDK Updater" versus the "AVD Manager", the various UpdaterWindow classes are renamed to SdkUpdateWindow. We already have now a standalone AvdManagerWindow that matches this pattern. This is a pure refactoring/renaming CL with no workflow change whatsoever. Change-Id: I18ecb6aa33b7e9bd2294a959b371b424d03b2060
Diffstat (limited to 'sdkmanager/app/src/com')
-rw-r--r--sdkmanager/app/src/com/android/sdkmanager/Main.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index dd9f6cd..461a508 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -41,11 +41,11 @@ import com.android.sdkmanager.internal.repository.AboutPage;
import com.android.sdkmanager.internal.repository.SettingsPage;
import com.android.sdkuilib.internal.repository.AvdManagerWindowImpl1;
import com.android.sdkuilib.internal.repository.PackagesPage;
-import com.android.sdkuilib.internal.repository.UpdateNoWindow;
+import com.android.sdkuilib.internal.repository.SdkUpdaterNoWindow;
import com.android.sdkuilib.internal.repository.UpdaterPage;
import com.android.sdkuilib.internal.widgets.MessageBoxLog;
-import com.android.sdkuilib.repository.UpdaterWindow;
-import com.android.sdkuilib.repository.UpdaterWindow.InvocationContext;
+import com.android.sdkuilib.repository.SdkUpdaterWindow;
+import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext;
import com.android.util.Pair;
import org.eclipse.swt.widgets.Display;
@@ -80,7 +80,7 @@ public class Main {
private final static int INVALID_TARGET_ID = 0;
private final static String[] BOOLEAN_YES_REPLIES = new String[] { "yes", "y" };
- private final static String[] BOOLEAN_NO_REPLIES = new String[] { "no", "n" };
+ private final static String[] BOOLEAN_NO_REPLIES = new String[] { "no", "n" };
/** Path to the SDK folder. This is the parent of {@link #TOOLSDIR}. */
private String mOsSdkFolder;
@@ -321,11 +321,11 @@ public class Main {
Display.getCurrent(),
true /*logErrorsOnly*/);
- UpdaterWindow window = new UpdaterWindow(
+ SdkUpdaterWindow window = new SdkUpdaterWindow(
null /* parentShell */,
errorLogger,
mOsSdkFolder,
- InvocationContext.STANDALONE);
+ SdkInvocationContext.STANDALONE);
window.registerPage(SettingsPage.class, UpdaterPage.Purpose.SETTINGS);
window.registerPage(AboutPage.class, UpdaterPage.Purpose.ABOUT_BOX);
if (autoUpdate) {
@@ -355,7 +355,7 @@ public class Main {
null /* parentShell */,
errorLogger,
mOsSdkFolder,
- AvdManagerWindowImpl1.InvocationContext.STANDALONE);
+ AvdManagerWindowImpl1.AvdInvocationContext.STANDALONE);
window.registerPage(SettingsPage.class, UpdaterPage.Purpose.SETTINGS);
window.registerPage(AboutPage.class, UpdaterPage.Purpose.ABOUT_BOX);
@@ -376,7 +376,7 @@ public class Main {
String proxyHost = mSdkCommandLine.getParamProxyHost();
String proxyPort = mSdkCommandLine.getParamProxyPort();
- UpdateNoWindow upd = new UpdateNoWindow(mOsSdkFolder, mSdkManager, mSdkLog,
+ SdkUpdaterNoWindow upd = new SdkUpdaterNoWindow(mOsSdkFolder, mSdkManager, mSdkLog,
force, useHttp, proxyHost, proxyPort);
upd.listRemotePackages(obsolete);
}
@@ -400,7 +400,7 @@ public class Main {
errorAndExit(filterResult.getFirst());
}
- UpdateNoWindow upd = new UpdateNoWindow(mOsSdkFolder, mSdkManager, mSdkLog,
+ SdkUpdaterNoWindow upd = new SdkUpdaterNoWindow(mOsSdkFolder, mSdkManager, mSdkLog,
force, useHttp, proxyHost, proxyPort);
upd.updateAll(filterResult.getSecond(), obsolete, dryMode);
}