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

3 files changed, 12 insertions, 12 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
index 9e1a770..a1cafc7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
@@ -742,9 +742,9 @@
             label="Android SDK and AVD Manager"
             visible="true">
          <action
-               class="com.android.ide.eclipse.adt.internal.wizards.actions.AvdManagerAction"
+               class="com.android.ide.eclipse.adt.internal.actions.SdkAvdManagerAction"
                icon="icons/avd_manager.png"
-               id="com.android.ide.eclipse.adt.ui.avdmanager"
+               id="com.android.ide.eclipse.adt.ui.sdkavdmanager"
                label="Android SDK and AVD Manager"
                menubarPath="Window/additions"
                style="push"
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkAvdManagerAction.java
index ded5919..605cd8b 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/actions/AvdManagerAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkAvdManagerAction.java
@@ -14,15 +14,15 @@
  * limitations under the License.

  */

 

-package com.android.ide.eclipse.adt.internal.wizards.actions;

+package com.android.ide.eclipse.adt.internal.actions;

 

 import com.android.ide.eclipse.adt.AdtPlugin;

 import com.android.ide.eclipse.adt.internal.build.DexWrapper;

 import com.android.ide.eclipse.adt.internal.sdk.AdtConsoleSdkLog;

 import com.android.ide.eclipse.adt.internal.sdk.Sdk;

 import com.android.sdkuilib.repository.ISdkChangeListener;

-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 org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ISelection;

@@ -32,10 +32,10 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;

 

 /**

- * Delegate for the toolbar/menu action "Android AVD Manager".

- * It displays the Android AVD Manager.

+ * Delegate for the toolbar/menu action "Android SDK & AVD Manager".

+ * It displays the Android SDK & AVD Manager.

  */

-public class AvdManagerAction implements IWorkbenchWindowActionDelegate, IObjectActionDelegate {

+public class SdkAvdManagerAction implements IWorkbenchWindowActionDelegate, IObjectActionDelegate {

 

     public void dispose() {

         // nothing to dispose.

@@ -51,11 +51,11 @@ public class AvdManagerAction implements IWorkbenchWindowActionDelegate, IObject
 

             // Runs the updater window, directing all logs to the ADT console.

 

-            UpdaterWindow window = new UpdaterWindow(

+            SdkUpdaterWindow window = new SdkUpdaterWindow(

                     AdtPlugin.getDisplay().getActiveShell(),

                     new AdtConsoleSdkLog(),

                     sdk.getSdkLocation(),

-                    InvocationContext.IDE);

+                    SdkInvocationContext.IDE);

 

             ISdkChangeListener listener = new ISdkChangeListener() {

                 public void onSdkLoaded() {

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java
index 4db603e..1b17e09 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java
@@ -30,6 +30,7 @@ import com.android.ddmlib.AndroidDebugBridge.IDebugBridgeChangeListener;
 import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
 import com.android.ddmlib.ClientData.DebuggerStatus;
 import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.ide.eclipse.adt.internal.actions.SdkAvdManagerAction;
 import com.android.ide.eclipse.adt.internal.launch.AndroidLaunchConfiguration.TargetMode;
 import com.android.ide.eclipse.adt.internal.launch.DelayedLaunchInfo.InstallRetryMode;
 import com.android.ide.eclipse.adt.internal.launch.DeviceChooserDialog.DeviceChooserResponse;
@@ -39,7 +40,6 @@ import com.android.ide.eclipse.adt.internal.project.ApkInstallManager;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
 import com.android.ide.eclipse.adt.internal.project.ProjectHelper;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
-import com.android.ide.eclipse.adt.internal.wizards.actions.AvdManagerAction;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
@@ -497,7 +497,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
                             Shell shell = display.getActiveShell();
                             if (MessageDialog.openQuestion(shell, "Android AVD Error",
                                     "No compatible targets were found. Do you wish to a add new Android Virtual Device?")) {
-                                AvdManagerAction action = new AvdManagerAction();
+                                SdkAvdManagerAction action = new SdkAvdManagerAction();
                                 action.run(null /*action*/);
                                 searchAgain[0] = true;
                             }