# Set up prog to be the path of this script, including following symlinks,
# and set up progdir to be the fully-qualified pathname of its directory.
+
prog="$0"
while [ -h "${prog}" ]; do
newProg=`/bin/ls -ld "${prog}"`
exit 1
fi
+
# Check args.
if [ debug = "$1" ]; then
# add this in for debugging
java_debug=
fi
+javaCmd="java"
+
# Mac OS X needs an additional arg, or you get an "illegal thread" complaint.
if [ `uname` = "Darwin" ]; then
- os_opts="-XstartOnFirstThread"
+ os_opts=
+# os_opts="-XstartOnFirstThread"
else
os_opts=
fi
export GDK_NATIVE_WINDOWS=true
fi
-if [ "$OSTYPE" = "cygwin" ] ; then
- jarpath=`cygpath -w "$frameworkdir/$jarfile"`
- progdir=`cygpath -w "$progdir"`
-else
- jarpath="$frameworkdir/$jarfile"
-fi
+jarpath="$frameworkdir/$jarfile"
# Figure out the path to the swt.jar for the current architecture.
# if ANDROID_SWT is defined, then just use this.
if [ -n "$ANDROID_SWT" ]; then
swtpath="$ANDROID_SWT"
else
- vmarch=`java -jar "${frameworkdir}"/archquery.jar`
+ vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`
if [ -n "$ANDROID_BUILD_TOP" ]; then
osname=`uname -s | tr A-Z a-z`
swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
fi
fi
-# Combine the swtpath and the framework dir path.
-if [ -d "$swtpath" ]; then
- frameworkdir="${swtpath}:${frameworkdir}"
-else
+if [ ! -d "$swtpath" ]; then
echo "SWT folder '${swtpath}' does not exist."
echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform."
exit 1
# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
# might need more memory, e.g. -Xmx128M
-exec java -Xmx512M $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.hierarchyviewer.bindir="$progdir" -jar "$jarpath" "$@"
+exec "$javaCmd" -Xmx5126M $os_opts $java_debug -Dcom.android.hierarchyviewer.bindir="$progdir" -classpath "$jarpath:$swtpath/swt.jar" com.android.hierarchyviewer.HierarchyViewerApplication "$@"
package com.android.hierarchyviewer;
+import com.android.ddmlib.Log;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewer.actions.AboutAction;
import com.android.hierarchyviewer.actions.LoadAllViewsAction;
public class HierarchyViewerApplication extends ApplicationWindow {
private static final int INITIAL_WIDTH = 1024;
-
private static final int INITIAL_HEIGHT = 768;
- private static HierarchyViewerApplication mApp;
+ private static HierarchyViewerApplication sMainWindow;
// Images for moving between the 3 main windows.
-
private Image mDeviceViewImage;
-
private Image mPixelPerfectImage;
-
private Image mTreeViewImage;
-
private Image mDeviceViewSelectedImage;
-
private Image mPixelPerfectSelectedImage;
-
private Image mTreeViewSelectedImage;
// And their buttons
-
private Button mTreeViewButton;
-
private Button mPixelPerfectButton;
-
private Button mDeviceViewButton;
private Label mProgressLabel;
-
private ProgressBar mProgressBar;
-
private String mProgressString;
private Composite mDeviceSelectorPanel;
-
private Composite mTreeViewPanel;
-
private Composite mPixelPerfectPanel;
-
private StackLayout mMainWindowStackLayout;
-
private DeviceSelector mDeviceSelector;
-
private Composite mStatusBar;
-
private TreeView mTreeView;
-
private Composite mMainWindow;
-
private Image mOnBlackImage;
-
private Image mOnWhiteImage;
-
private Button mOnBlackWhiteButton;
-
private Button mShowExtras;
-
private LayoutViewer mLayoutViewer;
-
private PixelPerfectLoupe mPixelPerfectLoupe;
-
private Composite mTreeViewControls;
- public static final HierarchyViewerApplication getApp() {
- return mApp;
+ private HierarchyViewerDirector mDirector;
+
+ /*
+ * If a thread bails with an uncaught exception, bring the whole
+ * thing down.
+ */
+ private static class UncaughtHandler implements Thread.UncaughtExceptionHandler {
+ public void uncaughtException(Thread t, Throwable e) {
+ Log.e("HierarchyViewer", "shutting down due to uncaught exception");
+ Log.e("HierarchyViewer", e);
+ System.exit(1);
+ }
+ }
+
+ public static final HierarchyViewerApplication getMainWindow() {
+ return sMainWindow;
}
public HierarchyViewerApplication() {
- super(null);
+ super(null /*shell*/);
- mApp = this;
+ sMainWindow = this;
addMenuBar();
}
}
public void run() {
- HierarchyViewerDirector director = HierarchyViewerApplicationDirector.createDirector();
- director.initDebugBridge();
- director.startListenForDevices();
- director.populateDeviceSelectionModel();
- TreeViewModel.getModel().addTreeChangeListener(treeChangeListener);
- PixelPerfectModel.getModel().addImageChangeListener(imageChangeListener);
-
setBlockOnOpen(true);
open();
- TreeViewModel.getModel().removeTreeChangeListener(treeChangeListener);
- PixelPerfectModel.getModel().removeImageChangeListener(imageChangeListener);
+ TreeViewModel.getModel().removeTreeChangeListener(mTreeChangeListener);
+ PixelPerfectModel.getModel().removeImageChangeListener(mImageChangeListener);
- Display.getCurrent().dispose();
ImageLoader.dispose();
- director.stopListenForDevices();
- director.stopDebugBridge();
- director.terminate();
+ mDirector.stopListenForDevices();
+ mDirector.stopDebugBridge();
+ mDirector.terminate();
}
@Override
@Override
protected Control createContents(Composite parent) {
+ // create this only once the window is opened to please SWT on Mac
+ mDirector = HierarchyViewerApplicationDirector.createDirector();
+ mDirector.initDebugBridge();
+ mDirector.startListenForDevices();
+ mDirector.populateDeviceSelectionModel();
+
+ TreeViewModel.getModel().addTreeChangeListener(mTreeChangeListener);
+ PixelPerfectModel.getModel().addImageChangeListener(mImageChangeListener);
+
loadResources();
Composite control = new Composite(parent, SWT.NONE);
MenuManager mm = getMenuBarManager();
mm.removeAll();
- MenuManager file = new MenuManager("&File");
- mm.add(file);
+ String os = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os.startsWith("Mac OS") == false) { //$NON-NLS-1$
+ MenuManager file = new MenuManager("&File");
+ mm.add(file);
- file.add(QuitAction.getAction());
+ file.add(QuitAction.getAction());
+ }
MenuManager device = new MenuManager("&Devices");
mm.add(device);
MenuManager mm = getMenuBarManager();
mm.removeAll();
- MenuManager file = new MenuManager("&File");
- mm.add(file);
+ String os = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os.startsWith("Mac OS") == false) { //$NON-NLS-1$
+ MenuManager file = new MenuManager("&File");
+ mm.add(file);
- file.add(QuitAction.getAction());
+ file.add(QuitAction.getAction());
+ }
MenuManager treeViewMenu = new MenuManager("&Tree View");
mm.add(treeViewMenu);
MenuManager mm = getMenuBarManager();
mm.removeAll();
- MenuManager file = new MenuManager("&File");
- mm.add(file);
+ String os = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os.startsWith("Mac OS") == false) { //$NON-NLS-1$
+ MenuManager file = new MenuManager("&File");
+ mm.add(file);
- file.add(QuitAction.getAction());
+ file.add(QuitAction.getAction());
+ }
MenuManager pixelPerfect = new MenuManager("&Pixel Perfect");
pixelPerfect.add(SavePixelPerfectAction.getAction(getShell()));
}
};
- private ITreeChangeListener treeChangeListener = new ITreeChangeListener() {
+ private ITreeChangeListener mTreeChangeListener = new ITreeChangeListener() {
public void selectionChanged() {
// pass
}
}
};
- private IImageChangeListener imageChangeListener = new IImageChangeListener() {
+ private IImageChangeListener mImageChangeListener = new IImageChangeListener() {
public void crosshairMoved() {
// pass
};
public static void main(String[] args) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- new HierarchyViewerApplication().run();
- }
- });
- System.exit(0);
+ Thread.setDefaultUncaughtExceptionHandler(new UncaughtHandler());
+
+ Display.setAppName("HierarchyViewer");
+ new HierarchyViewerApplication().run();
}
}
OSDN Git Service
