Refactoring and integrating into Eclipse
Change-Id: I1fd3c3828fb2474f2f7394ee2831fcd7eb675878
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project
new file mode 100644
index 0000000..6f5c27e
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>hierarchyviewer-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
new file mode 100644
index 0000000..a2f2305
--- /dev/null
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="com.android.ide.eclipse.hierarchyviewer"
+ label="Android Hierarchy Viewer"
+ version="0.9.8.qualifier"
+ provider-name="The Android Open Source Project"
+ plugin="com.android.ide.eclipse.hierarchyviewer">
+
+ <description>
+ Android Hierarchy Viewer.
+ </description>
+
+ <copyright>
+ Copyright (C) 2010 The Android Open Source Project
+ </copyright>
+
+ <license url="http://www.apache.org/licenses/LICENSE-2.0.txt">
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ </license>
+
+ <url>
+ <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
+ </url>
+
+ <requires>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.ui.console"/>
+ <import plugin="com.android.ide.eclipse.ddms" match="perfect"/>
+ </requires>
+
+ <plugin
+ id="com.android.ide.eclipse.hierarchyviewer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 25e8d3d..af646d7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@
Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin
Bundle-Vendor: The Android Open Source Project
Require-Bundle: com.android.ide.eclipse.ddms,
+ com.android.ide.eclipse.hierarchyviewer,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
index 429a7f3..41771f1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
@@ -46,6 +46,7 @@
import com.android.ide.eclipse.adt.internal.ui.EclipseUiHelper;
import com.android.ide.eclipse.adt.internal.wizards.export.ExportWizard;
import com.android.ide.eclipse.ddms.DdmsPlugin;
+import com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkConstants;
import com.android.sdkstats.SdkStatsService;
@@ -276,6 +277,7 @@
// finally restart adb, in case it's a different version
DdmsPlugin.setAdb(getOsAbsoluteAdb(), true /* startAdb */);
+ HierarchyViewerPlugin.setAdb(getOsAbsoluteAdb(), true /* startAdb */);
// get the SDK location and build id.
if (checkSdkLocationAndId()) {
@@ -297,6 +299,7 @@
String osSdkLocation = AdtPrefs.getPrefs().getOsSdkFolder();
if (osSdkLocation.length() > 0) {
DdmsPlugin.setAdb(getOsAbsoluteAdb(), true);
+ HierarchyViewerPlugin.setAdb(getOsAbsoluteAdb(), true);
}
// and give it the debug launcher for android projects
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/Perspective.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/Perspective.java
index b582ee2..77b0188 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/Perspective.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/Perspective.java
@@ -29,6 +29,8 @@
public class Perspective implements IPerspectiveFactory {
+ public static String ID = "com.android.ide.eclipse.ddms.Perspective";
+
public void createInitialLayout(IPageLayout layout) {
// create a default layout that looks like the stand alone DDMS.
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
index f3f5310..90a300d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/.classpath
@@ -3,6 +3,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="libs/hierarchyviewerlib.jar" sourcepath="/ddmlib"/>
+ <classpathentry kind="lib" path="libs/hierarchyviewerlib.jar" sourcepath="/hierarchyviewerlib"/>
+ <classpathentry kind="lib" path="libs/ddmlib.jar" sourcepath="/ddmlib"/>
+ <classpathentry kind="lib" path="libs/ddmuilib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index 716c0f4..6458f58 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
@@ -2,13 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Hierarchy Viewer
Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.8.qualifier
Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin
Bundle-Vendor: The Android Open Source Project
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.console,
+ com.android.ide.eclipse.ddms
Bundle-ClassPath: .,
libs/hierarchyviewerlib.jar,
- libs/hierearchyvieweruilib.jar
+ libs/ddmlib.jar,
+ libs/ddmuilib.jar
+Export-Package: com.android.ide.eclipse.hierarchyviewer
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
index 7fce1ca..a1a2606 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/build.properties
@@ -4,4 +4,5 @@
icons/,\
plugin.xml,\
.,\
- libs/
\ No newline at end of file
+ libs/
+bin.excludes = libs/.gitignore
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/device.png b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/device.png
new file mode 100644
index 0000000..7dbbbb6
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/device.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/pixel-perfect.png b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/pixel-perfect.png
new file mode 100644
index 0000000..6e51701
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/pixel-perfect.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/sample.gif b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/tree-view.png b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/tree-view.png
new file mode 100644
index 0000000..8f01dda
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/icons/tree-view.png
Binary files differ
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/plugin.xml
index 06e1f14..b8a6762 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/plugin.xml
@@ -3,28 +3,89 @@
<plugin>
<extension
point="org.eclipse.ui.views">
- <category
- id="com.android.ide.eclipse.ddms.views.category"
- name="Android">
- </category>
<view
+ allowMultiple="false"
category="com.android.ide.eclipse.ddms.views.category"
- class="com.android.ide.eclipse.hierarchyviewer.views.SampleView"
- icon="icons/sample.gif"
- id="com.android.ide.eclipse.hierarchyviewer.views.SampleView"
- name="Sample View">
+ class="com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView"
+ icon="icons/device.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView"
+ name="Windows">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView"
+ icon="icons/pixel-perfect.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView"
+ name="Pixel Perfect">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectLoupeView"
+ icon="icons/pixel-perfect.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectLoupeView"
+ name="Pixel Perfect Loupe">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView"
+ icon="icons/pixel-perfect.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView"
+ name="Pixel Perfect Tree">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.TreeViewView"
+ icon="icons/tree-view.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.TreeViewView"
+ name="Tree View">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.PropertyView"
+ icon="icons/tree-view.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.PropertyView"
+ name="View Properties">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView"
+ icon="icons/tree-view.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView"
+ name="Tree Overview">
+ </view>
+ <view
+ allowMultiple="false"
+ category="com.android.ide.eclipse.ddms.views.category"
+ class="com.android.ide.eclipse.hierarchyviewer.views.LayoutView"
+ icon="icons/tree-view.png"
+ id="com.android.ide.eclipse.hierarchyviewer.views.LayoutView"
+ name="Layout View">
</view>
</extension>
<extension
+ point="org.eclipse.ui.perspectives">
+ <perspective
+ class="com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective"
+ icon="icons/pixel-perfect.png"
+ id="com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective"
+ name="Pixel Perfect"/>
+ <perspective
+ class="com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective"
+ icon="icons/tree-view.png"
+ id="com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective"
+ name="Hierarchy View"/>
+ </extension>
+ <extension
point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="org.eclipse.jdt.ui.JavaPerspective">
- <view
- id="com.android.ide.eclipse.hierarchyviewer.views.SampleView"
- ratio="0.5"
- relationship="right"
- relative="org.eclipse.ui.views.TaskList">
- </view>
+ <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
+ <perspectiveShortcut id="com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective"/>
+ <perspectiveShortcut id="com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective"/>
</perspectiveExtension>
</extension>
</plugin>
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPlugin.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPlugin.java
index b6f0ed3..8996cdb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPlugin.java
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPlugin.java
@@ -16,9 +16,25 @@
package com.android.ide.eclipse.hierarchyviewer;
+import com.android.ddmlib.AndroidDebugBridge;
+import com.android.ddmlib.Log;
+import com.android.ddmlib.Log.ILogOutput;
+import com.android.ddmlib.Log.LogLevel;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.console.ConsolePlugin;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.MessageConsole;
+import org.eclipse.ui.console.MessageConsoleStream;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import java.util.Calendar;
+
/**
* The activator class controls the plug-in life cycle
*/
@@ -26,18 +42,85 @@
public static final String PLUGIN_ID = "com.android.ide.eclipse.hierarchyviewer";
+ public static final String ADB_LOCATION = PLUGIN_ID + ".adb";
+
// The shared instance
private static HierarchyViewerPlugin plugin;
+ private Color redColor;
+
/**
* The constructor
*/
public HierarchyViewerPlugin() {
}
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+
+
+ // set the consoles.
+ final MessageConsole messageConsole = new MessageConsole("Hierarchy Viewer", null); // $NON-NLS-1$
+ ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] {
+ messageConsole
+ });
+
+ final MessageConsoleStream consoleStream = messageConsole.newMessageStream();
+ final MessageConsoleStream errorConsoleStream = messageConsole.newMessageStream();
+ redColor = new Color(Display.getDefault(), 0xFF, 0x00, 0x00);
+
+ // because this can be run, in some cases, by a non UI thread, and
+ // because
+ // changing the console properties update the UI, we need to make this
+ // change
+ // in the UI thread.
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ errorConsoleStream.setColor(redColor);
+ }
+ });
+
+ // set up the ddms log to use the ddms console.
+ Log.setLogOutput(new ILogOutput() {
+ public void printLog(LogLevel logLevel, String tag, String message) {
+ if (logLevel.getPriority() >= LogLevel.ERROR.getPriority()) {
+ printToStream(errorConsoleStream, tag, message);
+ ConsolePlugin.getDefault().getConsoleManager().showConsoleView(messageConsole);
+ } else {
+ printToStream(consoleStream, tag, message);
+ }
+ }
+
+ public void printAndPromptLog(final LogLevel logLevel, final String tag,
+ final String message) {
+ printLog(logLevel, tag, message);
+ // dialog box only run in UI thread..
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ Shell shell = Display.getDefault().getActiveShell();
+ if (logLevel == LogLevel.ERROR) {
+ MessageDialog.openError(shell, tag, message);
+ } else {
+ MessageDialog.openWarning(shell, tag, message);
+ }
+ }
+ });
+ }
+
+ });
+
+ final HierarchyViewerDirector director = HierarchyViewerPluginDirector.createDirector();
+
+ new Thread() {
+ @Override
+ public void run() {
+ director.initDebugBridge();
+ director.startListenForDevices();
+ director.populateDeviceSelectionModel();
+ }
+ }.start();
}
/*
@@ -46,9 +129,17 @@
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
* )
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
+
+ redColor.dispose();
+
+ HierarchyViewerDirector director = HierarchyViewerDirector.getDirector();
+ director.stopListenForDevices();
+ director.stopDebugBridge();
+ director.terminate();
}
/**
@@ -56,8 +147,63 @@
*
* @return the shared instance
*/
- public static HierarchyViewerPlugin getDefault() {
+ public static HierarchyViewerPlugin getPlugin() {
return plugin;
}
+ /**
+ * Set the location of the adb executable and optionally starts adb
+ *
+ * @param adb location of adb
+ * @param startAdb flag to start adb
+ */
+ public static void setAdb(String adb, boolean startAdb) {
+ if (adb != null) {
+ // store the location for future ddms only start.
+ plugin.getPreferenceStore().setValue(ADB_LOCATION, adb);
+
+ // starts the server in a thread in case this is blocking.
+ if (startAdb) {
+ new Thread() {
+ @Override
+ public void run() {
+ HierarchyViewerDirector.getDirector().initDebugBridge();
+ HierarchyViewerDirector.getDirector().startListenForDevices();
+ HierarchyViewerDirector.getDirector().populateDeviceSelectionModel();
+ }
+ }.start();
+ }
+ }
+ }
+
+ /**
+ * Prints a message, associated with a project to the specified stream
+ *
+ * @param stream The stream to write to
+ * @param tag The tag associated to the message. Can be null
+ * @param message The message to print.
+ */
+ private static synchronized void printToStream(MessageConsoleStream stream, String tag,
+ String message) {
+ String dateTag = getMessageTag(tag);
+
+ stream.print(dateTag);
+ stream.println(message);
+ }
+
+ /**
+ * Creates a string containing the current date/time, and the tag
+ *
+ * @param tag The tag associated to the message. Can be null
+ * @return The dateTag
+ */
+ private static String getMessageTag(String tag) {
+ Calendar c = Calendar.getInstance();
+
+ if (tag == null) {
+ return String.format("[%1$tF %1$tT]", c);
+ }
+
+ return String.format("[%1$tF %1$tT - %2$s]", c, tag);
+ }
}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPluginDirector.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPluginDirector.java
new file mode 100644
index 0000000..f1374ae
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/HierarchyViewerPluginDirector.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer;
+
+import com.android.ddmlib.IDevice;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.device.Window;
+import com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView;
+import com.android.ide.eclipse.hierarchyviewer.views.PropertyView;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+public class HierarchyViewerPluginDirector extends HierarchyViewerDirector {
+
+ public static HierarchyViewerDirector createDirector() {
+ return director = new HierarchyViewerPluginDirector();
+ }
+
+ @Override
+ public void executeInBackground(final String taskName, final Runnable task) {
+ Job job = new Job(taskName) {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ task.run();
+ return Status.OK_STATUS;
+ }
+ };
+ job.setPriority(Job.SHORT);
+ job.setRule(schedulingRule);
+ job.schedule();
+ }
+
+ private ISchedulingRule schedulingRule = new ISchedulingRule() {
+ public boolean contains(ISchedulingRule rule) {
+ return rule == this;
+ }
+
+ public boolean isConflicting(ISchedulingRule rule) {
+ return rule == this;
+ }
+
+ };
+
+ @Override
+ public String getAdbLocation() {
+ return HierarchyViewerPlugin.getPlugin().getPreferenceStore().getString(
+ HierarchyViewerPlugin.ADB_LOCATION);
+ }
+
+ @Override
+ public void loadViewTreeData(Window window) {
+ super.loadViewTreeData(window);
+
+ // The windows tab hides the property tab, so let's bring the property
+ // tab
+ // forward.
+
+ IWorkbenchWindow[] windows =
+ HierarchyViewerPlugin.getPlugin().getWorkbench().getWorkbenchWindows();
+ for (IWorkbenchWindow currentWindow : windows) {
+ IWorkbenchPage page = currentWindow.getActivePage();
+ if (page.getPerspective().getId().equals(TreeViewPerspective.ID)) {
+ try {
+ IWorkbenchPart part = page.findView(PropertyView.ID);
+ if (part != null) {
+ page.showView(PropertyView.ID);
+ }
+ } catch (PartInitException e) {
+
+ }
+ }
+ }
+ }
+
+ @Override
+ public void loadPixelPerfectData(IDevice device) {
+ super.loadPixelPerfectData(device);
+
+ // The windows tab hides the tree tab, so let's bring the tree tab
+ // forward.
+
+ IWorkbenchWindow[] windows =
+ HierarchyViewerPlugin.getPlugin().getWorkbench().getWorkbenchWindows();
+ for (IWorkbenchWindow window : windows) {
+ IWorkbenchPage page = window.getActivePage();
+ if (page.getPerspective().getId().equals(PixelPerfectPespective.ID)) {
+ try {
+ IWorkbenchPart part = page.findView(PixelPerfectTreeView.ID);
+ if (part != null) {
+ page.showView(PixelPerfectTreeView.ID);
+ }
+ } catch (PartInitException e) {
+
+ }
+ }
+ }
+ }
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/PixelPerfectPespective.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/PixelPerfectPespective.java
new file mode 100644
index 0000000..bcaf8f9
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/PixelPerfectPespective.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer;
+
+import com.android.ide.eclipse.ddms.Perspective;
+import com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView;
+import com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectLoupeView;
+import com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView;
+import com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView;
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+public class PixelPerfectPespective implements IPerspectiveFactory {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective";
+
+ public void createInitialLayout(IPageLayout layout) {
+ layout.setEditorAreaVisible(false);
+
+ String editorArea = layout.getEditorArea();
+ IFolderLayout folder;
+
+ folder = layout.createFolder("tree", IPageLayout.LEFT, 0.25f, editorArea);
+ folder.addView(DeviceSelectorView.ID);
+ folder.addView(PixelPerfectTreeView.ID);
+
+ folder = layout.createFolder("overview", IPageLayout.RIGHT, 0.4f, editorArea);
+ folder.addView(PixelPerfectView.ID);
+
+ folder = layout.createFolder("main", IPageLayout.RIGHT, 0.35f, editorArea);
+ folder.addView(PixelPerfectLoupeView.ID);
+
+
+ layout.addShowViewShortcut(DeviceSelectorView.ID);
+ layout.addShowViewShortcut(PixelPerfectTreeView.ID);
+ layout.addShowViewShortcut(PixelPerfectLoupeView.ID);
+ layout.addShowViewShortcut(PixelPerfectView.ID);
+
+ layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective");
+ layout.addPerspectiveShortcut(TreeViewPerspective.ID);
+ layout.addPerspectiveShortcut(Perspective.ID);
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/TreeViewPerspective.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/TreeViewPerspective.java
new file mode 100644
index 0000000..7022509
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/TreeViewPerspective.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer;
+
+import com.android.ide.eclipse.ddms.Perspective;
+import com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView;
+import com.android.ide.eclipse.hierarchyviewer.views.LayoutView;
+import com.android.ide.eclipse.hierarchyviewer.views.PropertyView;
+import com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView;
+import com.android.ide.eclipse.hierarchyviewer.views.TreeViewView;
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+public class TreeViewPerspective implements IPerspectiveFactory {
+
+ public static final String ID = "com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective";
+
+ public void createInitialLayout(IPageLayout layout) {
+ layout.setEditorAreaVisible(false);
+
+ String editorArea = layout.getEditorArea();
+ IFolderLayout folder;
+
+ folder = layout.createFolder("properties", IPageLayout.LEFT, 0.10f, editorArea);
+ folder.addView(DeviceSelectorView.ID);
+ folder.addView(PropertyView.ID);
+
+ folder = layout.createFolder("main", IPageLayout.RIGHT, 0.24f, "properties");
+ folder.addView(TreeViewView.ID);
+
+ folder = layout.createFolder("panel-top", IPageLayout.RIGHT, 0.7f, "main");
+ folder.addView(TreeOverviewView.ID);
+
+
+ folder = layout.createFolder("panel-bottom", IPageLayout.BOTTOM, 0.5f, "panel-top");
+ folder.addView(LayoutView.ID);
+
+ layout.addShowViewShortcut(DeviceSelectorView.ID);
+ layout.addShowViewShortcut(PropertyView.ID);
+ layout.addShowViewShortcut(TreeOverviewView.ID);
+ layout.addShowViewShortcut(LayoutView.ID);
+ layout.addShowViewShortcut(TreeViewView.ID);
+
+ layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective");
+ layout.addPerspectiveShortcut(PixelPerfectPespective.ID);
+ layout.addPerspectiveShortcut(Perspective.ID);
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/DeviceSelectorView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/DeviceSelectorView.java
new file mode 100644
index 0000000..c884115
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/DeviceSelectorView.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.actions.InspectScreenshotAction;
+import com.android.hierarchyviewerlib.actions.LoadViewHierarchyAction;
+import com.android.hierarchyviewerlib.actions.RefreshWindowsAction;
+import com.android.hierarchyviewerlib.ui.DeviceSelector;
+import com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective;
+import com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IPerspectiveDescriptor;
+import org.eclipse.ui.IPerspectiveListener;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.part.ViewPart;
+
+public class DeviceSelectorView extends ViewPart implements IPerspectiveListener {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView";
+
+ private DeviceSelector deviceSelector;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ parent.setLayout(new FillLayout());
+
+
+ IPerspectiveDescriptor perspective = getViewSite().getPage().getPerspective();
+ boolean doTreeViewStuff = true;
+ boolean doPixelPerfectStuff = true;
+ if (perspective.getId().equals(PixelPerfectPespective.ID)) {
+ doTreeViewStuff = false;
+ } else if (perspective.getId().equals(TreeViewPerspective.ID)) {
+ doPixelPerfectStuff = false;
+ }
+ deviceSelector = new DeviceSelector(parent, doTreeViewStuff, doPixelPerfectStuff);
+
+ placeActions(doTreeViewStuff, doPixelPerfectStuff);
+
+ getViewSite().getWorkbenchWindow().addPerspectiveListener(this);
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ getViewSite().getWorkbenchWindow().removePerspectiveListener(this);
+ }
+
+ private void placeActions(boolean doTreeViewStuff, boolean doPixelPerfectStuff) {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(RefreshWindowsAction.getAction());
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(RefreshWindowsAction.getAction());
+
+ if (doTreeViewStuff) {
+ mm.add(LoadViewHierarchyAction.getAction());
+ tm.add(LoadViewHierarchyAction.getAction());
+ }
+ if (doPixelPerfectStuff) {
+ mm.add(InspectScreenshotAction.getAction());
+ tm.add(InspectScreenshotAction.getAction());
+ }
+
+ mm.updateAll(true);
+ tm.update(true);
+ actionBars.updateActionBars();
+ }
+
+ @Override
+ public void setFocus() {
+ deviceSelector.setFocus();
+ }
+
+ public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
+ if (perspective.getId().equals(PixelPerfectPespective.ID)) {
+ deviceSelector.setMode(false, true);
+ placeActions(false, true);
+ } else if (perspective.getId().equals(TreeViewPerspective.ID)) {
+ deviceSelector.setMode(true, false);
+ placeActions(true, false);
+ } else {
+ deviceSelector.setMode(true, true);
+ placeActions(true, true);
+ }
+ }
+
+ public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective,
+ String changeId) {
+ // pass
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/LayoutView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/LayoutView.java
new file mode 100644
index 0000000..be401b6
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/LayoutView.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.ddmuilib.ImageLoader;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.models.TreeViewModel;
+import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener;
+import com.android.hierarchyviewerlib.ui.LayoutViewer;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.part.ViewPart;
+
+public class LayoutView extends ViewPart implements TreeChangeListener {
+
+ public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.LayoutView";
+
+ private LayoutViewer layoutViewer;
+
+ private Image onBlack;
+
+ private Image onWhite;
+
+ private Action showExtrasAction = new Action("Show &Extras", Action.AS_CHECK_BOX) {
+ @Override
+ public void run() {
+ layoutViewer.setShowExtras(isChecked());
+ }
+ };
+
+ private Action loadAllViewsAction = new Action("Load All &Views") {
+ @Override
+ public void run() {
+ HierarchyViewerDirector.getDirector().loadAllViews();
+ showExtrasAction.setChecked(true);
+ layoutViewer.setShowExtras(true);
+ }
+ };
+
+ private Action onBlackWhiteAction = new Action("Change Background &Color") {
+ @Override
+ public void run() {
+ boolean newValue = !layoutViewer.getOnBlack();
+ layoutViewer.setOnBlack(newValue);
+ if (newValue) {
+ setImageDescriptor(ImageDescriptor.createFromImage(onWhite));
+ } else {
+ setImageDescriptor(ImageDescriptor.createFromImage(onBlack));
+ }
+ }
+ };
+
+ @Override
+ public void createPartControl(Composite parent) {
+ showExtrasAction.setAccelerator(SWT.MOD1 + 'E');
+ ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
+ Image image = imageLoader.loadImage("show-extras.png", Display.getDefault());
+ showExtrasAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
+ showExtrasAction.setToolTipText("Show images");
+ showExtrasAction.setEnabled(TreeViewModel.getModel().getTree() != null);
+
+ onWhite = imageLoader.loadImage("on-white.png", Display.getDefault());
+ onBlack = imageLoader.loadImage("on-black.png", Display.getDefault());
+
+ onBlackWhiteAction.setAccelerator(SWT.MOD1 + 'C');
+ onBlackWhiteAction.setImageDescriptor(ImageDescriptor.createFromImage(onWhite));
+ onBlackWhiteAction.setToolTipText("Change layout viewer background color");
+
+ loadAllViewsAction.setAccelerator(SWT.MOD1 + 'V');
+ image = imageLoader.loadImage("load-all-views.png", Display.getDefault());
+ loadAllViewsAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
+ loadAllViewsAction.setToolTipText("Load all view images");
+ loadAllViewsAction.setEnabled(TreeViewModel.getModel().getTree() != null);
+
+ parent.setLayout(new FillLayout());
+
+ layoutViewer = new LayoutViewer(parent);
+
+ placeActions();
+
+ TreeViewModel.getModel().addTreeChangeListener(this);
+ }
+
+ public void placeActions() {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(onBlackWhiteAction);
+ mm.add(showExtrasAction);
+ mm.add(loadAllViewsAction);
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(onBlackWhiteAction);
+ tm.add(showExtrasAction);
+ tm.add(loadAllViewsAction);
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ TreeViewModel.getModel().removeTreeChangeListener(this);
+ }
+
+ @Override
+ public void setFocus() {
+ layoutViewer.setFocus();
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void treeChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ loadAllViewsAction.setEnabled(TreeViewModel.getModel().getTree() != null);
+ showExtrasAction.setEnabled(TreeViewModel.getModel().getTree() != null);
+ }
+ });
+ }
+
+ public void viewportChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ // pass
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java
new file mode 100644
index 0000000..05777c4
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectLoupeView.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.ddmuilib.ImageLoader;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.actions.PixelPerfectAutoRefreshAction;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener;
+import com.android.hierarchyviewerlib.ui.PixelPerfectControls;
+import com.android.hierarchyviewerlib.ui.PixelPerfectLoupe;
+import com.android.hierarchyviewerlib.ui.PixelPerfectPixelPanel;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.part.ViewPart;
+
+public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListener {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectLoupeView";
+
+ private PixelPerfectLoupe pixelPerfectLoupe;
+
+ private Action showInLoupeAction = new Action("&Show Overlay", Action.AS_CHECK_BOX) {
+ @Override
+ public void run() {
+ pixelPerfectLoupe.setShowOverlay(isChecked());
+ }
+ };
+ @Override
+ public void createPartControl(Composite parent) {
+ showInLoupeAction.setAccelerator(SWT.MOD1 + 'S');
+ ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
+ Image image = imageLoader.loadImage("show-overlay.png", Display.getDefault());
+ showInLoupeAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
+ showInLoupeAction.setToolTipText("Show the overlay in the loupe view");
+ showInLoupeAction.setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null);
+ PixelPerfectModel.getModel().addImageChangeListener(this);
+
+ GridLayout loupeLayout = new GridLayout();
+ loupeLayout.marginWidth = loupeLayout.marginHeight = 0;
+ loupeLayout.horizontalSpacing = loupeLayout.verticalSpacing = 0;
+ parent.setLayout(loupeLayout);
+
+ Composite pixelPerfectLoupeBorder = new Composite(parent, SWT.BORDER);
+ pixelPerfectLoupeBorder.setLayoutData(new GridData(GridData.FILL_BOTH));
+ GridLayout pixelPerfectLoupeBorderGridLayout = new GridLayout();
+ pixelPerfectLoupeBorderGridLayout.marginWidth =
+ pixelPerfectLoupeBorderGridLayout.marginHeight = 0;
+ pixelPerfectLoupeBorderGridLayout.horizontalSpacing =
+ pixelPerfectLoupeBorderGridLayout.verticalSpacing = 0;
+ pixelPerfectLoupeBorder.setLayout(pixelPerfectLoupeBorderGridLayout);
+
+ pixelPerfectLoupe = new PixelPerfectLoupe(pixelPerfectLoupeBorder);
+ pixelPerfectLoupe.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ PixelPerfectPixelPanel pixelPerfectPixelPanel =
+ new PixelPerfectPixelPanel(pixelPerfectLoupeBorder);
+ pixelPerfectPixelPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ PixelPerfectControls pixelPerfectControls =
+ new PixelPerfectControls(parent);
+ pixelPerfectControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ placeActions();
+ }
+
+ private void placeActions() {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(PixelPerfectAutoRefreshAction.getAction());
+ mm.add(showInLoupeAction);
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(PixelPerfectAutoRefreshAction.getAction());
+ tm.add(showInLoupeAction);
+ }
+
+ @Override
+ public void dispose() {
+ super.dispose();
+ PixelPerfectModel.getModel().removeImageChangeListener(this);
+ }
+
+ @Override
+ public void setFocus() {
+ pixelPerfectLoupe.setFocus();
+ }
+
+ public void crosshairMoved() {
+ // pass
+ }
+
+ public void treeChanged() {
+ // pass
+ }
+
+ public void imageChanged() {
+ // pass
+ }
+
+ public void imageLoaded() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
+ showInLoupeAction.setEnabled(overlayImage != null);
+ }
+ });
+ }
+
+ public void overlayChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ showInLoupeAction.setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null);
+ }
+ });
+ }
+
+ public void overlayTransparencyChanged() {
+ // pass
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ // pass
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectTreeView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectTreeView.java
new file mode 100644
index 0000000..811b8fc
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectTreeView.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.actions.RefreshPixelPerfectTreeAction;
+import com.android.hierarchyviewerlib.ui.PixelPerfectTree;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.part.ViewPart;
+
+public class PixelPerfectTreeView extends ViewPart {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView";
+
+ private PixelPerfectTree pixelPerfectTree;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ parent.setLayout(new FillLayout());
+ pixelPerfectTree = new PixelPerfectTree(parent);
+
+ placeActions();
+ }
+
+ private void placeActions() {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(RefreshPixelPerfectTreeAction.getAction());
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(RefreshPixelPerfectTreeAction.getAction());
+ }
+
+ @Override
+ public void setFocus() {
+ pixelPerfectTree.setFocus();
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectView.java
new file mode 100644
index 0000000..a09eb5c
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PixelPerfectView.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.actions.LoadOverlayAction;
+import com.android.hierarchyviewerlib.actions.RefreshPixelPerfectAction;
+import com.android.hierarchyviewerlib.actions.SavePixelPerfectAction;
+import com.android.hierarchyviewerlib.ui.PixelPerfect;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.part.ViewPart;
+
+public class PixelPerfectView extends ViewPart {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView";
+
+ private PixelPerfect pixelPerfect;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ parent.setLayout(new FillLayout());
+ pixelPerfect = new PixelPerfect(parent);
+
+ placeActions();
+ }
+
+ private void placeActions() {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(SavePixelPerfectAction.getAction(getSite().getShell()));
+ mm.add(RefreshPixelPerfectAction.getAction());
+ mm.add(LoadOverlayAction.getAction(getSite().getShell()));
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(SavePixelPerfectAction.getAction(getSite().getShell()));
+ tm.add(RefreshPixelPerfectAction.getAction());
+ tm.add(LoadOverlayAction.getAction(getSite().getShell()));
+ }
+
+ @Override
+ public void setFocus() {
+ pixelPerfect.setFocus();
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PropertyView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PropertyView.java
new file mode 100644
index 0000000..bd6d462
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/PropertyView.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.ui.PropertyViewer;
+
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+public class PropertyView extends ViewPart {
+
+ public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.PropertyView";
+
+ private PropertyViewer propertyViewer;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ parent.setLayout(new FillLayout());
+
+ propertyViewer = new PropertyViewer(parent);
+ }
+
+ @Override
+ public void setFocus() {
+ propertyViewer.setFocus();
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/SampleView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/SampleView.java
deleted file mode 100644
index 13c7ff4..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/SampleView.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.ide.eclipse.hierarchyviewer.views;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * This sample class demonstrates how to plug-in a new workbench view. The view
- * shows data obtained from the model. The sample creates a dummy model on the
- * fly, but a real implementation would connect to the model available either in
- * this or another plug-in (e.g. the workspace). The view is connected to the
- * model using a content provider.
- * <p>
- * The view uses a label provider to define how model objects should be
- * presented in the view. Each view can present the same model objects using
- * different labels and icons, if needed. Alternatively, a single label provider
- * can be shared between views in order to ensure that objects of the same type
- * are presented in the same way everywhere.
- * <p>
- */
-
-public class SampleView extends ViewPart {
-
- /**
- * The ID of the view as specified by the extension.
- */
- public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.SampleView";
-
- private Text text;
-
- /**
- * The constructor.
- */
- public SampleView() {
- }
-
- /**
- * This is a callback that will allow us to create the viewer and initialize
- * it.
- */
- public void createPartControl(Composite parent) {
- parent.setLayout(new FillLayout());
- text = new Text(parent, SWT.MULTI | SWT.READ_ONLY | SWT.V_SCROLL);
- text.addMouseListener(new MouseListener() {
-
- public void mouseDoubleClick(MouseEvent e) {
- text.setText(text.getText() + "Scheduling\n");
- Job test = new Job("Simple Job") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- text.setText(text.getText() + "SLEEPING\n");
- }
- });
- Thread.sleep(5000);
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- text.setText(text.getText() + "DONE SLEEPING\n");
- }
- });
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return Status.OK_STATUS;
- }
-
- };
- test.schedule();
- text.setText(text.getText() + "Done Scheduling\n");
- }
-
- public void mouseDown(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseUp(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- });
- }
-
- /**
- * Passing the focus request to the viewer's control.
- */
- public void setFocus() {
- text.setFocus();
- }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeOverviewView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeOverviewView.java
new file mode 100644
index 0000000..5363c1b
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeOverviewView.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.ui.TreeViewOverview;
+
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+
+public class TreeOverviewView extends ViewPart {
+
+ public static final String ID =
+ "com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView";
+
+ private TreeViewOverview treeViewOverview;
+ @Override
+ public void createPartControl(Composite parent) {
+ parent.setLayout(new FillLayout());
+
+ treeViewOverview = new TreeViewOverview(parent);
+ }
+
+ @Override
+ public void setFocus() {
+ treeViewOverview.setFocus();
+ }
+
+}
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeViewView.java b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeViewView.java
new file mode 100644
index 0000000..76d9b54
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/src/com/android/ide/eclipse/hierarchyviewer/views/TreeViewView.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ide.eclipse.hierarchyviewer.views;
+
+import com.android.hierarchyviewerlib.actions.CapturePSDAction;
+import com.android.hierarchyviewerlib.actions.DisplayViewAction;
+import com.android.hierarchyviewerlib.actions.InvalidateAction;
+import com.android.hierarchyviewerlib.actions.RefreshViewAction;
+import com.android.hierarchyviewerlib.actions.RequestLayoutAction;
+import com.android.hierarchyviewerlib.actions.SaveTreeViewAction;
+import com.android.hierarchyviewerlib.ui.TreeView;
+import com.android.hierarchyviewerlib.ui.TreeViewControls;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.part.ViewPart;
+
+// Awesome name.
+public class TreeViewView extends ViewPart {
+
+ public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.TreeViewView";
+
+ private TreeView treeView;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = layout.marginHeight = 0;
+ layout.horizontalSpacing = layout.verticalSpacing = 0;
+ parent.setLayout(layout);
+
+ Composite treeViewContainer = new Composite(parent, SWT.BORDER);
+ treeViewContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
+ treeViewContainer.setLayout(new FillLayout());
+
+ treeView = new TreeView(treeViewContainer);
+
+ TreeViewControls treeViewControls = new TreeViewControls(parent);
+ treeViewControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ placeActions();
+ }
+
+ public void placeActions() {
+ IActionBars actionBars = getViewSite().getActionBars();
+
+ IMenuManager mm = actionBars.getMenuManager();
+ mm.removeAll();
+ mm.add(SaveTreeViewAction.getAction(getSite().getShell()));
+ mm.add(CapturePSDAction.getAction(getSite().getShell()));
+ mm.add(new Separator());
+ mm.add(RefreshViewAction.getAction());
+ mm.add(DisplayViewAction.getAction(getSite().getShell()));
+ mm.add(new Separator());
+ mm.add(InvalidateAction.getAction());
+ mm.add(RequestLayoutAction.getAction());
+
+ IToolBarManager tm = actionBars.getToolBarManager();
+ tm.removeAll();
+ tm.add(SaveTreeViewAction.getAction(getSite().getShell()));
+ tm.add(CapturePSDAction.getAction(getSite().getShell()));
+ tm.add(new Separator());
+ tm.add(RefreshViewAction.getAction());
+ tm.add(DisplayViewAction.getAction(getSite().getShell()));
+ tm.add(new Separator());
+ tm.add(InvalidateAction.getAction());
+ tm.add(RequestLayoutAction.getAction());
+ }
+
+
+ @Override
+ public void setFocus() {
+ treeView.setFocus();
+ }
+
+}
diff --git a/eclipse/scripts/create_hierarchyviewer_symlinks.sh b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
index ce7bf4b..f341144 100755
--- a/eclipse/scripts/create_hierarchyviewer_symlinks.sh
+++ b/eclipse/scripts/create_hierarchyviewer_symlinks.sh
@@ -60,10 +60,10 @@
mkdir -p $DEST
-LIBS="hierarchyviewerlib hierarchyvieweruilib"
+LIBS="ddmlib ddmuilib hierarchyviewerlib "
echo "make java libs ..."
make -j3 showcommands $LIBS || die "Hierarchy Viewer: Fail to build one of $LIBS."
for LIB in $LIBS; do
cpfile $DEST out/host/$PLATFORM/framework/$LIB.jar
-done
\ No newline at end of file
+done
diff --git a/hierarchyviewer2/app/etc/manifest.txt b/hierarchyviewer2/app/etc/manifest.txt
index fa7e491..c1b0666 100644
--- a/hierarchyviewer2/app/etc/manifest.txt
+++ b/hierarchyviewer2/app/etc/manifest.txt
@@ -1,2 +1,2 @@
Main-Class: com.android.hierarchyviewer.HierarchyViewerApplication
-Class-Path: ddmlib.jar hierarchyviewerlib.jar
+Class-Path: ddmlib.jar ddmuilib.jar hierarchyviewerlib.jar swt.jar org.eclipse.jface_3.4.2.M20090107-0800.jar org.eclipse.core.commands_3.4.0.I20080509-2000.jar sdklib.jar
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
index d66f8e1..f5c6e98 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java
@@ -16,43 +16,41 @@
package com.android.hierarchyviewer;
-import com.android.ddmlib.IDevice;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewer.actions.AboutAction;
-import com.android.hierarchyviewer.actions.CapturePSDAction;
-import com.android.hierarchyviewer.actions.DisplayViewAction;
-import com.android.hierarchyviewer.actions.InspectScreenshotAction;
-import com.android.hierarchyviewer.actions.InvalidateAction;
import com.android.hierarchyviewer.actions.LoadAllViewsAction;
-import com.android.hierarchyviewer.actions.LoadOverlayAction;
-import com.android.hierarchyviewer.actions.LoadViewHierarchyAction;
-import com.android.hierarchyviewer.actions.PixelPerfectAutoRefreshAction;
import com.android.hierarchyviewer.actions.QuitAction;
-import com.android.hierarchyviewer.actions.RefreshPixelPerfectAction;
-import com.android.hierarchyviewer.actions.RefreshPixelPerfectTreeAction;
-import com.android.hierarchyviewer.actions.RefreshViewAction;
-import com.android.hierarchyviewer.actions.RefreshWindowsAction;
-import com.android.hierarchyviewer.actions.RequestLayoutAction;
-import com.android.hierarchyviewer.actions.SavePixelPerfectAction;
-import com.android.hierarchyviewer.actions.SaveTreeViewAction;
import com.android.hierarchyviewer.actions.ShowOverlayAction;
import com.android.hierarchyviewer.util.ActionButton;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import com.android.hierarchyviewerlib.device.Window;
-import com.android.hierarchyviewerlib.models.DeviceSelectionModel;
+import com.android.hierarchyviewerlib.actions.CapturePSDAction;
+import com.android.hierarchyviewerlib.actions.DisplayViewAction;
+import com.android.hierarchyviewerlib.actions.InspectScreenshotAction;
+import com.android.hierarchyviewerlib.actions.InvalidateAction;
+import com.android.hierarchyviewerlib.actions.LoadOverlayAction;
+import com.android.hierarchyviewerlib.actions.LoadViewHierarchyAction;
+import com.android.hierarchyviewerlib.actions.PixelPerfectAutoRefreshAction;
+import com.android.hierarchyviewerlib.actions.RefreshPixelPerfectAction;
+import com.android.hierarchyviewerlib.actions.RefreshPixelPerfectTreeAction;
+import com.android.hierarchyviewerlib.actions.RefreshViewAction;
+import com.android.hierarchyviewerlib.actions.RefreshWindowsAction;
+import com.android.hierarchyviewerlib.actions.RequestLayoutAction;
+import com.android.hierarchyviewerlib.actions.SavePixelPerfectAction;
+import com.android.hierarchyviewerlib.actions.SaveTreeViewAction;
import com.android.hierarchyviewerlib.models.PixelPerfectModel;
import com.android.hierarchyviewerlib.models.TreeViewModel;
-import com.android.hierarchyviewerlib.models.DeviceSelectionModel.WindowChangeListener;
import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener;
import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener;
import com.android.hierarchyviewerlib.ui.DeviceSelector;
import com.android.hierarchyviewerlib.ui.LayoutViewer;
import com.android.hierarchyviewerlib.ui.PixelPerfect;
+import com.android.hierarchyviewerlib.ui.PixelPerfectControls;
import com.android.hierarchyviewerlib.ui.PixelPerfectLoupe;
import com.android.hierarchyviewerlib.ui.PixelPerfectPixelPanel;
import com.android.hierarchyviewerlib.ui.PixelPerfectTree;
import com.android.hierarchyviewerlib.ui.PropertyViewer;
import com.android.hierarchyviewerlib.ui.TreeView;
+import com.android.hierarchyviewerlib.ui.TreeViewControls;
import com.android.hierarchyviewerlib.ui.TreeViewOverview;
import org.eclipse.jface.action.MenuManager;
@@ -61,8 +59,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
@@ -81,8 +77,6 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ProgressBar;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Slider;
-import org.eclipse.swt.widgets.Text;
public class HierarchyViewerApplication extends ApplicationWindow {
@@ -114,7 +108,6 @@
private Button deviceViewButton;
-
private Label progressLabel;
private ProgressBar progressBar;
@@ -147,29 +140,9 @@
private LayoutViewer layoutViewer;
- private StackLayout statusBarStackLayout;
-
- private Composite treeViewControls;
-
- private Slider zoomSlider;
-
- private Text filterText;
-
- private Composite statusBarControlPanel;
-
private PixelPerfectLoupe pixelPerfectLoupe;
- private boolean autoRefresh = false;
-
- private int refreshInterval = 5;
-
- private int refreshTimeLeft = 5;
-
- private Slider overlaySlider;
-
- private Slider ppZoomSlider;
-
- private Slider refreshSlider;
+ private Composite treeViewControls;
public static final HierarchyViewerApplication getApp() {
return APP;
@@ -202,20 +175,13 @@
director.initDebugBridge();
director.startListenForDevices();
director.populateDeviceSelectionModel();
- DeviceSelectionModel.getModel().addWindowChangeListener(windowChangeListener);
TreeViewModel.getModel().addTreeChangeListener(treeChangeListener);
PixelPerfectModel.getModel().addImageChangeListener(imageChangeListener);
setBlockOnOpen(true);
- Thread pixelPerfectRefreshingThread = new Thread(autoRefresher);
- pixelPerfectRefreshingThread.start();
-
open();
- pixelPerfectRefreshingThread.interrupt();
-
- DeviceSelectionModel.getModel().removeWindowChangeListener(windowChangeListener);
TreeViewModel.getModel().removeTreeChangeListener(treeChangeListener);
PixelPerfectModel.getModel().removeImageChangeListener(imageChangeListener);
@@ -312,51 +278,12 @@
pixelPerfectButton.setLayoutData(pixelPerfectButtonFormData);
// Tree View control panel...
- statusBarControlPanel = new Composite(statusBar, SWT.NONE);
- FormData statusBarControlPanelFormData = new FormData();
- statusBarControlPanelFormData.left = new FormAttachment(pixelPerfectButton, 2);
- statusBarControlPanelFormData.top = new FormAttachment(treeViewButton, 0, SWT.CENTER);
- statusBarControlPanel.setLayoutData(statusBarControlPanelFormData);
-
- statusBarStackLayout = new StackLayout();
- statusBarControlPanel.setLayout(statusBarStackLayout);
-
- treeViewControls = new Composite(statusBarControlPanel, SWT.NONE);
- GridLayout treeViewControlLayout = new GridLayout(5, false);
- treeViewControlLayout.marginWidth = treeViewControlLayout.marginHeight = 2;
- treeViewControlLayout.verticalSpacing = treeViewControlLayout.horizontalSpacing = 4;
- treeViewControls.setLayout(treeViewControlLayout);
-
- Label filterLabel = new Label(treeViewControls, SWT.NONE);
- filterLabel.setText("Filter by class or id:");
- filterLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
-
- filterText = new Text(treeViewControls, SWT.LEFT | SWT.SINGLE);
- GridData filterTextGridData = new GridData(GridData.FILL_HORIZONTAL);
- filterTextGridData.widthHint = 148;
- filterText.setLayoutData(filterTextGridData);
- filterText.addModifyListener(filterTextModifyListener);
-
- Label smallZoomLabel = new Label(treeViewControls, SWT.NONE);
- smallZoomLabel.setText(" 20%");
- smallZoomLabel
- .setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
-
- zoomSlider = new Slider(treeViewControls, SWT.HORIZONTAL);
- GridData zoomSliderGridData = new GridData(GridData.CENTER, GridData.CENTER, false, false);
- zoomSliderGridData.widthHint = 190;
- zoomSlider.setLayoutData(zoomSliderGridData);
- zoomSlider.setMinimum((int) (TreeViewModel.MIN_ZOOM * 10));
- zoomSlider.setMaximum((int) (TreeViewModel.MAX_ZOOM * 10 + 1));
- zoomSlider.setThumb(1);
- zoomSlider.setSelection(10);
-
- zoomSlider.addSelectionListener(zoomSliderSelectionListener);
-
- Label largeZoomLabel = new Label(treeViewControls, SWT.NONE);
- largeZoomLabel
- .setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
- largeZoomLabel.setText("200%");
+ treeViewControls = new TreeViewControls(statusBar);
+ FormData treeViewControlsFormData = new FormData();
+ treeViewControlsFormData.left = new FormAttachment(pixelPerfectButton, 2);
+ treeViewControlsFormData.top = new FormAttachment(treeViewButton, 0, SWT.CENTER);
+ treeViewControlsFormData.width = 552;
+ treeViewControls.setLayoutData(treeViewControlsFormData);
// Progress stuff
progressLabel = new Label(statusBar, SWT.RIGHT);
@@ -409,17 +336,15 @@
ActionButton loadViewHierarchyButton =
new ActionButton(innerButtonPanel, LoadViewHierarchyAction.getAction());
loadViewHierarchyButton.setLayoutData(new GridData(GridData.FILL_BOTH));
- LoadViewHierarchyAction.getAction().setEnabled(false);
ActionButton inspectScreenshotButton =
new ActionButton(innerButtonPanel, InspectScreenshotAction.getAction());
inspectScreenshotButton.setLayoutData(new GridData(GridData.FILL_BOTH));
- InspectScreenshotAction.getAction().setEnabled(false);
Composite deviceSelectorContainer = new Composite(deviceSelectorPanel, SWT.BORDER);
deviceSelectorContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
deviceSelectorContainer.setLayout(new FillLayout());
- deviceSelector = new DeviceSelector(deviceSelectorContainer);
+ deviceSelector = new DeviceSelector(deviceSelectorContainer, true, true);
}
public void buildTreeViewPanel(Composite parent) {
@@ -482,11 +407,11 @@
Composite treeViewOverviewContainer = new Composite(sideSash, SWT.BORDER);
treeViewOverviewContainer.setLayout(new FillLayout());
- TreeViewOverview treeViewOverview = new TreeViewOverview(treeViewOverviewContainer);
+ new TreeViewOverview(treeViewOverviewContainer);
Composite propertyViewerContainer = new Composite(sideSash, SWT.BORDER);
propertyViewerContainer.setLayout(new FillLayout());
- PropertyViewer propertyViewer = new PropertyViewer(propertyViewerContainer);
+ new PropertyViewer(propertyViewerContainer);
Composite layoutViewerContainer = new Composite(sideSash, SWT.NONE);
GridLayout layoutViewerLayout = new GridLayout();
@@ -514,10 +439,12 @@
onBlackWhiteButton = new Button(buttonBar, SWT.PUSH);
onBlackWhiteButton.setImage(onWhiteImage);
onBlackWhiteButton.addSelectionListener(onBlackWhiteSelectionListener);
+ onBlackWhiteButton.setToolTipText("Change layout viewer background color");
showExtras = new Button(buttonBar, SWT.CHECK);
showExtras.setText("Show Extras");
showExtras.addSelectionListener(showExtrasSelectionListener);
+ showExtras.setToolTipText("Show images");
ActionButton loadAllViewsButton =
new ActionButton(fullButtonBar, LoadAllViewsAction.getAction());
@@ -578,8 +505,6 @@
new ActionButton(innerButtonPanel, ShowOverlayAction.getAction());
showInLoupe.setLayoutData(new GridData(GridData.FILL_BOTH));
- ShowOverlayAction.getAction().setEnabled(false);
-
ActionButton autoRefresh =
new ActionButton(innerButtonPanel, PixelPerfectAutoRefreshAction.getAction());
autoRefresh.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -590,7 +515,7 @@
Composite pixelPerfectTreeContainer = new Composite(mainSash, SWT.BORDER);
pixelPerfectTreeContainer.setLayout(new FillLayout());
- PixelPerfectTree pixelPerfectTree = new PixelPerfectTree(pixelPerfectTreeContainer);
+ new PixelPerfectTree(pixelPerfectTreeContainer);
Composite pixelPerfectLoupeContainer = new Composite(mainSash, SWT.NONE);
GridLayout loupeLayout = new GridLayout();
@@ -614,121 +539,14 @@
new PixelPerfectPixelPanel(pixelPerfectLoupeBorder);
pixelPerfectPixelPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Composite pixelPerfectControls = new Composite(pixelPerfectLoupeContainer, SWT.NONE);
+ PixelPerfectControls pixelPerfectControls =
+ new PixelPerfectControls(pixelPerfectLoupeContainer);
pixelPerfectControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- pixelPerfectControls.setLayout(new FormLayout());
- Label overlayTransparencyRight = new Label(pixelPerfectControls, SWT.NONE);
- overlayTransparencyRight.setText("100%");
- FormData overlayTransparencyRightData = new FormData();
- overlayTransparencyRightData.right = new FormAttachment(100, -2);
- overlayTransparencyRightData.top = new FormAttachment(0, 2);
- overlayTransparencyRight.setLayoutData(overlayTransparencyRightData);
-
- Label refreshRight = new Label(pixelPerfectControls, SWT.NONE);
- refreshRight.setText("40s");
- FormData refreshRightData = new FormData();
- refreshRightData.right = new FormAttachment(100, -2);
- refreshRightData.top = new FormAttachment(overlayTransparencyRight, 2);
- refreshRightData.left = new FormAttachment(overlayTransparencyRight, 0, SWT.LEFT);
- refreshRight.setLayoutData(refreshRightData);
-
- Label zoomRight = new Label(pixelPerfectControls, SWT.NONE);
- zoomRight.setText("24x");
- FormData zoomRightData = new FormData();
- zoomRightData.right = new FormAttachment(100, -2);
- zoomRightData.top = new FormAttachment(refreshRight, 2);
- zoomRightData.left = new FormAttachment(overlayTransparencyRight, 0, SWT.LEFT);
- zoomRight.setLayoutData(zoomRightData);
-
- Label overlayTransparency = new Label(pixelPerfectControls, SWT.NONE);
- Label refresh = new Label(pixelPerfectControls, SWT.NONE);
-
- overlayTransparency.setText("Overlay:");
- FormData overlayTransparencyData = new FormData();
- overlayTransparencyData.left = new FormAttachment(0, 2);
- overlayTransparencyData.top = new FormAttachment(0, 2);
- overlayTransparencyData.right = new FormAttachment(refresh, 0, SWT.RIGHT);
- overlayTransparency.setLayoutData(overlayTransparencyData);
-
- refresh.setText("Refresh Rate:");
- FormData refreshData = new FormData();
- refreshData.top = new FormAttachment(overlayTransparency, 2);
- refreshData.left = new FormAttachment(0, 2);
- refresh.setLayoutData(refreshData);
-
- Label zoom = new Label(pixelPerfectControls, SWT.NONE);
- zoom.setText("Zoom:");
- FormData zoomData = new FormData();
- zoomData.right = new FormAttachment(refresh, 0, SWT.RIGHT);
- zoomData.top = new FormAttachment(refresh, 2);
- zoomData.left = new FormAttachment(0, 2);
- zoom.setLayoutData(zoomData);
-
- Label overlayTransparencyLeft = new Label(pixelPerfectControls, SWT.RIGHT);
- overlayTransparencyLeft.setText("0%");
- FormData overlayTransparencyLeftData = new FormData();
- overlayTransparencyLeftData.top = new FormAttachment(0, 2);
- overlayTransparencyLeftData.left = new FormAttachment(overlayTransparency, 2);
- overlayTransparencyLeft.setLayoutData(overlayTransparencyLeftData);
-
- Label refreshLeft = new Label(pixelPerfectControls, SWT.RIGHT);
- refreshLeft.setText("1s");
- FormData refreshLeftData = new FormData();
- refreshLeftData.top = new FormAttachment(overlayTransparencyLeft, 2);
- refreshLeftData.left = new FormAttachment(refresh, 2);
- refreshLeft.setLayoutData(refreshLeftData);
-
- Label zoomLeft = new Label(pixelPerfectControls, SWT.RIGHT);
- zoomLeft.setText("2x");
- FormData zoomLeftData = new FormData();
- zoomLeftData.top = new FormAttachment(refreshLeft, 2);
- zoomLeftData.left = new FormAttachment(zoom, 2);
- zoomLeft.setLayoutData(zoomLeftData);
-
- overlaySlider = new Slider(pixelPerfectControls, SWT.HORIZONTAL);
- overlaySlider.setMinimum(0);
- overlaySlider.setMaximum(101);
- overlaySlider.setThumb(1);
- overlaySlider.setSelection(50);
- overlaySlider.setEnabled(false);
- FormData overlaySliderData = new FormData();
- overlaySliderData.right = new FormAttachment(overlayTransparencyRight, -4);
- overlaySliderData.top = new FormAttachment(0, 2);
- overlaySliderData.left = new FormAttachment(overlayTransparencyLeft, 4);
- overlaySlider.setLayoutData(overlaySliderData);
-
- overlaySlider.addSelectionListener(overlaySliderSelectionListener);
-
- refreshSlider = new Slider(pixelPerfectControls, SWT.HORIZONTAL);
- refreshSlider.setMinimum(1);
- refreshSlider.setMaximum(41);
- refreshSlider.setThumb(1);
- refreshSlider.setSelection(refreshInterval);
- FormData refreshSliderData = new FormData();
- refreshSliderData.right = new FormAttachment(overlayTransparencyRight, -4);
- refreshSliderData.top = new FormAttachment(overlayTransparencyRight, 2);
- refreshSliderData.left = new FormAttachment(overlaySlider, 0, SWT.LEFT);
- refreshSlider.setLayoutData(refreshSliderData);
-
- refreshSlider.addSelectionListener(refreshSliderSelectionListener);
-
- ppZoomSlider = new Slider(pixelPerfectControls, SWT.HORIZONTAL);
- ppZoomSlider.setMinimum(2);
- ppZoomSlider.setMaximum(25);
- ppZoomSlider.setThumb(1);
- ppZoomSlider.setSelection(PixelPerfectModel.DEFAULT_ZOOM);
- FormData zoomSliderData = new FormData();
- zoomSliderData.right = new FormAttachment(overlayTransparencyRight, -4);
- zoomSliderData.top = new FormAttachment(refreshRight, 2);
- zoomSliderData.left = new FormAttachment(overlaySlider, 0, SWT.LEFT);
- ppZoomSlider.setLayoutData(zoomSliderData);
-
- ppZoomSlider.addSelectionListener(ppZoomSliderSelectionListener);
Composite pixelPerfectContainer = new Composite(mainSash, SWT.BORDER);
pixelPerfectContainer.setLayout(new FillLayout());
- PixelPerfect pixelPerfect = new PixelPerfect(pixelPerfectContainer);
+ new PixelPerfect(pixelPerfectContainer);
mainSash.setWeights(new int[] {
272, 376, 346
@@ -736,15 +554,6 @@
}
- public void setAutoRefresh(boolean value) {
- if (value) {
- refreshTimeLeft = refreshInterval;
- autoRefresh = true;
- } else {
- autoRefresh = false;
- }
- }
-
public void showOverlayInLoupe(boolean value) {
pixelPerfectLoupe.setShowOverlay(value);
}
@@ -816,9 +625,7 @@
deviceSelector.setFocus();
- statusBarStackLayout.topControl = null;
- statusBarControlPanel.setVisible(false);
- statusBarControlPanel.layout();
+ treeViewControls.setVisible(false);
}
public void showTreeView() {
@@ -865,9 +672,7 @@
treeView.setFocus();
- statusBarStackLayout.topControl = treeViewControls;
- statusBarControlPanel.setVisible(true);
- statusBarControlPanel.layout();
+ treeViewControls.setVisible(true);
}
public void showPixelPerfect() {
@@ -913,9 +718,7 @@
pixelPerfectLoupe.setFocus();
- statusBarStackLayout.topControl = null;
- statusBarControlPanel.setVisible(false);
- statusBarControlPanel.layout();
+ treeViewControls.setVisible(false);
}
private SelectionListener deviceViewButtonSelectionListener = new SelectionListener() {
@@ -988,135 +791,6 @@
}
};
- private SelectionListener zoomSliderSelectionListener = new SelectionListener() {
- private int oldValue;
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // pass
- }
-
- public void widgetSelected(SelectionEvent e) {
- int newValue = zoomSlider.getSelection();
- if (oldValue != newValue) {
- TreeViewModel.getModel().removeTreeChangeListener(treeChangeListener);
- TreeViewModel.getModel().setZoom(newValue / 10.0);
- TreeViewModel.getModel().addTreeChangeListener(treeChangeListener);
- oldValue = newValue;
- }
- }
- };
-
- private Runnable autoRefresher = new Runnable() {
- public void run() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- break;
- }
- refreshTimeLeft--;
- if (autoRefresh && refreshTimeLeft <= 0) {
- HierarchyViewerDirector.getDirector().refreshPixelPerfect();
- refreshTimeLeft = refreshInterval;
- }
- }
- }
- };
-
- private SelectionListener overlaySliderSelectionListener = new SelectionListener() {
- private int oldValue;
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // pass
- }
-
- public void widgetSelected(SelectionEvent e) {
- int newValue = overlaySlider.getSelection();
- if (oldValue != newValue) {
- PixelPerfectModel.getModel().removeImageChangeListener(imageChangeListener);
- PixelPerfectModel.getModel().setOverlayTransparency(newValue / 100.0);
- PixelPerfectModel.getModel().addImageChangeListener(imageChangeListener);
- oldValue = newValue;
- }
- }
- };
-
- private SelectionListener refreshSliderSelectionListener = new SelectionListener() {
- private int oldValue;
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // pass
- }
-
- public void widgetSelected(SelectionEvent e) {
- int newValue = refreshSlider.getSelection();
- if (oldValue != newValue) {
- refreshInterval = newValue;
- refreshTimeLeft = Math.min(refreshTimeLeft, refreshInterval);
- oldValue = newValue;
- }
- }
- };
-
- private SelectionListener ppZoomSliderSelectionListener = new SelectionListener() {
- private int oldValue;
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // pass
- }
-
- public void widgetSelected(SelectionEvent e) {
- int newValue = ppZoomSlider.getSelection();
- if (oldValue != newValue) {
- PixelPerfectModel.getModel().removeImageChangeListener(imageChangeListener);
- PixelPerfectModel.getModel().setZoom(newValue);
- PixelPerfectModel.getModel().addImageChangeListener(imageChangeListener);
- oldValue = newValue;
- }
- }
- };
-
- private ModifyListener filterTextModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- HierarchyViewerDirector.getDirector().filterNodes(filterText.getText());
- }
- };
-
- private WindowChangeListener windowChangeListener = new WindowChangeListener() {
- public void deviceChanged(IDevice device) {
- // pass
- }
-
- public void deviceConnected(IDevice device) {
- // pass
- }
-
- public void deviceDisconnected(IDevice device) {
- // pass
- }
-
- public void focusChanged(IDevice device) {
- // pass
- }
-
- public void selectionChanged(final IDevice device, final Window window) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- if (window == null) {
- LoadViewHierarchyAction.getAction().setEnabled(false);
- } else {
- LoadViewHierarchyAction.getAction().setEnabled(true);
- }
- if (device == null) {
- InspectScreenshotAction.getAction().setEnabled(false);
- } else {
- InspectScreenshotAction.getAction().setEnabled(true);
- }
- }
- });
- }
- };
-
private TreeChangeListener treeChangeListener = new TreeChangeListener() {
public void selectionChanged() {
// pass
@@ -1131,9 +805,6 @@
} else {
showTreeView();
treeViewButton.setEnabled(true);
- zoomSlider.setSelection((int) Math
- .round(TreeViewModel.getModel().getZoom() * 10));
- filterText.setText("");
}
}
});
@@ -1145,7 +816,6 @@
public void zoomChanged() {
// pass
- zoomSlider.setSelection((int) Math.round(TreeViewModel.getModel().getZoom() * 10));
}
};
@@ -1166,14 +836,10 @@
public void imageLoaded() {
Display.getDefault().syncExec(new Runnable() {
public void run() {
- Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
- ShowOverlayAction.getAction().setEnabled(overlayImage != null);
- overlaySlider.setEnabled(overlayImage != null);
if (PixelPerfectModel.getModel().getImage() == null) {
pixelPerfectButton.setEnabled(false);
showDeviceSelector();
} else {
- ppZoomSlider.setSelection(PixelPerfectModel.getModel().getZoom());
pixelPerfectButton.setEnabled(true);
showPixelPerfect();
}
@@ -1182,22 +848,11 @@
}
public void overlayChanged() {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
- ShowOverlayAction.getAction().setEnabled(overlayImage != null);
- overlaySlider.setEnabled(overlayImage != null);
- }
- });
+ // pass
}
public void overlayTransparencyChanged() {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- overlaySlider.setSelection((int) (PixelPerfectModel.getModel()
- .getOverlayTransparency() * 100));
- }
- });
+ // pass
}
public void selectionChanged() {
@@ -1205,11 +860,7 @@
}
public void zoomChanged() {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- ppZoomSlider.setSelection(PixelPerfectModel.getModel().getZoom());
- }
- });
+ // pass
}
};
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java
index 9c76ae9..c6abe57 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java
@@ -19,6 +19,7 @@
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewer.AboutDialog;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.actions.ImageAction;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java
index 2ea2298..5007e1e 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java
@@ -18,14 +18,15 @@
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.actions.ImageAction;
+import com.android.hierarchyviewerlib.actions.TreeViewEnabledAction;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class LoadAllViewsAction extends Action implements ImageAction {
+public class LoadAllViewsAction extends TreeViewEnabledAction implements ImageAction {
private static LoadAllViewsAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java
index b0f51ec..e4695cd 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java
@@ -19,6 +19,9 @@
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewer.HierarchyViewerApplication;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.actions.ImageAction;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -26,7 +29,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class ShowOverlayAction extends Action implements ImageAction {
+public class ShowOverlayAction extends Action implements ImageAction, ImageChangeListener {
private static ShowOverlayAction action;
@@ -39,6 +42,8 @@
image = imageLoader.loadImage("show-overlay.png", Display.getDefault());
setImageDescriptor(ImageDescriptor.createFromImage(image));
setToolTipText("Show the overlay in the loupe view");
+ setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null);
+ PixelPerfectModel.getModel().addImageChangeListener(this);
}
public static ShowOverlayAction getAction() {
@@ -56,4 +61,45 @@
public Image getImage() {
return image;
}
+
+ public void crosshairMoved() {
+ // pass
+ }
+
+ public void treeChanged() {
+ // pass
+ }
+
+ public void imageChanged() {
+ // pass
+ }
+
+ public void imageLoaded() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
+ setEnabled(overlayImage != null);
+ }
+ });
+ }
+
+ public void overlayChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null);
+ }
+ });
+ }
+
+ public void overlayTransparencyChanged() {
+ // pass
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ // pass
+ }
}
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java
index 08fe1ac..cf8d5e2 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java
+++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java
@@ -16,7 +16,7 @@
package com.android.hierarchyviewer.util;
-import com.android.hierarchyviewer.actions.ImageAction;
+import com.android.hierarchyviewerlib.actions.ImageAction;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.util.IPropertyChangeListener;
@@ -44,6 +44,7 @@
this.action.addPropertyChangeListener(this);
button.addSelectionListener(this);
button.setToolTipText(action.getToolTipText());
+ button.setEnabled(this.action.isEnabled());
}
public void propertyChange(PropertyChangeEvent e) {
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk b/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk
index 922e337..ecaabde 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/Android.mk
@@ -20,9 +20,9 @@
LOCAL_JAVA_LIBRARIES := ddmlib \
ddmuilib \
- hierarchyviewerlib \
swt \
- org.eclipse.jface_3.4.2.M20090107-0800
+ org.eclipse.jface_3.4.2.M20090107-0800 \
+ org.eclipse.core.commands_3.4.0.I20080509-2000
LOCAL_MODULE := hierarchyviewerlib
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
index f0a705c..1264d60 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
@@ -50,6 +50,8 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* This is the class where most of the logic resides.
@@ -63,8 +65,21 @@
private int pixelPerfectRefreshesInProgress = 0;
+ private Timer pixelPerfectRefreshTimer = new Timer();
+
+ private boolean autoRefresh = false;
+
+ public static final int DEFAULT_PIXEL_PERFECT_AUTOREFRESH_INTERVAL = 5;
+
+ private int pixelPerfectAutoRefreshInterval = DEFAULT_PIXEL_PERFECT_AUTOREFRESH_INTERVAL;
+
+ private PixelPerfectAutoRefreshTask currentAutoRefreshTask;
+
+ private String filterText = "";
+
public void terminate() {
WindowUpdater.terminate();
+ pixelPerfectRefreshTimer.cancel();
}
public abstract String getAdbLocation();
@@ -101,7 +116,9 @@
public void deviceConnected(final IDevice device) {
executeInBackground("Connecting device", new Runnable() {
public void run() {
- if (device.isOnline()) {
+ if (DeviceSelectionModel.getModel().containsDevice(device)) {
+ windowsChanged(device);
+ } else if (device.isOnline()) {
DeviceBridge.setupDeviceForward(device);
if (!DeviceBridge.isViewServerRunning(device)) {
if (!DeviceBridge.startViewServer(device)) {
@@ -157,6 +174,7 @@
Window treeViewWindow = TreeViewModel.getModel().getWindow();
if (treeViewWindow != null && treeViewWindow.getDevice() == device) {
TreeViewModel.getModel().setData(null, null);
+ filterText = "";
}
}
});
@@ -289,6 +307,8 @@
executeInBackground("Loading view hierarchy", new Runnable() {
public void run() {
+ filterText = "";
+
ViewNode viewNode = DeviceBridge.loadWindowData(window);
if (viewNode != null) {
DeviceBridge.loadProfileData(window, viewNode);
@@ -329,7 +349,7 @@
final Image image = loadCapture(viewNode);
if (image != null) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
CaptureDisplay.show(shell, viewNode, image);
}
@@ -576,6 +596,7 @@
}
public void filterNodes(String filterText) {
+ this.filterText = filterText;
DrawableViewNode tree = TreeViewModel.getModel().getTree();
if (tree != null) {
tree.viewNode.filter(filterText);
@@ -584,4 +605,56 @@
}
}
+ public String getFilterText() {
+ return filterText;
+ }
+
+ private static class PixelPerfectAutoRefreshTask extends TimerTask {
+ @Override
+ public void run() {
+ HierarchyViewerDirector.getDirector().refreshPixelPerfect();
+ }
+ };
+
+ public void setPixelPerfectAutoRefresh(boolean value) {
+ synchronized (pixelPerfectRefreshTimer) {
+ if (value == autoRefresh) {
+ return;
+ }
+ autoRefresh = value;
+ if (autoRefresh) {
+ currentAutoRefreshTask = new PixelPerfectAutoRefreshTask();
+ pixelPerfectRefreshTimer.schedule(currentAutoRefreshTask,
+ pixelPerfectAutoRefreshInterval * 1000,
+ pixelPerfectAutoRefreshInterval * 1000);
+ } else {
+ currentAutoRefreshTask.cancel();
+ currentAutoRefreshTask = null;
+ }
+ }
+ }
+
+ public void setPixelPerfectAutoRefreshInterval(int value) {
+ synchronized (pixelPerfectRefreshTimer) {
+ if (pixelPerfectAutoRefreshInterval == value) {
+ return;
+ }
+ pixelPerfectAutoRefreshInterval = value;
+ if (autoRefresh) {
+ currentAutoRefreshTask.cancel();
+ long timeLeft =
+ Math.max(0, pixelPerfectAutoRefreshInterval
+ * 1000
+ - (System.currentTimeMillis() - currentAutoRefreshTask
+ .scheduledExecutionTime()));
+ currentAutoRefreshTask = new PixelPerfectAutoRefreshTask();
+ pixelPerfectRefreshTimer.schedule(currentAutoRefreshTask, timeLeft,
+ pixelPerfectAutoRefreshInterval * 1000);
+ }
+ }
+ }
+
+ public int getPixelPerfectAutoRefreshInverval() {
+ return pixelPerfectAutoRefreshInterval;
+ }
}
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/CapturePSDAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/CapturePSDAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java
index 6ae0d17..240ced1 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/CapturePSDAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-public class CapturePSDAction extends Action implements ImageAction {
+public class CapturePSDAction extends TreeViewEnabledAction implements ImageAction {
private static CapturePSDAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/DisplayViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/DisplayViewAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java
index a622eb2..4fc8024 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/DisplayViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-public class DisplayViewAction extends Action implements ImageAction {
+public class DisplayViewAction extends SelectedNodeEnabledAction implements ImageAction {
private static DisplayViewAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ImageAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/ImageAction.java
similarity index 93%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ImageAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/ImageAction.java
index 11c98a4..08320fd 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ImageAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/ImageAction.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import org.eclipse.swt.graphics.Image;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InspectScreenshotAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java
similarity index 63%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InspectScreenshotAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java
index 5109ca5..7ef7109 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InspectScreenshotAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java
@@ -14,10 +14,14 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
+import com.android.ddmlib.IDevice;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.device.Window;
+import com.android.hierarchyviewerlib.models.DeviceSelectionModel;
+import com.android.hierarchyviewerlib.models.DeviceSelectionModel.WindowChangeListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -25,7 +29,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class InspectScreenshotAction extends Action implements ImageAction {
+public class InspectScreenshotAction extends Action implements ImageAction, WindowChangeListener {
private static InspectScreenshotAction action;
@@ -38,6 +42,9 @@
image = imageLoader.loadImage("inspect-screenshot.png", Display.getDefault());
setImageDescriptor(ImageDescriptor.createFromImage(image));
setToolTipText("Inspect a screenshot in the pixel perfect view");
+ setEnabled(
+ DeviceSelectionModel.getModel().getSelectedDevice() != null);
+ DeviceSelectionModel.getModel().addWindowChangeListener(this);
}
public static InspectScreenshotAction getAction() {
@@ -55,4 +62,28 @@
public Image getImage() {
return image;
}
+
+ public void deviceChanged(IDevice device) {
+ // pass
+ }
+
+ public void deviceConnected(IDevice device) {
+ // pass
+ }
+
+ public void deviceDisconnected(IDevice device) {
+ // pass
+ }
+
+ public void focusChanged(IDevice device) {
+ // pass
+ }
+
+ public void selectionChanged(final IDevice device, final Window window) {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ InspectScreenshotAction.getAction().setEnabled(device != null);
+ }
+ });
+ }
}
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InvalidateAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InvalidateAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java
index 831a56d..aaf0ff0 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/InvalidateAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class InvalidateAction extends Action implements ImageAction {
+public class InvalidateAction extends SelectedNodeEnabledAction implements ImageAction {
private static InvalidateAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadOverlayAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadOverlayAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java
index 588b995..c948914 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadOverlayAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-public class LoadOverlayAction extends Action implements ImageAction {
+public class LoadOverlayAction extends PixelPerfectEnabledAction implements ImageAction {
private static LoadOverlayAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadViewHierarchyAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java
similarity index 63%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadViewHierarchyAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java
index 79fd0b3..d26b2ef 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadViewHierarchyAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java
@@ -14,10 +14,14 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
+import com.android.ddmlib.IDevice;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.device.Window;
+import com.android.hierarchyviewerlib.models.DeviceSelectionModel;
+import com.android.hierarchyviewerlib.models.DeviceSelectionModel.WindowChangeListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -25,7 +29,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class LoadViewHierarchyAction extends Action implements ImageAction {
+public class LoadViewHierarchyAction extends Action implements ImageAction, WindowChangeListener {
private static LoadViewHierarchyAction action;
@@ -38,6 +42,9 @@
image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault());
setImageDescriptor(ImageDescriptor.createFromImage(image));
setToolTipText("Load the view hierarchy into the tree view");
+ setEnabled(
+ DeviceSelectionModel.getModel().getSelectedWindow() != null);
+ DeviceSelectionModel.getModel().addWindowChangeListener(this);
}
public static LoadViewHierarchyAction getAction() {
@@ -55,4 +62,28 @@
public Image getImage() {
return image;
}
+
+ public void deviceChanged(IDevice device) {
+ // pass
+ }
+
+ public void deviceConnected(IDevice device) {
+ // pass
+ }
+
+ public void deviceDisconnected(IDevice device) {
+ // pass
+ }
+
+ public void focusChanged(IDevice device) {
+ // pass
+ }
+
+ public void selectionChanged(final IDevice device, final Window window) {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ LoadViewHierarchyAction.getAction().setEnabled(window != null);
+ }
+ });
+ }
}
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/PixelPerfectAutoRefreshAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java
similarity index 86%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/PixelPerfectAutoRefreshAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java
index 325eb86..5e31829 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/PixelPerfectAutoRefreshAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
-import com.android.hierarchyviewer.HierarchyViewerApplication;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
import org.eclipse.jface.action.Action;
@@ -26,7 +25,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class PixelPerfectAutoRefreshAction extends Action implements ImageAction {
+public class PixelPerfectAutoRefreshAction extends PixelPerfectEnabledAction implements ImageAction {
private static PixelPerfectAutoRefreshAction action;
@@ -50,7 +49,7 @@
@Override
public void run() {
- HierarchyViewerApplication.getApp().setAutoRefresh(action.isChecked());
+ HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefresh(action.isChecked());
}
public Image getImage() {
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java
new file mode 100644
index 0000000..9423d10
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.hierarchyviewerlib.actions;
+
+import com.android.hierarchyviewerlib.models.PixelPerfectModel;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Display;
+
+public class PixelPerfectEnabledAction extends Action implements ImageChangeListener {
+ public PixelPerfectEnabledAction(String name) {
+ super(name);
+ setEnabled(PixelPerfectModel.getModel().getImage() != null);
+ PixelPerfectModel.getModel().addImageChangeListener(this);
+ }
+
+ public PixelPerfectEnabledAction(String name, int type) {
+ super(name, type);
+ setEnabled(PixelPerfectModel.getModel().getImage() != null);
+ PixelPerfectModel.getModel().addImageChangeListener(this);
+ }
+
+ public void crosshairMoved() {
+ // pass
+ }
+
+ public void imageChanged() {
+ //
+ }
+
+ public void imageLoaded() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ setEnabled(PixelPerfectModel.getModel().getImage() != null);
+ }
+ });
+ }
+
+ public void overlayChanged() {
+ // pass
+ }
+
+ public void overlayTransparencyChanged() {
+ // pass
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void treeChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ // pass
+ }
+}
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java
index 5d68c37..a5d7514 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class RefreshPixelPerfectAction extends Action implements ImageAction {
+public class RefreshPixelPerfectAction extends PixelPerfectEnabledAction implements ImageAction {
private static RefreshPixelPerfectAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectTreeAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java
similarity index 90%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectTreeAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java
index 74c577d..41214df 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshPixelPerfectTreeAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class RefreshPixelPerfectTreeAction extends Action implements ImageAction {
+public class RefreshPixelPerfectTreeAction extends PixelPerfectEnabledAction implements ImageAction {
private static RefreshPixelPerfectTreeAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshViewAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java
index 36704a7..06c48ee 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class RefreshViewAction extends Action implements ImageAction {
+public class RefreshViewAction extends TreeViewEnabledAction implements ImageAction {
private static RefreshViewAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshWindowsAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java
similarity index 97%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshWindowsAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java
index 63808ee..47d692a 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RefreshWindowsAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RequestLayoutAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RequestLayoutAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java
index 9255432..e3d6f8f 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/RequestLayoutAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
-public class RequestLayoutAction extends Action implements ImageAction {
+public class RequestLayoutAction extends SelectedNodeEnabledAction implements ImageAction {
private static RequestLayoutAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SavePixelPerfectAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SavePixelPerfectAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java
index 2221ad8..9781d42 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SavePixelPerfectAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-public class SavePixelPerfectAction extends Action implements ImageAction {
+public class SavePixelPerfectAction extends PixelPerfectEnabledAction implements ImageAction {
private static SavePixelPerfectAction action;
diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SaveTreeViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java
similarity index 91%
rename from hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SaveTreeViewAction.java
rename to hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java
index c203ace..094b101 100644
--- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/SaveTreeViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.hierarchyviewer.actions;
+package com.android.hierarchyviewerlib.actions;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-public class SaveTreeViewAction extends Action implements ImageAction {
+public class SaveTreeViewAction extends TreeViewEnabledAction implements ImageAction {
private static SaveTreeViewAction action;
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java
new file mode 100644
index 0000000..86f75a4
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.hierarchyviewerlib.actions;
+
+import com.android.hierarchyviewerlib.models.TreeViewModel;
+import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Display;
+
+public class SelectedNodeEnabledAction extends Action implements TreeChangeListener {
+ public SelectedNodeEnabledAction(String name) {
+ super(name);
+ setEnabled(TreeViewModel.getModel().getTree() != null
+ && TreeViewModel.getModel().getSelection() != null);
+ TreeViewModel.getModel().addTreeChangeListener(this);
+ }
+
+ public void selectionChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ setEnabled(TreeViewModel.getModel().getTree() != null
+ && TreeViewModel.getModel().getSelection() != null);
+ }
+ });
+ }
+
+ public void treeChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ setEnabled(TreeViewModel.getModel().getTree() != null
+ && TreeViewModel.getModel().getSelection() != null);
+ }
+ });
+ }
+
+ public void viewportChanged() {
+ }
+
+ public void zoomChanged() {
+ }
+}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java
new file mode 100644
index 0000000..9ac7fb1
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.hierarchyviewerlib.actions;
+
+import com.android.hierarchyviewerlib.models.TreeViewModel;
+import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Display;
+
+public class TreeViewEnabledAction extends Action implements TreeChangeListener {
+ public TreeViewEnabledAction(String name) {
+ super(name);
+ setEnabled(TreeViewModel.getModel().getTree() != null);
+ TreeViewModel.getModel().addTreeChangeListener(this);
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void treeChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ setEnabled(TreeViewModel.getModel().getTree() != null);
+ }
+ });
+ }
+
+ public void viewportChanged() {
+ }
+
+ public void zoomChanged() {
+ }
+}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
index 9e91375..399e470 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
@@ -94,6 +94,9 @@
}
public static IDevice[] getDevices() {
+ if (bridge == null) {
+ return new IDevice[0];
+ }
return bridge.getDevices();
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java
index 8888642..09dfe76 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java
@@ -51,6 +51,12 @@
return model;
}
+ public boolean containsDevice(IDevice device) {
+ synchronized (deviceMap) {
+ return deviceMap.containsKey(device);
+ }
+ }
+
public void addDevice(IDevice device, Window[] windows) {
synchronized (deviceMap) {
deviceMap.put(device, windows);
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java
index 7702f49..e52db14 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java
@@ -33,6 +33,8 @@
public static final int DEFAULT_ZOOM = 8;
+ public static final int DEFAULT_OVERLAY_TRANSPARENCY_PERCENTAGE = 50;
+
private IDevice device;
private Image image;
@@ -50,7 +52,7 @@
private Image overlayImage;
- private double overlayTransparency = 0.5;
+ private double overlayTransparency = DEFAULT_OVERLAY_TRANSPARENCY_PERCENTAGE / 100.0;
private static PixelPerfectModel model;
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java
index 3c2c356..ecee8d0 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java
@@ -16,6 +16,8 @@
package com.android.hierarchyviewerlib.ui;
+import com.android.ddmuilib.ImageLoader;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
import com.android.hierarchyviewerlib.device.ViewNode;
import org.eclipse.swt.SWT;
@@ -118,6 +120,10 @@
canvas.addPaintListener(paintListener);
shell.addShellListener(shellListener);
+
+ ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class);
+ Image image = imageLoader.loadImage("display.png", Display.getDefault());
+ shell.setImage(image);
}
private static PaintListener paintListener = new PaintListener() {
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java
index 1aded6b..4e0748f 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java
@@ -62,9 +62,13 @@
private final static int ICON_WIDTH = 16;
+ private boolean doTreeViewStuff;
+
+ private boolean doPixelPerfectStuff;
+
private class ContentProvider implements ITreeContentProvider, ILabelProvider, IFontProvider {
public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof IDevice) {
+ if (parentElement instanceof IDevice && doTreeViewStuff) {
Window[] list = model.getWindows((IDevice) parentElement);
if (list != null) {
return list;
@@ -81,7 +85,7 @@
}
public boolean hasChildren(Object element) {
- if (element instanceof IDevice) {
+ if (element instanceof IDevice && doTreeViewStuff) {
Window[] list = model.getWindows((IDevice) element);
if (list != null) {
return list.length != 0;
@@ -148,8 +152,10 @@
}
}
- public DeviceSelector(Composite parent) {
+ public DeviceSelector(Composite parent, boolean doTreeViewStuff, boolean doPixelPerfectStuff) {
super(parent, SWT.NONE);
+ this.doTreeViewStuff = doTreeViewStuff;
+ this.doPixelPerfectStuff = doPixelPerfectStuff;
setLayout(new FillLayout());
treeViewer = new TreeViewer(this, SWT.SINGLE);
treeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
@@ -225,8 +231,25 @@
return tree.setFocus();
}
+ public void setMode(boolean doTreeViewStuff, boolean doPixelPerfectStuff) {
+ if (this.doTreeViewStuff != doTreeViewStuff
+ || this.doPixelPerfectStuff != doPixelPerfectStuff) {
+ final boolean expandAll = !this.doTreeViewStuff && doTreeViewStuff;
+ this.doTreeViewStuff = doTreeViewStuff;
+ this.doPixelPerfectStuff = doPixelPerfectStuff;
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ treeViewer.refresh();
+ if (expandAll) {
+ treeViewer.expandAll();
+ }
+ }
+ });
+ }
+ }
+
public void deviceConnected(final IDevice device) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
treeViewer.refresh();
treeViewer.setExpandedState(device, true);
@@ -235,7 +258,7 @@
}
public void deviceChanged(final IDevice device) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
TreeSelection selection = (TreeSelection) treeViewer.getSelection();
treeViewer.refresh(device);
@@ -248,7 +271,7 @@
}
public void deviceDisconnected(final IDevice device) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
treeViewer.refresh();
}
@@ -256,7 +279,7 @@
}
public void focusChanged(final IDevice device) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
TreeSelection selection = (TreeSelection) treeViewer.getSelection();
treeViewer.refresh(device);
@@ -274,9 +297,9 @@
public void widgetDefaultSelected(SelectionEvent e) {
Object selection = ((TreeItem) e.item).getData();
- if (selection instanceof IDevice) {
+ if (selection instanceof IDevice && doPixelPerfectStuff) {
HierarchyViewerDirector.getDirector().loadPixelPerfectData((IDevice) selection);
- } else if (selection instanceof Window) {
+ } else if (selection instanceof Window && doTreeViewStuff) {
HierarchyViewerDirector.getDirector().loadViewTreeData((Window) selection);
}
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java
index 6ae086d..1a13e48 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java
@@ -70,6 +70,8 @@
transform = new Transform(Display.getDefault());
inverse = new Transform(Display.getDefault());
+
+ treeChanged();
}
public void setShowExtras(boolean show) {
@@ -88,8 +90,12 @@
private DisposeListener disposeListener = new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
+ model.removeTreeChangeListener(LayoutViewer.this);
transform.dispose();
inverse.dispose();
+ if (selectedNode != null) {
+ selectedNode.viewNode.dereferenceImage();
+ }
}
};
@@ -279,7 +285,7 @@
}
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
redraw();
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java
index 242270b..42bcc59 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java
@@ -86,6 +86,8 @@
borderColor = new Color(Display.getDefault(), new RGB(255, 0, 0));
marginColor = new Color(Display.getDefault(), new RGB(0, 255, 0));
paddingColor = new Color(Display.getDefault(), new RGB(0, 0, 255));
+
+ imageLoaded();
}
private DisposeListener disposeListener = new DisposeListener() {
@@ -278,7 +280,7 @@
};
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
canvas.redraw();
}
@@ -305,6 +307,7 @@
crosshairLocation = model.getCrosshairLocation();
selectedNode = model.getSelected();
overlayImage = model.getOverlayImage();
+ overlayTransparency = model.getOverlayTransparency();
}
}
});
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java
new file mode 100644
index 0000000..5a593f6
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.hierarchyviewerlib.ui;
+
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel;
+import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Slider;
+
+public class PixelPerfectControls extends Composite implements ImageChangeListener {
+
+ private Slider overlaySlider;
+
+ private Slider zoomSlider;
+
+ private Slider autoRefreshSlider;
+
+ public PixelPerfectControls(Composite parent) {
+ super(parent, SWT.NONE);
+ setLayout(new FormLayout());
+
+ Label overlayTransparencyRight = new Label(this, SWT.NONE);
+ overlayTransparencyRight.setText("100%");
+ FormData overlayTransparencyRightData = new FormData();
+ overlayTransparencyRightData.right = new FormAttachment(100, -2);
+ overlayTransparencyRightData.top = new FormAttachment(0, 2);
+ overlayTransparencyRight.setLayoutData(overlayTransparencyRightData);
+
+ Label refreshRight = new Label(this, SWT.NONE);
+ refreshRight.setText("40s");
+ FormData refreshRightData = new FormData();
+ refreshRightData.right = new FormAttachment(100, -2);
+ refreshRightData.top = new FormAttachment(overlayTransparencyRight, 2);
+ refreshRightData.left = new FormAttachment(overlayTransparencyRight, 0, SWT.LEFT);
+ refreshRight.setLayoutData(refreshRightData);
+
+ Label zoomRight = new Label(this, SWT.NONE);
+ zoomRight.setText("24x");
+ FormData zoomRightData = new FormData();
+ zoomRightData.right = new FormAttachment(100, -2);
+ zoomRightData.top = new FormAttachment(refreshRight, 2);
+ zoomRightData.left = new FormAttachment(overlayTransparencyRight, 0, SWT.LEFT);
+ zoomRight.setLayoutData(zoomRightData);
+
+ Label overlayTransparency = new Label(this, SWT.NONE);
+ Label refresh = new Label(this, SWT.NONE);
+
+ overlayTransparency.setText("Overlay:");
+ FormData overlayTransparencyData = new FormData();
+ overlayTransparencyData.left = new FormAttachment(0, 2);
+ overlayTransparencyData.top = new FormAttachment(0, 2);
+ overlayTransparencyData.right = new FormAttachment(refresh, 0, SWT.RIGHT);
+ overlayTransparency.setLayoutData(overlayTransparencyData);
+
+ refresh.setText("Refresh Rate:");
+ FormData refreshData = new FormData();
+ refreshData.top = new FormAttachment(overlayTransparency, 2);
+ refreshData.left = new FormAttachment(0, 2);
+ refresh.setLayoutData(refreshData);
+
+ Label zoom = new Label(this, SWT.NONE);
+ zoom.setText("Zoom:");
+ FormData zoomData = new FormData();
+ zoomData.right = new FormAttachment(refresh, 0, SWT.RIGHT);
+ zoomData.top = new FormAttachment(refresh, 2);
+ zoomData.left = new FormAttachment(0, 2);
+ zoom.setLayoutData(zoomData);
+
+ Label overlayTransparencyLeft = new Label(this, SWT.RIGHT);
+ overlayTransparencyLeft.setText("0%");
+ FormData overlayTransparencyLeftData = new FormData();
+ overlayTransparencyLeftData.top = new FormAttachment(0, 2);
+ overlayTransparencyLeftData.left = new FormAttachment(overlayTransparency, 2);
+ overlayTransparencyLeft.setLayoutData(overlayTransparencyLeftData);
+
+ Label refreshLeft = new Label(this, SWT.RIGHT);
+ refreshLeft.setText("1s");
+ FormData refreshLeftData = new FormData();
+ refreshLeftData.top = new FormAttachment(overlayTransparencyLeft, 2);
+ refreshLeftData.left = new FormAttachment(refresh, 2);
+ refreshLeft.setLayoutData(refreshLeftData);
+
+ Label zoomLeft = new Label(this, SWT.RIGHT);
+ zoomLeft.setText("2x");
+ FormData zoomLeftData = new FormData();
+ zoomLeftData.top = new FormAttachment(refreshLeft, 2);
+ zoomLeftData.left = new FormAttachment(zoom, 2);
+ zoomLeft.setLayoutData(zoomLeftData);
+
+ overlaySlider = new Slider(this, SWT.HORIZONTAL);
+ overlaySlider.setMinimum(0);
+ overlaySlider.setMaximum(101);
+ overlaySlider.setThumb(1);
+ overlaySlider.setSelection((int) Math.round(PixelPerfectModel.getModel()
+ .getOverlayTransparency() * 100));
+
+ Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
+ overlaySlider.setEnabled(overlayImage != null);
+ FormData overlaySliderData = new FormData();
+ overlaySliderData.right = new FormAttachment(overlayTransparencyRight, -4);
+ overlaySliderData.top = new FormAttachment(0, 2);
+ overlaySliderData.left = new FormAttachment(overlayTransparencyLeft, 4);
+ overlaySlider.setLayoutData(overlaySliderData);
+
+ overlaySlider.addSelectionListener(overlaySliderSelectionListener);
+
+ autoRefreshSlider = new Slider(this, SWT.HORIZONTAL);
+ autoRefreshSlider.setMinimum(1);
+ autoRefreshSlider.setMaximum(41);
+ autoRefreshSlider.setThumb(1);
+ autoRefreshSlider.setSelection(HierarchyViewerDirector.getDirector()
+ .getPixelPerfectAutoRefreshInverval());
+ FormData refreshSliderData = new FormData();
+ refreshSliderData.right = new FormAttachment(overlayTransparencyRight, -4);
+ refreshSliderData.top = new FormAttachment(overlayTransparencyRight, 2);
+ refreshSliderData.left = new FormAttachment(overlaySlider, 0, SWT.LEFT);
+ autoRefreshSlider.setLayoutData(refreshSliderData);
+
+ autoRefreshSlider.addSelectionListener(refreshSliderSelectionListener);
+
+ zoomSlider = new Slider(this, SWT.HORIZONTAL);
+ zoomSlider.setMinimum(2);
+ zoomSlider.setMaximum(25);
+ zoomSlider.setThumb(1);
+ zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom());
+ FormData zoomSliderData = new FormData();
+ zoomSliderData.right = new FormAttachment(overlayTransparencyRight, -4);
+ zoomSliderData.top = new FormAttachment(refreshRight, 2);
+ zoomSliderData.left = new FormAttachment(overlaySlider, 0, SWT.LEFT);
+ zoomSlider.setLayoutData(zoomSliderData);
+
+ zoomSlider.addSelectionListener(zoomSliderSelectionListener);
+
+ addDisposeListener(disposeListener);
+
+ PixelPerfectModel.getModel().addImageChangeListener(this);
+ }
+
+ private DisposeListener disposeListener = new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this);
+ }
+ };
+
+ private SelectionListener overlaySliderSelectionListener = new SelectionListener() {
+ private int oldValue;
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // pass
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ int newValue = overlaySlider.getSelection();
+ if (oldValue != newValue) {
+ PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this);
+ PixelPerfectModel.getModel().setOverlayTransparency(newValue / 100.0);
+ PixelPerfectModel.getModel().addImageChangeListener(PixelPerfectControls.this);
+ oldValue = newValue;
+ }
+ }
+ };
+
+ private SelectionListener refreshSliderSelectionListener = new SelectionListener() {
+ private int oldValue;
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // pass
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ int newValue = autoRefreshSlider.getSelection();
+ if (oldValue != newValue) {
+ HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefreshInterval(newValue);
+ }
+ }
+ };
+
+ private SelectionListener zoomSliderSelectionListener = new SelectionListener() {
+ private int oldValue;
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // pass
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ int newValue = zoomSlider.getSelection();
+ if (oldValue != newValue) {
+ PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this);
+ PixelPerfectModel.getModel().setZoom(newValue);
+ PixelPerfectModel.getModel().addImageChangeListener(PixelPerfectControls.this);
+ oldValue = newValue;
+ }
+ }
+ };
+
+ public void crosshairMoved() {
+ // pass
+ }
+
+ public void treeChanged() {
+ // pass
+ }
+
+ public void imageChanged() {
+ // pass
+ }
+
+ public void imageLoaded() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
+ overlaySlider.setEnabled(overlayImage != null);
+ if (PixelPerfectModel.getModel().getImage() == null) {
+ } else {
+ zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom());
+ }
+ }
+ });
+ }
+
+ public void overlayChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
+ overlaySlider.setEnabled(overlayImage != null);
+ }
+ });
+ }
+
+ public void overlayTransparencyChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ overlaySlider.setSelection((int) (PixelPerfectModel.getModel()
+ .getOverlayTransparency() * 100));
+ }
+ });
+ }
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom());
+ }
+ });
+ }
+}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java
index b5ad13a..53afc9e 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java
@@ -85,6 +85,8 @@
crosshairColor = new Color(Display.getDefault(), new RGB(255, 94, 254));
transform = new Transform(Display.getDefault());
+
+ imageLoaded();
}
public void setShowOverlay(boolean value) {
@@ -275,7 +277,7 @@
};
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
redraw();
}
@@ -302,6 +304,7 @@
crosshairLocation = model.getCrosshairLocation();
zoom = model.getZoom();
overlayImage = model.getOverlayImage();
+ overlayTransparency = model.getOverlayTransparency();
}
}
});
@@ -344,8 +347,8 @@
// grid.
grid.dispose();
grid = null;
- zoom = model.getZoom();
}
+ zoom = model.getZoom();
}
}
});
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java
index 8fce603..afe3dc8 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java
@@ -52,6 +52,8 @@
addPaintListener(paintListener);
addDisposeListener(disposeListener);
+
+ imageLoaded();
}
@Override
@@ -135,7 +137,7 @@
};
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
redraw();
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java
index 80e4091..d34dcf2 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java
@@ -152,15 +152,12 @@
private void loadResources() {
ImageLoader loader = ImageLoader.getDdmUiLibLoader();
fileImage = loader.loadImage("file.png", Display.getDefault());
-
folderImage = loader.loadImage("folder.png", Display.getDefault());
}
private DisposeListener disposeListener = new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
model.removeImageChangeListener(PixelPerfectTree.this);
- fileImage.dispose();
- folderImage.dispose();
}
};
@@ -170,7 +167,7 @@
}
public void imageLoaded() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
treeViewer.refresh();
treeViewer.expandAll();
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java
index d7c5b1a..14068a3 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java
@@ -210,6 +210,8 @@
new TreeColumnResizer(this, propertyColumn, valueColumn);
addControlListener(controlListener);
+
+ treeChanged();
}
public void loadResources() {
@@ -280,7 +282,7 @@
}
private void doRefresh() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
treeViewer.refresh();
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java
index e2a0a6d..ea53ee4 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java
@@ -16,6 +16,7 @@
package com.android.hierarchyviewerlib.ui;
+import com.android.ddmlib.Log;
import com.android.ddmuilib.ImageLoader;
import com.android.hierarchyviewerlib.HierarchyViewerDirector;
import com.android.hierarchyviewerlib.device.ViewNode.ProfileRating;
@@ -164,6 +165,7 @@
transform = new Transform(Display.getDefault());
inverse = new Transform(Display.getDefault());
+ loadAllData();
}
private void loadResources() {
@@ -190,6 +192,9 @@
inverse.dispose();
boxColor.dispose();
textBackgroundColor.dispose();
+ if (tree != null) {
+ model.setViewport(null);
+ }
}
};
@@ -959,12 +964,37 @@
}
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
redraw();
}
});
}
+
+ public void loadAllData() {
+ boolean newViewport = viewport == null;
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ synchronized (this) {
+ tree = model.getTree();
+ selectedNode = model.getSelection();
+ viewport = model.getViewport();
+ zoom = model.getZoom();
+ if (tree != null && viewport == null) {
+ viewport =
+ new Rectangle(0, tree.top + DrawableViewNode.NODE_HEIGHT / 2
+ - getBounds().height / 2, getBounds().width,
+ getBounds().height);
+ } else {
+ setTransform();
+ }
+ }
+ }
+ });
+ if (newViewport) {
+ model.setViewport(viewport);
+ }
+ }
// Fickle behaviour... When a new tree is loaded, the model doesn't know
// about the viewport until it passes through here.
@@ -987,6 +1017,8 @@
});
if (viewport != null) {
model.setViewport(viewport);
+ } else {
+ doRedraw();
}
}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java
new file mode 100644
index 0000000..08117b5
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.hierarchyviewerlib.ui;
+
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
+import com.android.hierarchyviewerlib.models.TreeViewModel;
+import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Slider;
+import org.eclipse.swt.widgets.Text;
+
+public class TreeViewControls extends Composite implements TreeChangeListener {
+
+ private Text filterText;
+
+ private Slider zoomSlider;
+
+ public TreeViewControls(Composite parent) {
+ super(parent, SWT.NONE);
+ GridLayout layout = new GridLayout(5, false);
+ layout.marginWidth = layout.marginHeight = 2;
+ layout.verticalSpacing = layout.horizontalSpacing = 4;
+ setLayout(layout);
+
+ Label filterLabel = new Label(this, SWT.NONE);
+ filterLabel.setText("Filter by class or id:");
+ filterLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
+
+ filterText = new Text(this, SWT.LEFT | SWT.SINGLE);
+ filterText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ filterText.addModifyListener(filterTextModifyListener);
+ filterText.setText(HierarchyViewerDirector.getDirector().getFilterText());
+
+ Label smallZoomLabel = new Label(this, SWT.NONE);
+ smallZoomLabel.setText(" 20%");
+ smallZoomLabel
+ .setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
+
+ zoomSlider = new Slider(this, SWT.HORIZONTAL);
+ GridData zoomSliderGridData = new GridData(GridData.CENTER, GridData.CENTER, false, false);
+ zoomSliderGridData.widthHint = 190;
+ zoomSlider.setLayoutData(zoomSliderGridData);
+ zoomSlider.setMinimum((int) (TreeViewModel.MIN_ZOOM * 10));
+ zoomSlider.setMaximum((int) (TreeViewModel.MAX_ZOOM * 10 + 1));
+ zoomSlider.setThumb(1);
+ zoomSlider.setSelection((int) Math.round(TreeViewModel.getModel().getZoom() * 10));
+
+ zoomSlider.addSelectionListener(zoomSliderSelectionListener);
+
+ Label largeZoomLabel = new Label(this, SWT.NONE);
+ largeZoomLabel
+ .setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true));
+ largeZoomLabel.setText("200%");
+
+ addDisposeListener(disposeListener);
+
+ TreeViewModel.getModel().addTreeChangeListener(this);
+ }
+
+ private DisposeListener disposeListener = new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ TreeViewModel.getModel().removeTreeChangeListener(TreeViewControls.this);
+ }
+ };
+
+ private SelectionListener zoomSliderSelectionListener = new SelectionListener() {
+ private int oldValue;
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // pass
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ int newValue = zoomSlider.getSelection();
+ if (oldValue != newValue) {
+ TreeViewModel.getModel().removeTreeChangeListener(TreeViewControls.this);
+ TreeViewModel.getModel().setZoom(newValue / 10.0);
+ TreeViewModel.getModel().addTreeChangeListener(TreeViewControls.this);
+ oldValue = newValue;
+ }
+ }
+ };
+
+ private ModifyListener filterTextModifyListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ HierarchyViewerDirector.getDirector().filterNodes(filterText.getText());
+ }
+ };
+
+ public void selectionChanged() {
+ // pass
+ }
+
+ public void treeChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ if (TreeViewModel.getModel().getTree() != null) {
+ zoomSlider.setSelection((int) Math
+ .round(TreeViewModel.getModel().getZoom() * 10));
+ }
+ filterText.setText("");
+ }
+ });
+ }
+
+ public void viewportChanged() {
+ // pass
+ }
+
+ public void zoomChanged() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ zoomSlider.setSelection((int) Math.round(TreeViewModel.getModel().getZoom() * 10));
+ }
+ });
+ };
+}
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java
index ee84ccb..fb01b86 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java
@@ -85,6 +85,8 @@
transform = new Transform(Display.getDefault());
inverse = new Transform(Display.getDefault());
+
+ loadAllData();
}
private void loadResources() {
@@ -207,7 +209,7 @@
private PaintListener paintListener = new PaintListener() {
public void paintControl(PaintEvent e) {
synchronized (TreeViewOverview.this) {
- if (tree != null && viewport != null) {
+ if (tree != null) {
e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
e.gc.fillRectangle(0, 0, getBounds().width, getBounds().height);
@@ -218,16 +220,20 @@
e.gc.drawPath(connectionPath);
connectionPath.dispose();
- e.gc.setAlpha(50);
- e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
- e.gc.fillRectangle((int) viewport.x, (int) viewport.y, (int) Math
- .ceil(viewport.width), (int) Math.ceil(viewport.height));
+ if (viewport != null) {
+ e.gc.setAlpha(50);
+ e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
+ e.gc.fillRectangle((int) viewport.x, (int) viewport.y, (int) Math
+ .ceil(viewport.width), (int) Math.ceil(viewport.height));
- e.gc.setAlpha(255);
- e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_DARK_GRAY));
- e.gc.setLineWidth((int) Math.ceil(2 / scale));
- e.gc.drawRectangle((int) viewport.x, (int) viewport.y, (int) Math
- .ceil(viewport.width), (int) Math.ceil(viewport.height));
+ e.gc.setAlpha(255);
+ e.gc
+ .setForeground(Display.getDefault().getSystemColor(
+ SWT.COLOR_DARK_GRAY));
+ e.gc.setLineWidth((int) Math.ceil(2 / scale));
+ e.gc.drawRectangle((int) viewport.x, (int) viewport.y, (int) Math
+ .ceil(viewport.width), (int) Math.ceil(viewport.height));
+ }
}
}
}
@@ -267,13 +273,27 @@
}
private void doRedraw() {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
redraw();
}
});
}
+ public void loadAllData() {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ synchronized (this) {
+ tree = model.getTree();
+ selectedNode = model.getSelection();
+ viewport = model.getViewport();
+ setBounds();
+ setTransform();
+ }
+ }
+ });
+ }
+
// Note the syncExec and then synchronized... It avoids deadlock
public void treeChanged() {
Display.getDefault().syncExec(new Runnable() {
@@ -281,6 +301,7 @@
synchronized (this) {
tree = model.getTree();
selectedNode = model.getSelection();
+ viewport = model.getViewport();
setBounds();
setTransform();
}
@@ -299,11 +320,16 @@
bounds.height =
Math.max(viewport.y + viewport.height, tree.bounds.y + tree.bounds.height)
- bounds.y;
+ } else if (tree != null) {
+ bounds.x = tree.bounds.x;
+ bounds.y = tree.bounds.y;
+ bounds.width = tree.bounds.x + tree.bounds.width - bounds.x;
+ bounds.height = tree.bounds.y + tree.bounds.height - bounds.y;
}
}
private void setTransform() {
- if (viewport != null && tree != null) {
+ if (tree != null) {
transform.identity();
inverse.identity();
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png
new file mode 100644
index 0000000..ba9c305
--- /dev/null
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/resources/images/show-extras.png
Binary files differ
