From fa2543456db57466d0d26b5826d664c80b5305e8 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Tue, 16 Jun 2009 16:33:34 -0700
Subject: SDK Updater: remove UpdaterData.Display

---
 .../com/android/sdkuilib/internal/repository/UpdaterData.java  | 10 ++--------
 .../sdkuilib/internal/repository/UpdaterWindowImpl.java        |  9 ++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'sdkmanager')

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index a1b2594..77760a3 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -30,7 +30,6 @@ import com.android.sdklib.internal.repository.RepoSource;
 import com.android.sdklib.internal.repository.RepoSources;
 import com.android.sdkuilib.internal.repository.icons.ImageFactory;
 
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import java.util.ArrayList;
@@ -63,7 +62,6 @@ class UpdaterData {
 
     private final ArrayList<ISdkListener> mListeners = new ArrayList<ISdkListener>();
 
-    /** @deprecated */private Display mDisplay;  // TODO remove
     private Shell mWindowShell;
 
     public interface ISdkListener {
@@ -90,10 +88,6 @@ class UpdaterData {
         return mOsSdkRoot;
     }
 
-    public void setDisplay(Display display) {
-        mDisplay = display;
-    }
-
     public void setTaskFactory(ITaskFactory taskFactory) {
         mTaskFactory = taskFactory;
     }
@@ -235,8 +229,8 @@ class UpdaterData {
      * <p/>This can be called from any thread.
      */
     public void notifyListeners() {
-        if (mDisplay != null && mListeners.size() > 0) {
-            mDisplay.syncExec(new Runnable() {
+        if (mWindowShell != null && mListeners.size() > 0) {
+            mWindowShell.getDisplay().syncExec(new Runnable() {
                 public void run() {
                     for (ISdkListener listener : mListeners) {
                         try {
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
index 48a155f..952e18a 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java
@@ -85,7 +85,7 @@ public class UpdaterWindowImpl {
         mAndroidSdkUpdater.open();
         mAndroidSdkUpdater.layout();
 
-        firstInit();    //$hide$ (hide from SWT designer)
+        postCreate();    //$hide$ (hide from SWT designer)
 
         Display display = Display.getDefault();
         while (!mAndroidSdkUpdater.isDisposed()) {
@@ -105,7 +105,6 @@ public class UpdaterWindowImpl {
                 onAndroidSdkUpdaterDispose();    //$hide$ (hide from SWT designer)
             }
         });
-        mUpdaterData.setDisplay(mAndroidSdkUpdater.getDisplay());
 
         FillLayout fl;
         mAndroidSdkUpdater.setLayout(fl = new FillLayout(SWT.HORIZONTAL));
@@ -200,7 +199,7 @@ public class UpdaterWindowImpl {
      * Once the UI has been created, initializes the content.
      * This creates the pages, selects the first one, setup sources and scan for local folders.
      */
-    private void firstInit() {
+    private void postCreate() {
         mUpdaterData.setWindowShell(getShell());
         mTaskFactory = new ProgressTaskFactory(getShell());
         mUpdaterData.setTaskFactory(mTaskFactory);
@@ -208,8 +207,8 @@ public class UpdaterWindowImpl {
 
         setWindowImage(mAndroidSdkUpdater);
 
-        addPage(mAvdManagerPage, "Virtual Devices");
-        addPage(mLocalPackagePage, "Installed Packages");
+        addPage(mAvdManagerPage,     "Virtual Devices");
+        addPage(mLocalPackagePage,   "Installed Packages");
         addPage(mRemotePackagesPage, "Available Packages");
         addExtraPages();
 
-- 
cgit v1.1