Fix to edit window with WindowsBuilder.

Change-Id: I19e6933abac980cf688860e37436455bd5787909

1 files changed, 15 insertions, 3 deletions

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 88fd754..b5122d7 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
@@ -143,9 +143,7 @@ public class UpdaterWindowImpl {
         mStackLayout = new StackLayout();

         mPagesRootComposite.setLayout(mStackLayout);

 

-        mAvdManagerPage = new AvdManagerPage(mPagesRootComposite, mUpdaterData);

-        mLocalPackagePage = new LocalPackagesPage(mPagesRootComposite, mUpdaterData);

-        mRemotePackagesPage = new RemotePackagesPage(mPagesRootComposite, mUpdaterData);

+        createPages();

 

         mSashForm.setWeights(new int[] {150, 576});

     }

@@ -212,6 +210,20 @@ public class UpdaterWindowImpl {
 

 

     /**

+     * Called by {@link #createContents()} to generate the pages that can be

+     * displayed in the window.

+     * <p/>

+     * Implementation detail: This is extracted from {@link #createContents()}

+     * so that we can skip it when using WindowsBuilder, since {@link #mUpdaterData}

+     * will then be null.

+     */

+    private void createPages() {

+        mAvdManagerPage = new AvdManagerPage(mPagesRootComposite, mUpdaterData);

+        mLocalPackagePage = new LocalPackagesPage(mPagesRootComposite, mUpdaterData);

+        mRemotePackagesPage = new RemotePackagesPage(mPagesRootComposite, mUpdaterData);

+    }

+

+    /**

      * Helper to return the SWT shell.

      */

     private Shell getShell() {