Fix android.bat for Windows SDK.

android.bat was not properly copying swtmenbar.jar
to the temp folder, so it wasn't found at runtime.

Also added some debug info wrapping the menu bar usage
and a comment on how to remotely debug the swtmanager.

(cherry picked from commit 0447f74bfd36d3c458f478fa637eee377f313f3f)

Change-Id: Ib10d974a518e65ae38f66af641ccbf8cb85689d3

3 files changed, 43 insertions, 31 deletions

diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index 0d837341c..f616dd700 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -60,6 +60,7 @@ if not "%1"=="" goto EndTempCopy
     copy /B /D /Y lib\sdk*               %tmp_dir%\lib\        > nul

     copy /B /D /Y lib\common.jar         %tmp_dir%\lib\        > nul

     copy /B /D /Y lib\commons-compress*  %tmp_dir%\lib\        > nul

+    copy /B /D /Y lib\swtmenubar.jar     %tmp_dir%\lib\        > nul

 

     rem jar_path and swt_path are relative to PWD so we don't need to adjust them, just change dirs.

     set tools_dir=%cd%

@@ -77,6 +78,7 @@ if exist %swt_path% goto SetPath
 

 :SetPath

 rem Finally exec the java program and end here.

-call %java_exe% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir=%work_dir% -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*

+REM set REMOTE_DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000

+call %java_exe% %REMOTE_DEBUG% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir=%work_dir% -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %*

 

 rem EOF

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
index 73576413d..69d4619db 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerWindowImpl1.java
@@ -229,24 +229,29 @@ public class AvdManagerWindowImpl1 {
             // would fail to load. The MenuBarWrapper below helps to make

             // that indirection.

 

-            new MenuBarWrapper(APP_NAME_MAC_MENU, menuTools) {

-                @Override

-                public void onPreferencesMenuSelected() {

-                    showRegisteredPage(Purpose.SETTINGS);

-                }

+            try {

+                new MenuBarWrapper(APP_NAME_MAC_MENU, menuTools) {

+                    @Override

+                    public void onPreferencesMenuSelected() {

+                        showRegisteredPage(Purpose.SETTINGS);

+                    }

 

-                @Override

-                public void onAboutMenuSelected() {

-                    showRegisteredPage(Purpose.ABOUT_BOX);

-                }

+                    @Override

+                    public void onAboutMenuSelected() {

+                        showRegisteredPage(Purpose.ABOUT_BOX);

+                    }

 

-                @Override

-                public void printError(String format, Object... args) {

-                    if (mUpdaterData != null) {

-                        mUpdaterData.getSdkLog().error(null, format, args);

+                    @Override

+                    public void printError(String format, Object... args) {

+                        if (mUpdaterData != null) {

+                            mUpdaterData.getSdkLog().error(null, format, args);

+                        }

                     }

-                }

-            };

+                };

+            } catch (Exception e) {

+                mUpdaterData.getSdkLog().error(e, "Failed to setup menu bar");

+                e.printStackTrace();

+            }

         }

     }

 

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
index 4be44484b..3ba9887c0 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SdkUpdaterWindowImpl2.java
@@ -305,24 +305,29 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow {
             // would fail to load. The MenuBarWrapper below helps to make

             // that indirection.

 

-            new MenuBarWrapper(APP_NAME, menuTools) {

-                @Override

-                public void onPreferencesMenuSelected() {

-                    showRegisteredPage(Purpose.SETTINGS);

-                }

+            try {

+                new MenuBarWrapper(APP_NAME, menuTools) {

+                    @Override

+                    public void onPreferencesMenuSelected() {

+                        showRegisteredPage(Purpose.SETTINGS);

+                    }

 

-                @Override

-                public void onAboutMenuSelected() {

-                    showRegisteredPage(Purpose.ABOUT_BOX);

-                }

+                    @Override

+                    public void onAboutMenuSelected() {

+                        showRegisteredPage(Purpose.ABOUT_BOX);

+                    }

 

-                @Override

-                public void printError(String format, Object... args) {

-                    if (mUpdaterData != null) {

-                        mUpdaterData.getSdkLog().error(null, format, args);

+                    @Override

+                    public void printError(String format, Object... args) {

+                        if (mUpdaterData != null) {

+                            mUpdaterData.getSdkLog().error(null, format, args);

+                        }

                     }

-                }

-            };

+                };

+            } catch (Exception e) {

+                mUpdaterData.getSdkLog().error(e, "Failed to setup menu bar");

+                e.printStackTrace();

+            }

         }

     }