diff options
| author | Konstantin Lopyrev <klopyrev@google.com> | 2010-08-27 17:55:52 -0700 |
|---|---|---|
| committer | Konstantin Lopyrev <klopyrev@google.com> | 2010-08-27 17:57:32 -0700 |
| commit | 901803a3b2aaeafb4074974ec5bf9b08cc39d1c8 (patch) | |
| tree | 8f94df3e25d7c594cc5afc8812dc8ce732d6b006 | |
| parent | c8079b0edde6c191fdca26f2c7ac49ce3bdf7a91 (diff) | |
| download | sdk-901803a3b2aaeafb4074974ec5bf9b08cc39d1c8.zip sdk-901803a3b2aaeafb4074974ec5bf9b08cc39d1c8.tar.gz sdk-901803a3b2aaeafb4074974ec5bf9b08cc39d1c8.tar.bz2 | |
Renaming and adding //$NON-NLS-?$
Change-Id: I9f5fa1625af4b35499cfc87996d0b3a39841ba31
61 files changed, 1900 insertions, 1900 deletions
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 8996cdb..8f94c65 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,7 +16,6 @@ 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; @@ -40,14 +39,14 @@ import java.util.Calendar; */ public class HierarchyViewerPlugin extends AbstractUIPlugin { - public static final String PLUGIN_ID = "com.android.ide.eclipse.hierarchyviewer"; + public static final String PLUGIN_ID = "com.android.ide.eclipse.hierarchyviewer"; //$NON-NLS-1$ - public static final String ADB_LOCATION = PLUGIN_ID + ".adb"; + public static final String ADB_LOCATION = PLUGIN_ID + ".adb"; //$NON-NLS-1$ // The shared instance - private static HierarchyViewerPlugin plugin; + private static HierarchyViewerPlugin sPlugin; - private Color redColor; + private Color mRedColor; /** * The constructor @@ -58,18 +57,18 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { @Override public void start(BundleContext context) throws Exception { super.start(context); - plugin = this; + sPlugin = this; // set the consoles. - final MessageConsole messageConsole = new MessageConsole("Hierarchy Viewer", null); // $NON-NLS-1$ + 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); + mRedColor = new Color(Display.getDefault(), 0xFF, 0x00, 0x00); // because this can be run, in some cases, by a non UI thread, and // because @@ -78,7 +77,7 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { // in the UI thread. Display.getDefault().asyncExec(new Runnable() { public void run() { - errorConsoleStream.setColor(redColor); + errorConsoleStream.setColor(mRedColor); } }); @@ -131,10 +130,10 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { */ @Override public void stop(BundleContext context) throws Exception { - plugin = null; + sPlugin = null; super.stop(context); - redColor.dispose(); + mRedColor.dispose(); HierarchyViewerDirector director = HierarchyViewerDirector.getDirector(); director.stopListenForDevices(); @@ -148,7 +147,7 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { * @return the shared instance */ public static HierarchyViewerPlugin getPlugin() { - return plugin; + return sPlugin; } /** @@ -160,7 +159,7 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { 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); + sPlugin.getPreferenceStore().setValue(ADB_LOCATION, adb); // starts the server in a thread in case this is blocking. if (startAdb) { @@ -201,9 +200,9 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin { Calendar c = Calendar.getInstance(); if (tag == null) { - return String.format("[%1$tF %1$tT]", c); + return String.format("[%1$tF %1$tT]", c); //$NON-NLS-1$ } - return String.format("[%1$tF %1$tT - %2$s]", c, tag); + return String.format("[%1$tF %1$tT - %2$s]", c, tag); //$NON-NLS-1$ } } 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 index f1374ae..7104784 100644 --- 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 @@ -48,11 +48,11 @@ public class HierarchyViewerPluginDirector extends HierarchyViewerDirector { } }; job.setPriority(Job.SHORT); - job.setRule(schedulingRule); + job.setRule(mSchedulingRule); job.schedule(); } - private ISchedulingRule schedulingRule = new ISchedulingRule() { + private ISchedulingRule mSchedulingRule = new ISchedulingRule() { public boolean contains(ISchedulingRule rule) { return rule == this; } 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 index bcaf8f9..def2864 100644 --- 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 @@ -29,7 +29,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class PixelPerfectPespective implements IPerspectiveFactory { public static final String ID = - "com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective"; + "com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective"; //$NON-NLS-1$ public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); @@ -37,14 +37,14 @@ public class PixelPerfectPespective implements IPerspectiveFactory { String editorArea = layout.getEditorArea(); IFolderLayout folder; - folder = layout.createFolder("tree", IPageLayout.LEFT, 0.25f, editorArea); + folder = layout.createFolder("tree", IPageLayout.LEFT, 0.25f, editorArea); //$NON-NLS-1$ folder.addView(DeviceSelectorView.ID); folder.addView(PixelPerfectTreeView.ID); - folder = layout.createFolder("overview", IPageLayout.RIGHT, 0.4f, editorArea); + folder = layout.createFolder("overview", IPageLayout.RIGHT, 0.4f, editorArea); //$NON-NLS-1$ folder.addView(PixelPerfectView.ID); - folder = layout.createFolder("main", IPageLayout.RIGHT, 0.35f, editorArea); + folder = layout.createFolder("main", IPageLayout.RIGHT, 0.35f, editorArea); //$NON-NLS-1$ folder.addView(PixelPerfectLoupeView.ID); @@ -53,7 +53,7 @@ public class PixelPerfectPespective implements IPerspectiveFactory { layout.addShowViewShortcut(PixelPerfectLoupeView.ID); layout.addShowViewShortcut(PixelPerfectView.ID); - layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective"); + layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective"); //$NON-NLS-1$ 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 index 7022509..09fca66 100644 --- 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 @@ -29,7 +29,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class TreeViewPerspective implements IPerspectiveFactory { - public static final String ID = "com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective"; + public static final String ID = "com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective"; //$NON-NLS-1$ public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); @@ -37,18 +37,18 @@ public class TreeViewPerspective implements IPerspectiveFactory { String editorArea = layout.getEditorArea(); IFolderLayout folder; - folder = layout.createFolder("properties", IPageLayout.LEFT, 0.10f, editorArea); + folder = layout.createFolder("properties", IPageLayout.LEFT, 0.10f, editorArea); //$NON-NLS-1$ folder.addView(DeviceSelectorView.ID); folder.addView(PropertyView.ID); - folder = layout.createFolder("main", IPageLayout.RIGHT, 0.24f, "properties"); + folder = layout.createFolder("main", IPageLayout.RIGHT, 0.24f, "properties"); //$NON-NLS-1$ //$NON-NLS-2$ folder.addView(TreeViewView.ID); - folder = layout.createFolder("panel-top", IPageLayout.RIGHT, 0.7f, "main"); + folder = layout.createFolder("panel-top", IPageLayout.RIGHT, 0.7f, "main"); //$NON-NLS-1$ //$NON-NLS-2$ folder.addView(TreeOverviewView.ID); - folder = layout.createFolder("panel-bottom", IPageLayout.BOTTOM, 0.5f, "panel-top"); + folder = layout.createFolder("panel-bottom", IPageLayout.BOTTOM, 0.5f, "panel-top"); //$NON-NLS-1$ //$NON-NLS-2$ folder.addView(LayoutView.ID); layout.addShowViewShortcut(DeviceSelectorView.ID); @@ -57,7 +57,7 @@ public class TreeViewPerspective implements IPerspectiveFactory { layout.addShowViewShortcut(LayoutView.ID); layout.addShowViewShortcut(TreeViewView.ID); - layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective"); + layout.addPerspectiveShortcut("org.eclipse.jdt.ui.JavaPerspective"); //$NON-NLS-1$ 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 index c884115..e2fac78 100644 --- 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 @@ -36,9 +36,9 @@ 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"; + "com.android.ide.eclipse.hierarchyviewer.views.DeviceSelectorView"; //$NON-NLS-1$ - private DeviceSelector deviceSelector; + private DeviceSelector mDeviceSelector; @Override public void createPartControl(Composite parent) { @@ -53,7 +53,7 @@ public class DeviceSelectorView extends ViewPart implements IPerspectiveListener } else if (perspective.getId().equals(TreeViewPerspective.ID)) { doPixelPerfectStuff = false; } - deviceSelector = new DeviceSelector(parent, doTreeViewStuff, doPixelPerfectStuff); + mDeviceSelector = new DeviceSelector(parent, doTreeViewStuff, doPixelPerfectStuff); placeActions(doTreeViewStuff, doPixelPerfectStuff); @@ -93,18 +93,18 @@ public class DeviceSelectorView extends ViewPart implements IPerspectiveListener @Override public void setFocus() { - deviceSelector.setFocus(); + mDeviceSelector.setFocus(); } public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { if (perspective.getId().equals(PixelPerfectPespective.ID)) { - deviceSelector.setMode(false, true); + mDeviceSelector.setMode(false, true); placeActions(false, true); } else if (perspective.getId().equals(TreeViewPerspective.ID)) { - deviceSelector.setMode(true, false); + mDeviceSelector.setMode(true, false); placeActions(true, false); } else { - deviceSelector.setMode(true, true); + mDeviceSelector.setMode(true, true); placeActions(true, true); } } 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 index be401b6..2fb51a3 100644 --- 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 @@ -36,68 +36,68 @@ 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"; + public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.LayoutView"; //$NON-NLS-1$ - private LayoutViewer layoutViewer; + private LayoutViewer mLayoutViewer; - private Image onBlack; + private Image mOnBlack; - private Image onWhite; + private Image mOnWhite; - private Action showExtrasAction = new Action("Show &Extras", Action.AS_CHECK_BOX) { + private Action mShowExtrasAction = new Action("Show &Extras", Action.AS_CHECK_BOX) { @Override public void run() { - layoutViewer.setShowExtras(isChecked()); + mLayoutViewer.setShowExtras(isChecked()); } }; - private Action loadAllViewsAction = new Action("Load All &Views") { + private Action mLoadAllViewsAction = new Action("Load All &Views") { @Override public void run() { HierarchyViewerDirector.getDirector().loadAllViews(); - showExtrasAction.setChecked(true); - layoutViewer.setShowExtras(true); + mShowExtrasAction.setChecked(true); + mLayoutViewer.setShowExtras(true); } }; - private Action onBlackWhiteAction = new Action("Change Background &Color") { + private Action mOnBlackWhiteAction = new Action("Change Background &Color") { @Override public void run() { - boolean newValue = !layoutViewer.getOnBlack(); - layoutViewer.setOnBlack(newValue); + boolean newValue = !mLayoutViewer.getOnBlack(); + mLayoutViewer.setOnBlack(newValue); if (newValue) { - setImageDescriptor(ImageDescriptor.createFromImage(onWhite)); + setImageDescriptor(ImageDescriptor.createFromImage(mOnWhite)); } else { - setImageDescriptor(ImageDescriptor.createFromImage(onBlack)); + setImageDescriptor(ImageDescriptor.createFromImage(mOnBlack)); } } }; @Override public void createPartControl(Composite parent) { - showExtrasAction.setAccelerator(SWT.MOD1 + 'E'); + mShowExtrasAction.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); + Image image = imageLoader.loadImage("show-extras.png", Display.getDefault()); //$NON-NLS-1$ + mShowExtrasAction.setImageDescriptor(ImageDescriptor.createFromImage(image)); + mShowExtrasAction.setToolTipText("Show images"); + mShowExtrasAction.setEnabled(TreeViewModel.getModel().getTree() != null); - onWhite = imageLoader.loadImage("on-white.png", Display.getDefault()); - onBlack = imageLoader.loadImage("on-black.png", Display.getDefault()); + mOnWhite = imageLoader.loadImage("on-white.png", Display.getDefault()); //$NON-NLS-1$ + mOnBlack = imageLoader.loadImage("on-black.png", Display.getDefault()); //$NON-NLS-1$ - onBlackWhiteAction.setAccelerator(SWT.MOD1 + 'C'); - onBlackWhiteAction.setImageDescriptor(ImageDescriptor.createFromImage(onWhite)); - onBlackWhiteAction.setToolTipText("Change layout viewer background color"); + mOnBlackWhiteAction.setAccelerator(SWT.MOD1 + 'C'); + mOnBlackWhiteAction.setImageDescriptor(ImageDescriptor.createFromImage(mOnWhite)); + mOnBlackWhiteAction.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); + mLoadAllViewsAction.setAccelerator(SWT.MOD1 + 'V'); + image = imageLoader.loadImage("load-all-views.png", Display.getDefault()); //$NON-NLS-1$ + mLoadAllViewsAction.setImageDescriptor(ImageDescriptor.createFromImage(image)); + mLoadAllViewsAction.setToolTipText("Load all view images"); + mLoadAllViewsAction.setEnabled(TreeViewModel.getModel().getTree() != null); parent.setLayout(new FillLayout()); - layoutViewer = new LayoutViewer(parent); + mLayoutViewer = new LayoutViewer(parent); placeActions(); @@ -109,15 +109,15 @@ public class LayoutView extends ViewPart implements TreeChangeListener { IMenuManager mm = actionBars.getMenuManager(); mm.removeAll(); - mm.add(onBlackWhiteAction); - mm.add(showExtrasAction); - mm.add(loadAllViewsAction); + mm.add(mOnBlackWhiteAction); + mm.add(mShowExtrasAction); + mm.add(mLoadAllViewsAction); IToolBarManager tm = actionBars.getToolBarManager(); tm.removeAll(); - tm.add(onBlackWhiteAction); - tm.add(showExtrasAction); - tm.add(loadAllViewsAction); + tm.add(mOnBlackWhiteAction); + tm.add(mShowExtrasAction); + tm.add(mLoadAllViewsAction); } @Override @@ -128,7 +128,7 @@ public class LayoutView extends ViewPart implements TreeChangeListener { @Override public void setFocus() { - layoutViewer.setFocus(); + mLayoutViewer.setFocus(); } public void selectionChanged() { @@ -138,8 +138,8 @@ public class LayoutView extends ViewPart implements TreeChangeListener { public void treeChanged() { Display.getDefault().syncExec(new Runnable() { public void run() { - loadAllViewsAction.setEnabled(TreeViewModel.getModel().getTree() != null); - showExtrasAction.setEnabled(TreeViewModel.getModel().getTree() != null); + mLoadAllViewsAction.setEnabled(TreeViewModel.getModel().getTree() != null); + mShowExtrasAction.setEnabled(TreeViewModel.getModel().getTree() != null); } }); } 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 index 05777c4..1ec1a6f 100644 --- 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 @@ -41,24 +41,24 @@ 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"; + "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectLoupeView"; //$NON-NLS-1$ - private PixelPerfectLoupe pixelPerfectLoupe; + private PixelPerfectLoupe mPixelPerfectLoupe; - private Action showInLoupeAction = new Action("&Show Overlay", Action.AS_CHECK_BOX) { + private Action mShowInLoupeAction = new Action("&Show Overlay", Action.AS_CHECK_BOX) { @Override public void run() { - pixelPerfectLoupe.setShowOverlay(isChecked()); + mPixelPerfectLoupe.setShowOverlay(isChecked()); } }; @Override public void createPartControl(Composite parent) { - showInLoupeAction.setAccelerator(SWT.MOD1 + 'S'); + mShowInLoupeAction.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); + Image image = imageLoader.loadImage("show-overlay.png", Display.getDefault()); //$NON-NLS-1$ + mShowInLoupeAction.setImageDescriptor(ImageDescriptor.createFromImage(image)); + mShowInLoupeAction.setToolTipText("Show the overlay in the loupe view"); + mShowInLoupeAction.setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null); PixelPerfectModel.getModel().addImageChangeListener(this); GridLayout loupeLayout = new GridLayout(); @@ -75,8 +75,8 @@ public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListen pixelPerfectLoupeBorderGridLayout.verticalSpacing = 0; pixelPerfectLoupeBorder.setLayout(pixelPerfectLoupeBorderGridLayout); - pixelPerfectLoupe = new PixelPerfectLoupe(pixelPerfectLoupeBorder); - pixelPerfectLoupe.setLayoutData(new GridData(GridData.FILL_BOTH)); + mPixelPerfectLoupe = new PixelPerfectLoupe(pixelPerfectLoupeBorder); + mPixelPerfectLoupe.setLayoutData(new GridData(GridData.FILL_BOTH)); PixelPerfectPixelPanel pixelPerfectPixelPanel = new PixelPerfectPixelPanel(pixelPerfectLoupeBorder); @@ -95,12 +95,12 @@ public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListen IMenuManager mm = actionBars.getMenuManager(); mm.removeAll(); mm.add(PixelPerfectAutoRefreshAction.getAction()); - mm.add(showInLoupeAction); + mm.add(mShowInLoupeAction); IToolBarManager tm = actionBars.getToolBarManager(); tm.removeAll(); tm.add(PixelPerfectAutoRefreshAction.getAction()); - tm.add(showInLoupeAction); + tm.add(mShowInLoupeAction); } @Override @@ -111,7 +111,7 @@ public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListen @Override public void setFocus() { - pixelPerfectLoupe.setFocus(); + mPixelPerfectLoupe.setFocus(); } public void crosshairMoved() { @@ -130,7 +130,7 @@ public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListen Display.getDefault().syncExec(new Runnable() { public void run() { Image overlayImage = PixelPerfectModel.getModel().getOverlayImage(); - showInLoupeAction.setEnabled(overlayImage != null); + mShowInLoupeAction.setEnabled(overlayImage != null); } }); } @@ -138,7 +138,8 @@ public class PixelPerfectLoupeView extends ViewPart implements ImageChangeListen public void overlayChanged() { Display.getDefault().syncExec(new Runnable() { public void run() { - showInLoupeAction.setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null); + mShowInLoupeAction + .setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null); } }); } 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 index 811b8fc..f3591f7 100644 --- 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 @@ -29,14 +29,14 @@ import org.eclipse.ui.part.ViewPart; public class PixelPerfectTreeView extends ViewPart { public static final String ID = - "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView"; + "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectTreeView"; //$NON-NLS-1$ - private PixelPerfectTree pixelPerfectTree; + private PixelPerfectTree mPixelPerfectTree; @Override public void createPartControl(Composite parent) { parent.setLayout(new FillLayout()); - pixelPerfectTree = new PixelPerfectTree(parent); + mPixelPerfectTree = new PixelPerfectTree(parent); placeActions(); } @@ -55,7 +55,7 @@ public class PixelPerfectTreeView extends ViewPart { @Override public void setFocus() { - pixelPerfectTree.setFocus(); + mPixelPerfectTree.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 index a09eb5c..943a6c8 100644 --- 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 @@ -31,14 +31,14 @@ import org.eclipse.ui.part.ViewPart; public class PixelPerfectView extends ViewPart { public static final String ID = - "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView"; + "com.android.ide.eclipse.hierarchyviewer.views.PixelPerfectView"; //$NON-NLS-1$ - private PixelPerfect pixelPerfect; + private PixelPerfect mPixelPerfect; @Override public void createPartControl(Composite parent) { parent.setLayout(new FillLayout()); - pixelPerfect = new PixelPerfect(parent); + mPixelPerfect = new PixelPerfect(parent); placeActions(); } @@ -61,7 +61,7 @@ public class PixelPerfectView extends ViewPart { @Override public void setFocus() { - pixelPerfect.setFocus(); + mPixelPerfect.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 index bd6d462..74f50fd 100644 --- 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 @@ -24,20 +24,20 @@ import org.eclipse.ui.part.ViewPart; public class PropertyView extends ViewPart { - public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.PropertyView"; + public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.PropertyView"; //$NON-NLS-1$ - private PropertyViewer propertyViewer; + private PropertyViewer mPropertyViewer; @Override public void createPartControl(Composite parent) { parent.setLayout(new FillLayout()); - propertyViewer = new PropertyViewer(parent); + mPropertyViewer = new PropertyViewer(parent); } @Override public void setFocus() { - propertyViewer.setFocus(); + mPropertyViewer.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 index 5363c1b..e18771b 100644 --- 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 @@ -25,19 +25,19 @@ import org.eclipse.ui.part.ViewPart; public class TreeOverviewView extends ViewPart { public static final String ID = - "com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView"; + "com.android.ide.eclipse.hierarchyviewer.views.TreeOverviewView"; //$NON-NLS-1$ - private TreeViewOverview treeViewOverview; + private TreeViewOverview mTreeViewOverview; @Override public void createPartControl(Composite parent) { parent.setLayout(new FillLayout()); - treeViewOverview = new TreeViewOverview(parent); + mTreeViewOverview = new TreeViewOverview(parent); } @Override public void setFocus() { - treeViewOverview.setFocus(); + mTreeViewOverview.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 index 76d9b54..f24f420 100644 --- 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 @@ -39,9 +39,9 @@ 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"; + public static final String ID = "com.android.ide.eclipse.hierarchyviewer.views.TreeViewView"; //$NON-NLS-1$ - private TreeView treeView; + private TreeView mTreeView; @Override public void createPartControl(Composite parent) { @@ -54,7 +54,7 @@ public class TreeViewView extends ViewPart { treeViewContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); treeViewContainer.setLayout(new FillLayout()); - treeView = new TreeView(treeViewContainer); + mTreeView = new TreeView(treeViewContainer); TreeViewControls treeViewControls = new TreeViewControls(parent); treeViewControls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -91,7 +91,7 @@ public class TreeViewView extends ViewPart { @Override public void setFocus() { - treeView.setFocus(); + mTreeView.setFocus(); } } diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/AboutDialog.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/AboutDialog.java index 54edbc8..3f973e7 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/AboutDialog.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/AboutDialog.java @@ -34,15 +34,15 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; public class AboutDialog extends Dialog { - private Image aboutImage; + private Image mAboutImage; - private Image smallImage; + private Image mSmallImage; public AboutDialog(Shell shell) { super(shell); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - smallImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); - aboutImage = imageLoader.loadImage("about.jpg", Display.getDefault()); + mSmallImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$ + mAboutImage = imageLoader.loadImage("about.jpg", Display.getDefault()); //$NON-NLS-1$ } @Override @@ -58,14 +58,14 @@ public class AboutDialog extends Dialog { imageControl.setLayout(new FillLayout()); imageControl.setLayoutData(new GridData(GridData.FILL_VERTICAL)); Label imageLabel = new Label(imageControl, SWT.CENTER); - imageLabel.setImage(aboutImage); + imageLabel.setImage(mAboutImage); CLabel textLabel = new CLabel(control, SWT.NONE); textLabel .setText("Hierarchy Viewer\nCopyright 2010, The Android Open Source Project\nAll Rights Reserved."); textLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, true)); getShell().setText("About..."); - getShell().setImage(smallImage); + getShell().setImage(mSmallImage); return control; } diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java index f5c6e98..df4f08f 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplication.java @@ -39,8 +39,8 @@ 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.PixelPerfectModel.ImageChangeListener; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import com.android.hierarchyviewerlib.ui.DeviceSelector; import com.android.hierarchyviewerlib.ui.LayoutViewer; import com.android.hierarchyviewerlib.ui.PixelPerfect; @@ -84,74 +84,74 @@ public class HierarchyViewerApplication extends ApplicationWindow { private static final int INITIAL_HEIGHT = 768; - private static HierarchyViewerApplication APP; + private static HierarchyViewerApplication mApp; // Images for moving between the 3 main windows. - private Image deviceViewImage; + private Image mDeviceViewImage; - private Image pixelPerfectImage; + private Image mPixelPerfectImage; - private Image treeViewImage; + private Image mTreeViewImage; - private Image deviceViewSelectedImage; + private Image mDeviceViewSelectedImage; - private Image pixelPerfectSelectedImage; + private Image mPixelPerfectSelectedImage; - private Image treeViewSelectedImage; + private Image mTreeViewSelectedImage; // And their buttons - private Button treeViewButton; + private Button mTreeViewButton; - private Button pixelPerfectButton; + private Button mPixelPerfectButton; - private Button deviceViewButton; + private Button mDeviceViewButton; - private Label progressLabel; + private Label mProgressLabel; - private ProgressBar progressBar; + private ProgressBar mProgressBar; - private String progressString; + private String mProgressString; - private Composite deviceSelectorPanel; + private Composite mDeviceSelectorPanel; - private Composite treeViewPanel; + private Composite mTreeViewPanel; - private Composite pixelPerfectPanel; + private Composite mPixelPerfectPanel; - private StackLayout mainWindowStackLayout; + private StackLayout mMainWindowStackLayout; - private DeviceSelector deviceSelector; + private DeviceSelector mDeviceSelector; - private Composite statusBar; + private Composite mStatusBar; - private TreeView treeView; + private TreeView mTreeView; - private Composite mainWindow; + private Composite mMainWindow; - private Image onBlackImage; + private Image mOnBlackImage; - private Image onWhiteImage; + private Image mOnWhiteImage; - private Button onBlackWhiteButton; + private Button mOnBlackWhiteButton; - private Button showExtras; + private Button mShowExtras; - private LayoutViewer layoutViewer; + private LayoutViewer mLayoutViewer; - private PixelPerfectLoupe pixelPerfectLoupe; + private PixelPerfectLoupe mPixelPerfectLoupe; - private Composite treeViewControls; + private Composite mTreeViewControls; public static final HierarchyViewerApplication getApp() { - return APP; + return mApp; } public HierarchyViewerApplication() { super(null); - APP = this; + mApp = this; addMenuBar(); } @@ -161,7 +161,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { super.configureShell(shell); shell.setText("Hierarchy Viewer"); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - Image image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); + Image image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$ shell.setImage(image); } @@ -203,17 +203,17 @@ public class HierarchyViewerApplication extends ApplicationWindow { private void loadResources() { ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - treeViewImage = imageLoader.loadImage("tree-view.png", Display.getDefault()); - treeViewSelectedImage = - imageLoader.loadImage("tree-view-selected.png", Display.getDefault()); - pixelPerfectImage = imageLoader.loadImage("pixel-perfect-view.png", Display.getDefault()); - pixelPerfectSelectedImage = - imageLoader.loadImage("pixel-perfect-view-selected.png", Display.getDefault()); - deviceViewImage = imageLoader.loadImage("device-view.png", Display.getDefault()); - deviceViewSelectedImage = - imageLoader.loadImage("device-view-selected.png", Display.getDefault()); - onBlackImage = imageLoader.loadImage("on-black.png", Display.getDefault()); - onWhiteImage = imageLoader.loadImage("on-white.png", Display.getDefault()); + mTreeViewImage = imageLoader.loadImage("tree-view.png", Display.getDefault()); //$NON-NLS-1$ + mTreeViewSelectedImage = + imageLoader.loadImage("tree-view-selected.png", Display.getDefault()); //$NON-NLS-1$ + mPixelPerfectImage = imageLoader.loadImage("pixel-perfect-view.png", Display.getDefault()); //$NON-NLS-1$ + mPixelPerfectSelectedImage = + imageLoader.loadImage("pixel-perfect-view-selected.png", Display.getDefault()); //$NON-NLS-1$ + mDeviceViewImage = imageLoader.loadImage("device-view.png", Display.getDefault()); //$NON-NLS-1$ + mDeviceViewSelectedImage = + imageLoader.loadImage("device-view-selected.png", Display.getDefault()); //$NON-NLS-1$ + mOnBlackImage = imageLoader.loadImage("on-black.png", Display.getDefault()); //$NON-NLS-1$ + mOnWhiteImage = imageLoader.loadImage("on-white.png", Display.getDefault()); //$NON-NLS-1$ } @Override @@ -225,14 +225,14 @@ public class HierarchyViewerApplication extends ApplicationWindow { mainLayout.marginHeight = mainLayout.marginWidth = 0; mainLayout.verticalSpacing = mainLayout.horizontalSpacing = 0; control.setLayout(mainLayout); - mainWindow = new Composite(control, SWT.NONE); - mainWindow.setLayoutData(new GridData(GridData.FILL_BOTH)); - mainWindowStackLayout = new StackLayout(); - mainWindow.setLayout(mainWindowStackLayout); + mMainWindow = new Composite(control, SWT.NONE); + mMainWindow.setLayoutData(new GridData(GridData.FILL_BOTH)); + mMainWindowStackLayout = new StackLayout(); + mMainWindow.setLayout(mMainWindowStackLayout); - buildDeviceSelectorPanel(mainWindow); - buildTreeViewPanel(mainWindow); - buildPixelPerfectPanel(mainWindow); + buildDeviceSelectorPanel(mMainWindow); + buildTreeViewPanel(mMainWindow); + buildPixelPerfectPanel(mMainWindow); buildStatusBar(control); @@ -243,78 +243,78 @@ public class HierarchyViewerApplication extends ApplicationWindow { private void buildStatusBar(Composite parent) { - statusBar = new Composite(parent, SWT.NONE); - statusBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + mStatusBar = new Composite(parent, SWT.NONE); + mStatusBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); FormLayout statusBarLayout = new FormLayout(); statusBarLayout.marginHeight = statusBarLayout.marginWidth = 2; - statusBar.setLayout(statusBarLayout); + mStatusBar.setLayout(statusBarLayout); - deviceViewButton = new Button(statusBar, SWT.TOGGLE); - deviceViewButton.setImage(deviceViewImage); - deviceViewButton.setToolTipText("Switch to the window selection view"); - deviceViewButton.addSelectionListener(deviceViewButtonSelectionListener); + mDeviceViewButton = new Button(mStatusBar, SWT.TOGGLE); + mDeviceViewButton.setImage(mDeviceViewImage); + mDeviceViewButton.setToolTipText("Switch to the window selection view"); + mDeviceViewButton.addSelectionListener(deviceViewButtonSelectionListener); FormData deviceViewButtonFormData = new FormData(); deviceViewButtonFormData.left = new FormAttachment(); - deviceViewButton.setLayoutData(deviceViewButtonFormData); + mDeviceViewButton.setLayoutData(deviceViewButtonFormData); - treeViewButton = new Button(statusBar, SWT.TOGGLE); - treeViewButton.setImage(treeViewImage); - treeViewButton.setEnabled(false); - treeViewButton.setToolTipText("Switch to the tree view"); - treeViewButton.addSelectionListener(treeViewButtonSelectionListener); + mTreeViewButton = new Button(mStatusBar, SWT.TOGGLE); + mTreeViewButton.setImage(mTreeViewImage); + mTreeViewButton.setEnabled(false); + mTreeViewButton.setToolTipText("Switch to the tree view"); + mTreeViewButton.addSelectionListener(treeViewButtonSelectionListener); FormData treeViewButtonFormData = new FormData(); - treeViewButtonFormData.left = new FormAttachment(deviceViewButton, 2); - treeViewButton.setLayoutData(treeViewButtonFormData); - - pixelPerfectButton = new Button(statusBar, SWT.TOGGLE); - pixelPerfectButton.setImage(pixelPerfectImage); - pixelPerfectButton.setEnabled(false); - pixelPerfectButton.setToolTipText("Switch to the pixel perfect view"); - pixelPerfectButton.addSelectionListener(pixelPerfectButtonSelectionListener); + treeViewButtonFormData.left = new FormAttachment(mDeviceViewButton, 2); + mTreeViewButton.setLayoutData(treeViewButtonFormData); + + mPixelPerfectButton = new Button(mStatusBar, SWT.TOGGLE); + mPixelPerfectButton.setImage(mPixelPerfectImage); + mPixelPerfectButton.setEnabled(false); + mPixelPerfectButton.setToolTipText("Switch to the pixel perfect view"); + mPixelPerfectButton.addSelectionListener(pixelPerfectButtonSelectionListener); FormData pixelPerfectButtonFormData = new FormData(); - pixelPerfectButtonFormData.left = new FormAttachment(treeViewButton, 2); - pixelPerfectButton.setLayoutData(pixelPerfectButtonFormData); + pixelPerfectButtonFormData.left = new FormAttachment(mTreeViewButton, 2); + mPixelPerfectButton.setLayoutData(pixelPerfectButtonFormData); // Tree View control panel... - treeViewControls = new TreeViewControls(statusBar); + mTreeViewControls = new TreeViewControls(mStatusBar); FormData treeViewControlsFormData = new FormData(); - treeViewControlsFormData.left = new FormAttachment(pixelPerfectButton, 2); - treeViewControlsFormData.top = new FormAttachment(treeViewButton, 0, SWT.CENTER); + treeViewControlsFormData.left = new FormAttachment(mPixelPerfectButton, 2); + treeViewControlsFormData.top = new FormAttachment(mTreeViewButton, 0, SWT.CENTER); treeViewControlsFormData.width = 552; - treeViewControls.setLayoutData(treeViewControlsFormData); + mTreeViewControls.setLayoutData(treeViewControlsFormData); // Progress stuff - progressLabel = new Label(statusBar, SWT.RIGHT); + mProgressLabel = new Label(mStatusBar, SWT.RIGHT); - progressBar = new ProgressBar(statusBar, SWT.HORIZONTAL | SWT.INDETERMINATE | SWT.SMOOTH); + mProgressBar = new ProgressBar(mStatusBar, SWT.HORIZONTAL | SWT.INDETERMINATE | SWT.SMOOTH); FormData progressBarFormData = new FormData(); progressBarFormData.right = new FormAttachment(100, 0); - progressBarFormData.top = new FormAttachment(treeViewButton, 0, SWT.CENTER); - progressBar.setLayoutData(progressBarFormData); + progressBarFormData.top = new FormAttachment(mTreeViewButton, 0, SWT.CENTER); + mProgressBar.setLayoutData(progressBarFormData); FormData progressLabelFormData = new FormData(); - progressLabelFormData.right = new FormAttachment(progressBar, -2); - progressLabelFormData.top = new FormAttachment(treeViewButton, 0, SWT.CENTER); - progressLabel.setLayoutData(progressLabelFormData); + progressLabelFormData.right = new FormAttachment(mProgressBar, -2); + progressLabelFormData.top = new FormAttachment(mTreeViewButton, 0, SWT.CENTER); + mProgressLabel.setLayoutData(progressLabelFormData); - if (progressString == null) { - progressLabel.setVisible(false); - progressBar.setVisible(false); + if (mProgressString == null) { + mProgressLabel.setVisible(false); + mProgressBar.setVisible(false); } else { - progressLabel.setText(progressString); + mProgressLabel.setText(mProgressString); } } private void buildDeviceSelectorPanel(Composite parent) { - deviceSelectorPanel = new Composite(parent, SWT.NONE); + mDeviceSelectorPanel = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(); gridLayout.marginWidth = gridLayout.marginHeight = 0; gridLayout.horizontalSpacing = gridLayout.verticalSpacing = 0; - deviceSelectorPanel.setLayout(gridLayout); + mDeviceSelectorPanel.setLayout(gridLayout); - Composite buttonPanel = new Composite(deviceSelectorPanel, SWT.NONE); + Composite buttonPanel = new Composite(mDeviceSelectorPanel, SWT.NONE); buttonPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); GridLayout buttonLayout = new GridLayout(); @@ -341,20 +341,20 @@ public class HierarchyViewerApplication extends ApplicationWindow { new ActionButton(innerButtonPanel, InspectScreenshotAction.getAction()); inspectScreenshotButton.setLayoutData(new GridData(GridData.FILL_BOTH)); - Composite deviceSelectorContainer = new Composite(deviceSelectorPanel, SWT.BORDER); + Composite deviceSelectorContainer = new Composite(mDeviceSelectorPanel, SWT.BORDER); deviceSelectorContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); deviceSelectorContainer.setLayout(new FillLayout()); - deviceSelector = new DeviceSelector(deviceSelectorContainer, true, true); + mDeviceSelector = new DeviceSelector(deviceSelectorContainer, true, true); } public void buildTreeViewPanel(Composite parent) { - treeViewPanel = new Composite(parent, SWT.NONE); + mTreeViewPanel = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(); gridLayout.marginWidth = gridLayout.marginHeight = 0; gridLayout.horizontalSpacing = gridLayout.verticalSpacing = 0; - treeViewPanel.setLayout(gridLayout); + mTreeViewPanel.setLayout(gridLayout); - Composite buttonPanel = new Composite(treeViewPanel, SWT.NONE); + Composite buttonPanel = new Composite(mTreeViewPanel, SWT.NONE); buttonPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); GridLayout buttonLayout = new GridLayout(); @@ -392,11 +392,11 @@ public class HierarchyViewerApplication extends ApplicationWindow { new ActionButton(innerButtonPanel, RequestLayoutAction.getAction()); requestLayout.setLayoutData(new GridData(GridData.FILL_BOTH)); - SashForm mainSash = new SashForm(treeViewPanel, SWT.HORIZONTAL | SWT.SMOOTH); + SashForm mainSash = new SashForm(mTreeViewPanel, SWT.HORIZONTAL | SWT.SMOOTH); mainSash.setLayoutData(new GridData(GridData.FILL_BOTH)); Composite treeViewContainer = new Composite(mainSash, SWT.BORDER); treeViewContainer.setLayout(new FillLayout()); - treeView = new TreeView(treeViewContainer); + mTreeView = new TreeView(treeViewContainer); SashForm sideSash = new SashForm(mainSash, SWT.VERTICAL | SWT.SMOOTH); @@ -436,15 +436,15 @@ public class HierarchyViewerApplication extends ApplicationWindow { rowLayout.center = true; buttonBar.setLayout(rowLayout); - onBlackWhiteButton = new Button(buttonBar, SWT.PUSH); - onBlackWhiteButton.setImage(onWhiteImage); - onBlackWhiteButton.addSelectionListener(onBlackWhiteSelectionListener); - onBlackWhiteButton.setToolTipText("Change layout viewer background color"); + mOnBlackWhiteButton = new Button(buttonBar, SWT.PUSH); + mOnBlackWhiteButton.setImage(mOnWhiteImage); + mOnBlackWhiteButton.addSelectionListener(onBlackWhiteSelectionListener); + mOnBlackWhiteButton.setToolTipText("Change layout viewer background color"); - showExtras = new Button(buttonBar, SWT.CHECK); - showExtras.setText("Show Extras"); - showExtras.addSelectionListener(showExtrasSelectionListener); - showExtras.setToolTipText("Show images"); + mShowExtras = new Button(buttonBar, SWT.CHECK); + mShowExtras.setText("Show Extras"); + mShowExtras.addSelectionListener(showExtrasSelectionListener); + mShowExtras.setToolTipText("Show images"); ActionButton loadAllViewsButton = new ActionButton(fullButtonBar, LoadAllViewsAction.getAction()); @@ -454,7 +454,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { Composite layoutViewerMainContainer = new Composite(layoutViewerContainer, SWT.BORDER); layoutViewerMainContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); layoutViewerMainContainer.setLayout(new FillLayout()); - layoutViewer = new LayoutViewer(layoutViewerMainContainer); + mLayoutViewer = new LayoutViewer(layoutViewerMainContainer); sideSash.SASH_WIDTH = 4; sideSash.setWeights(new int[] { @@ -464,13 +464,13 @@ public class HierarchyViewerApplication extends ApplicationWindow { } private void buildPixelPerfectPanel(Composite parent) { - pixelPerfectPanel = new Composite(parent, SWT.NONE); + mPixelPerfectPanel = new Composite(parent, SWT.NONE); GridLayout gridLayout = new GridLayout(); gridLayout.marginWidth = gridLayout.marginHeight = 0; gridLayout.horizontalSpacing = gridLayout.verticalSpacing = 0; - pixelPerfectPanel.setLayout(gridLayout); + mPixelPerfectPanel.setLayout(gridLayout); - Composite buttonPanel = new Composite(pixelPerfectPanel, SWT.NONE); + Composite buttonPanel = new Composite(mPixelPerfectPanel, SWT.NONE); buttonPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); GridLayout buttonLayout = new GridLayout(); @@ -509,7 +509,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { new ActionButton(innerButtonPanel, PixelPerfectAutoRefreshAction.getAction()); autoRefresh.setLayoutData(new GridData(GridData.FILL_BOTH)); - SashForm mainSash = new SashForm(pixelPerfectPanel, SWT.HORIZONTAL | SWT.SMOOTH); + SashForm mainSash = new SashForm(mPixelPerfectPanel, SWT.HORIZONTAL | SWT.SMOOTH); mainSash.setLayoutData(new GridData(GridData.FILL_BOTH)); mainSash.SASH_WIDTH = 4; @@ -532,8 +532,8 @@ public class HierarchyViewerApplication extends ApplicationWindow { pixelPerfectLoupeBorderGridLayout.verticalSpacing = 0; pixelPerfectLoupeBorder.setLayout(pixelPerfectLoupeBorderGridLayout); - pixelPerfectLoupe = new PixelPerfectLoupe(pixelPerfectLoupeBorder); - pixelPerfectLoupe.setLayoutData(new GridData(GridData.FILL_BOTH)); + mPixelPerfectLoupe = new PixelPerfectLoupe(pixelPerfectLoupeBorder); + mPixelPerfectLoupe.setLayoutData(new GridData(GridData.FILL_BOTH)); PixelPerfectPixelPanel pixelPerfectPixelPanel = new PixelPerfectPixelPanel(pixelPerfectLoupeBorder); @@ -555,19 +555,19 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void showOverlayInLoupe(boolean value) { - pixelPerfectLoupe.setShowOverlay(value); + mPixelPerfectLoupe.setShowOverlay(value); } // Shows the progress notification... public void startTask(final String taskName) { - progressString = taskName; + mProgressString = taskName; Display.getDefault().syncExec(new Runnable() { public void run() { - if (progressLabel != null && progressBar != null) { - progressLabel.setText(taskName); - progressLabel.setVisible(true); - progressBar.setVisible(true); - statusBar.layout(); + if (mProgressLabel != null && mProgressBar != null) { + mProgressLabel.setText(taskName); + mProgressLabel.setVisible(true); + mProgressBar.setVisible(true); + mStatusBar.layout(); } } }); @@ -575,12 +575,12 @@ public class HierarchyViewerApplication extends ApplicationWindow { // And hides it! public void endTask() { - progressString = null; + mProgressString = null; Display.getDefault().syncExec(new Runnable() { public void run() { - if (progressLabel != null && progressBar != null) { - progressLabel.setVisible(false); - progressBar.setVisible(false); + if (mProgressLabel != null && mProgressBar != null) { + mProgressLabel.setVisible(false); + mProgressBar.setVisible(false); } } }); @@ -610,22 +610,22 @@ public class HierarchyViewerApplication extends ApplicationWindow { mm.updateAll(true); - deviceViewButton.setSelection(true); - deviceViewButton.setImage(deviceViewSelectedImage); + mDeviceViewButton.setSelection(true); + mDeviceViewButton.setImage(mDeviceViewSelectedImage); - treeViewButton.setSelection(false); - treeViewButton.setImage(treeViewImage); + mTreeViewButton.setSelection(false); + mTreeViewButton.setImage(mTreeViewImage); - pixelPerfectButton.setSelection(false); - pixelPerfectButton.setImage(pixelPerfectImage); + mPixelPerfectButton.setSelection(false); + mPixelPerfectButton.setImage(mPixelPerfectImage); - mainWindowStackLayout.topControl = deviceSelectorPanel; + mMainWindowStackLayout.topControl = mDeviceSelectorPanel; - mainWindow.layout(); + mMainWindow.layout(); - deviceSelector.setFocus(); + mDeviceSelector.setFocus(); - treeViewControls.setVisible(false); + mTreeViewControls.setVisible(false); } public void showTreeView() { @@ -657,22 +657,22 @@ public class HierarchyViewerApplication extends ApplicationWindow { mm.updateAll(true); - deviceViewButton.setSelection(false); - deviceViewButton.setImage(deviceViewImage); + mDeviceViewButton.setSelection(false); + mDeviceViewButton.setImage(mDeviceViewImage); - treeViewButton.setSelection(true); - treeViewButton.setImage(treeViewSelectedImage); + mTreeViewButton.setSelection(true); + mTreeViewButton.setImage(mTreeViewSelectedImage); - pixelPerfectButton.setSelection(false); - pixelPerfectButton.setImage(pixelPerfectImage); + mPixelPerfectButton.setSelection(false); + mPixelPerfectButton.setImage(mPixelPerfectImage); - mainWindowStackLayout.topControl = treeViewPanel; + mMainWindowStackLayout.topControl = mTreeViewPanel; - mainWindow.layout(); + mMainWindow.layout(); - treeView.setFocus(); + mTreeView.setFocus(); - treeViewControls.setVisible(true); + mTreeViewControls.setVisible(true); } public void showPixelPerfect() { @@ -703,22 +703,22 @@ public class HierarchyViewerApplication extends ApplicationWindow { mm.updateAll(true); - deviceViewButton.setSelection(false); - deviceViewButton.setImage(deviceViewImage); + mDeviceViewButton.setSelection(false); + mDeviceViewButton.setImage(mDeviceViewImage); - treeViewButton.setSelection(false); - treeViewButton.setImage(treeViewImage); + mTreeViewButton.setSelection(false); + mTreeViewButton.setImage(mTreeViewImage); - pixelPerfectButton.setSelection(true); - pixelPerfectButton.setImage(pixelPerfectSelectedImage); + mPixelPerfectButton.setSelection(true); + mPixelPerfectButton.setImage(mPixelPerfectSelectedImage); - mainWindowStackLayout.topControl = pixelPerfectPanel; + mMainWindowStackLayout.topControl = mPixelPerfectPanel; - mainWindow.layout(); + mMainWindow.layout(); - pixelPerfectLoupe.setFocus(); + mPixelPerfectLoupe.setFocus(); - treeViewControls.setVisible(false); + mTreeViewControls.setVisible(false); } private SelectionListener deviceViewButtonSelectionListener = new SelectionListener() { @@ -727,7 +727,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - deviceViewButton.setSelection(true); + mDeviceViewButton.setSelection(true); showDeviceSelector(); } }; @@ -738,7 +738,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - treeViewButton.setSelection(true); + mTreeViewButton.setSelection(true); showTreeView(); } }; @@ -749,7 +749,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - pixelPerfectButton.setSelection(true); + mPixelPerfectButton.setSelection(true); showPixelPerfect(); } }; @@ -760,12 +760,12 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - if (layoutViewer.getOnBlack()) { - layoutViewer.setOnBlack(false); - onBlackWhiteButton.setImage(onBlackImage); + if (mLayoutViewer.getOnBlack()) { + mLayoutViewer.setOnBlack(false); + mOnBlackWhiteButton.setImage(mOnBlackImage); } else { - layoutViewer.setOnBlack(true); - onBlackWhiteButton.setImage(onWhiteImage); + mLayoutViewer.setOnBlack(true); + mOnBlackWhiteButton.setImage(mOnWhiteImage); } } }; @@ -776,7 +776,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - layoutViewer.setShowExtras(showExtras.getSelection()); + mLayoutViewer.setShowExtras(mShowExtras.getSelection()); } }; @@ -786,12 +786,12 @@ public class HierarchyViewerApplication extends ApplicationWindow { } public void widgetSelected(SelectionEvent e) { - showExtras.setSelection(true); + mShowExtras.setSelection(true); showExtrasSelectionListener.widgetSelected(null); } }; - private TreeChangeListener treeChangeListener = new TreeChangeListener() { + private ITreeChangeListener treeChangeListener = new ITreeChangeListener() { public void selectionChanged() { // pass } @@ -801,10 +801,10 @@ public class HierarchyViewerApplication extends ApplicationWindow { public void run() { if (TreeViewModel.getModel().getTree() == null) { showDeviceSelector(); - treeViewButton.setEnabled(false); + mTreeViewButton.setEnabled(false); } else { showTreeView(); - treeViewButton.setEnabled(true); + mTreeViewButton.setEnabled(true); } } }); @@ -819,7 +819,7 @@ public class HierarchyViewerApplication extends ApplicationWindow { } }; - private ImageChangeListener imageChangeListener = new ImageChangeListener() { + private IImageChangeListener imageChangeListener = new IImageChangeListener() { public void crosshairMoved() { // pass @@ -837,10 +837,10 @@ public class HierarchyViewerApplication extends ApplicationWindow { Display.getDefault().syncExec(new Runnable() { public void run() { if (PixelPerfectModel.getModel().getImage() == null) { - pixelPerfectButton.setEnabled(false); + mPixelPerfectButton.setEnabled(false); showDeviceSelector(); } else { - pixelPerfectButton.setEnabled(true); + mPixelPerfectButton.setEnabled(true); showPixelPerfect(); } } diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplicationDirector.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplicationDirector.java index f26cc2c..23b6210 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplicationDirector.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/HierarchyViewerApplicationDirector.java @@ -28,16 +28,16 @@ import java.util.concurrent.Executors; */ public class HierarchyViewerApplicationDirector extends HierarchyViewerDirector { - private final ExecutorService executor = Executors.newSingleThreadExecutor(); + private final ExecutorService mExecutor = Executors.newSingleThreadExecutor(); public static HierarchyViewerDirector createDirector() { - return director = new HierarchyViewerApplicationDirector(); + return sDirector = new HierarchyViewerApplicationDirector(); } @Override public void terminate() { super.terminate(); - executor.shutdown(); + mExecutor.shutdown(); } /* @@ -46,7 +46,7 @@ public class HierarchyViewerApplicationDirector extends HierarchyViewerDirector */ @Override public String getAdbLocation() { - String hvParentLocation = System.getProperty("com.android.hierarchyviewer.bindir"); + String hvParentLocation = System.getProperty("com.android.hierarchyviewer.bindir"); //$NON-NLS-1$ if (hvParentLocation != null && hvParentLocation.length() != 0) { return hvParentLocation + File.separator + SdkConstants.FN_ADB; } @@ -60,7 +60,7 @@ public class HierarchyViewerApplicationDirector extends HierarchyViewerDirector */ @Override public void executeInBackground(final String taskName, final Runnable task) { - executor.execute(new Runnable() { + mExecutor.execute(new Runnable() { public void run() { HierarchyViewerApplication.getApp().startTask(taskName); task.run(); diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java index c6abe57..0c7c7b2 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/AboutAction.java @@ -30,35 +30,35 @@ import org.eclipse.swt.widgets.Shell; public class AboutAction extends Action implements ImageAction { - private static AboutAction action; + private static AboutAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private AboutAction(Shell shell) { super("&About"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'A'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("about-small.jpg", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("about-small.jpg", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Shows the about dialog"); } public static AboutAction getAction(Shell shell) { - if (action == null) { - action = new AboutAction(shell); + if (sAction == null) { + sAction = new AboutAction(shell); } - return action; + return sAction; } @Override public void run() { - new AboutDialog(shell).open(); + new AboutDialog(mShell).open(); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java index 5007e1e..33e044d 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/LoadAllViewsAction.java @@ -28,24 +28,24 @@ import org.eclipse.swt.widgets.Display; public class LoadAllViewsAction extends TreeViewEnabledAction implements ImageAction { - private static LoadAllViewsAction action; + private static LoadAllViewsAction sAction; - private Image image; + private Image mImage; private LoadAllViewsAction() { super("Load All &Views"); setAccelerator(SWT.MOD1 + 'V'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("load-all-views.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("load-all-views.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Load all view images"); } public static LoadAllViewsAction getAction() { - if (action == null) { - action = new LoadAllViewsAction(); + if (sAction == null) { + sAction = new LoadAllViewsAction(); } - return action; + return sAction; } @Override @@ -54,6 +54,6 @@ public class LoadAllViewsAction extends TreeViewEnabledAction implements ImageAc } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/QuitAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/QuitAction.java index 693d55a..3e9598d 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/QuitAction.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/QuitAction.java @@ -23,7 +23,7 @@ import org.eclipse.swt.SWT; public class QuitAction extends Action { - private static QuitAction action; + private static QuitAction sAction; private QuitAction() { super("E&xit"); @@ -31,10 +31,10 @@ public class QuitAction extends Action { } public static QuitAction getAction() { - if (action == null) { - action = new QuitAction(); + if (sAction == null) { + sAction = new QuitAction(); } - return action; + return sAction; } @Override diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java index e4695cd..987386d 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/actions/ShowOverlayAction.java @@ -21,7 +21,7 @@ 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 com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; @@ -29,37 +29,37 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -public class ShowOverlayAction extends Action implements ImageAction, ImageChangeListener { +public class ShowOverlayAction extends Action implements ImageAction, IImageChangeListener { - private static ShowOverlayAction action; + private static ShowOverlayAction sAction; - private Image image; + private Image mImage; private ShowOverlayAction() { super("Show In &Loupe", Action.AS_CHECK_BOX); setAccelerator(SWT.MOD1 + 'L'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("show-overlay.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("show-overlay.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Show the overlay in the loupe view"); setEnabled(PixelPerfectModel.getModel().getOverlayImage() != null); PixelPerfectModel.getModel().addImageChangeListener(this); } public static ShowOverlayAction getAction() { - if (action == null) { - action = new ShowOverlayAction(); + if (sAction == null) { + sAction = new ShowOverlayAction(); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerApplication.getApp().showOverlayInLoupe(action.isChecked()); + HierarchyViewerApplication.getApp().showOverlayInLoupe(sAction.isChecked()); } public Image getImage() { - return image; + return mImage; } public void crosshairMoved() { diff --git a/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java b/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java index cf8d5e2..4681c40 100644 --- a/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java +++ b/hierarchyviewer2/app/src/com/android/hierarchyviewer/util/ActionButton.java @@ -28,35 +28,35 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; public class ActionButton implements IPropertyChangeListener, SelectionListener { - private Button button; + private Button mButton; - private Action action; + private Action mAction; public ActionButton(Composite parent, ImageAction action) { - this.action = (Action) action; - if (this.action.getStyle() == Action.AS_CHECK_BOX) { - button = new Button(parent, SWT.CHECK); + this.mAction = (Action) action; + if (this.mAction.getStyle() == Action.AS_CHECK_BOX) { + mButton = new Button(parent, SWT.CHECK); } else { - button = new Button(parent, SWT.PUSH); + mButton = new Button(parent, SWT.PUSH); } - button.setText(action.getText()); - button.setImage(action.getImage()); - this.action.addPropertyChangeListener(this); - button.addSelectionListener(this); - button.setToolTipText(action.getToolTipText()); - button.setEnabled(this.action.isEnabled()); + mButton.setText(action.getText()); + mButton.setImage(action.getImage()); + this.mAction.addPropertyChangeListener(this); + mButton.addSelectionListener(this); + mButton.setToolTipText(action.getToolTipText()); + mButton.setEnabled(this.mAction.isEnabled()); } public void propertyChange(PropertyChangeEvent e) { - if (e.getProperty().toUpperCase().equals("ENABLED")) { - button.setEnabled((Boolean) e.getNewValue()); - } else if (e.getProperty().toUpperCase().equals("CHECKED")) { - button.setSelection(action.isChecked()); + if (e.getProperty().toUpperCase().equals("ENABLED")) { //$NON-NLS-1$ + mButton.setEnabled((Boolean) e.getNewValue()); + } else if (e.getProperty().toUpperCase().equals("CHECKED")) { //$NON-NLS-1$ + mButton.setSelection(mAction.isChecked()); } } public void setLayoutData(Object data) { - button.setLayoutData(data); + mButton.setLayoutData(data); } public void widgetDefaultSelected(SelectionEvent e) { @@ -64,13 +64,13 @@ public class ActionButton implements IPropertyChangeListener, SelectionListener } public void widgetSelected(SelectionEvent e) { - if (action.getStyle() == Action.AS_CHECK_BOX) { - action.setChecked(button.getSelection()); + if (mAction.getStyle() == Action.AS_CHECK_BOX) { + mAction.setChecked(mButton.getSelection()); } - action.run(); + mAction.run(); } public void addSelectionListener(SelectionListener listener) { - button.addSelectionListener(listener); + mButton.addSelectionListener(listener); } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java index 1264d60..63b30c0 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java @@ -59,33 +59,33 @@ import java.util.TimerTask; public abstract class HierarchyViewerDirector implements IDeviceChangeListener, IWindowChangeListener { - protected static HierarchyViewerDirector director; + protected static HierarchyViewerDirector sDirector; public static final String TAG = "hierarchyviewer"; - private int pixelPerfectRefreshesInProgress = 0; + private int mPixelPerfectRefreshesInProgress = 0; - private Timer pixelPerfectRefreshTimer = new Timer(); + private Timer mPixelPerfectRefreshTimer = new Timer(); - private boolean autoRefresh = false; + private boolean mAutoRefresh = false; public static final int DEFAULT_PIXEL_PERFECT_AUTOREFRESH_INTERVAL = 5; - private int pixelPerfectAutoRefreshInterval = DEFAULT_PIXEL_PERFECT_AUTOREFRESH_INTERVAL; + private int mPixelPerfectAutoRefreshInterval = DEFAULT_PIXEL_PERFECT_AUTOREFRESH_INTERVAL; - private PixelPerfectAutoRefreshTask currentAutoRefreshTask; + private PixelPerfectAutoRefreshTask mCurrentAutoRefreshTask; - private String filterText = ""; + private String mFilterText = ""; //$NON-NLS-1$ public void terminate() { WindowUpdater.terminate(); - pixelPerfectRefreshTimer.cancel(); + mPixelPerfectRefreshTimer.cancel(); } public abstract String getAdbLocation(); public static HierarchyViewerDirector getDirector() { - return director; + return sDirector; } public void initDebugBridge() { @@ -174,7 +174,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, Window treeViewWindow = TreeViewModel.getModel().getWindow(); if (treeViewWindow != null && treeViewWindow.getDevice() == device) { TreeViewModel.getModel().setData(null, null); - filterText = ""; + mFilterText = ""; //$NON-NLS-1$ } } }); @@ -219,9 +219,9 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, // want it to refresh following the last focus change. boolean proceed = false; synchronized (this) { - if (pixelPerfectRefreshesInProgress <= 1) { + if (mPixelPerfectRefreshesInProgress <= 1) { proceed = true; - pixelPerfectRefreshesInProgress++; + mPixelPerfectRefreshesInProgress++; } } if (proceed) { @@ -232,7 +232,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, PixelPerfectModel.getModel().setImage(screenshotImage); } synchronized (HierarchyViewerDirector.this) { - pixelPerfectRefreshesInProgress--; + mPixelPerfectRefreshesInProgress--; } } @@ -307,7 +307,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, executeInBackground("Loading view hierarchy", new Runnable() { public void run() { - filterText = ""; + mFilterText = ""; //$NON-NLS-1$ ViewNode viewNode = DeviceBridge.loadWindowData(window); if (viewNode != null) { @@ -324,7 +324,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, public void run() { FileDialog fileDialog = new FileDialog(shell, SWT.OPEN); fileDialog.setFilterExtensions(new String[] { - "*.jpg;*.jpeg;*.png;*.gif;*.bmp" + "*.jpg;*.jpeg;*.png;*.gif;*.bmp" //$NON-NLS-1$ }); fileDialog.setFilterNames(new String[] { "Image (*.jpg, *.jpeg, *.png, *.gif, *.bmp)" @@ -430,7 +430,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, if (viewNode != null) { FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); fileDialog.setFilterExtensions(new String[] { - "*.png" + "*.png" //$NON-NLS-1$ }); fileDialog.setFilterNames(new String[] { "Portable Network Graphics File (*.png)" @@ -446,8 +446,8 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, image.getImageData() }; String extensionedFileName = fileName; - if (!extensionedFileName.toLowerCase().endsWith(".png")) { - extensionedFileName += ".png"; + if (!extensionedFileName.toLowerCase().endsWith(".png")) { //$NON-NLS-1$ + extensionedFileName += ".png"; //$NON-NLS-1$ } try { imageLoader.save(extensionedFileName, SWT.IMAGE_PNG); @@ -472,7 +472,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, final ImageData imageData = untouchableImage.getImageData(); FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); fileDialog.setFilterExtensions(new String[] { - "*.png" + "*.png" //$NON-NLS-1$ }); fileDialog.setFilterNames(new String[] { "Portable Network Graphics File (*.png)" @@ -487,8 +487,8 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, imageData }; String extensionedFileName = fileName; - if (!extensionedFileName.toLowerCase().endsWith(".png")) { - extensionedFileName += ".png"; + if (!extensionedFileName.toLowerCase().endsWith(".png")) { //$NON-NLS-1$ + extensionedFileName += ".png"; //$NON-NLS-1$ } try { imageLoader.save(extensionedFileName, SWT.IMAGE_PNG); @@ -511,7 +511,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, if (window != null) { FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); fileDialog.setFilterExtensions(new String[] { - "*.psd" + "*.psd" //$NON-NLS-1$ }); fileDialog.setFilterNames(new String[] { "Photoshop Document (*.psd)" @@ -524,8 +524,8 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, PsdFile psdFile = DeviceBridge.captureLayers(window); if (psdFile != null) { String extensionedFileName = fileName; - if (!extensionedFileName.toLowerCase().endsWith(".psd")) { - extensionedFileName += ".psd"; + if (!extensionedFileName.toLowerCase().endsWith(".psd")) { //$NON-NLS-1$ + extensionedFileName += ".psd"; //$NON-NLS-1$ } try { psdFile.write(new FileOutputStream(extensionedFileName)); @@ -596,7 +596,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, } public void filterNodes(String filterText) { - this.filterText = filterText; + this.mFilterText = filterText; DrawableViewNode tree = TreeViewModel.getModel().getTree(); if (tree != null) { tree.viewNode.filter(filterText); @@ -606,7 +606,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, } public String getFilterText() { - return filterText; + return mFilterText; } private static class PixelPerfectAutoRefreshTask extends TimerTask { @@ -617,44 +617,44 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener, }; public void setPixelPerfectAutoRefresh(boolean value) { - synchronized (pixelPerfectRefreshTimer) { - if (value == autoRefresh) { + synchronized (mPixelPerfectRefreshTimer) { + if (value == mAutoRefresh) { return; } - autoRefresh = value; - if (autoRefresh) { - currentAutoRefreshTask = new PixelPerfectAutoRefreshTask(); - pixelPerfectRefreshTimer.schedule(currentAutoRefreshTask, - pixelPerfectAutoRefreshInterval * 1000, - pixelPerfectAutoRefreshInterval * 1000); + mAutoRefresh = value; + if (mAutoRefresh) { + mCurrentAutoRefreshTask = new PixelPerfectAutoRefreshTask(); + mPixelPerfectRefreshTimer.schedule(mCurrentAutoRefreshTask, + mPixelPerfectAutoRefreshInterval * 1000, + mPixelPerfectAutoRefreshInterval * 1000); } else { - currentAutoRefreshTask.cancel(); - currentAutoRefreshTask = null; + mCurrentAutoRefreshTask.cancel(); + mCurrentAutoRefreshTask = null; } } } public void setPixelPerfectAutoRefreshInterval(int value) { - synchronized (pixelPerfectRefreshTimer) { - if (pixelPerfectAutoRefreshInterval == value) { + synchronized (mPixelPerfectRefreshTimer) { + if (mPixelPerfectAutoRefreshInterval == value) { return; } - pixelPerfectAutoRefreshInterval = value; - if (autoRefresh) { - currentAutoRefreshTask.cancel(); + mPixelPerfectAutoRefreshInterval = value; + if (mAutoRefresh) { + mCurrentAutoRefreshTask.cancel(); long timeLeft = - Math.max(0, pixelPerfectAutoRefreshInterval + Math.max(0, mPixelPerfectAutoRefreshInterval * 1000 - - (System.currentTimeMillis() - currentAutoRefreshTask + - (System.currentTimeMillis() - mCurrentAutoRefreshTask .scheduledExecutionTime())); - currentAutoRefreshTask = new PixelPerfectAutoRefreshTask(); - pixelPerfectRefreshTimer.schedule(currentAutoRefreshTask, timeLeft, - pixelPerfectAutoRefreshInterval * 1000); + mCurrentAutoRefreshTask = new PixelPerfectAutoRefreshTask(); + mPixelPerfectRefreshTimer.schedule(mCurrentAutoRefreshTask, timeLeft, + mPixelPerfectAutoRefreshInterval * 1000); } } } public int getPixelPerfectAutoRefreshInverval() { - return pixelPerfectAutoRefreshInterval; + return mPixelPerfectAutoRefreshInterval; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java index 240ced1..b62ba7e 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java @@ -27,35 +27,35 @@ import org.eclipse.swt.widgets.Shell; public class CapturePSDAction extends TreeViewEnabledAction implements ImageAction { - private static CapturePSDAction action; + private static CapturePSDAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private CapturePSDAction(Shell shell) { super("&Capture Layers"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'C'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("capture-psd.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("capture-psd.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Capture the window layers as a photoshop document"); } public static CapturePSDAction getAction(Shell shell) { - if (action == null) { - action = new CapturePSDAction(shell); + if (sAction == null) { + sAction = new CapturePSDAction(shell); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().capturePSD(shell); + HierarchyViewerDirector.getDirector().capturePSD(mShell); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java index 4fc8024..e637216 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java @@ -27,35 +27,35 @@ import org.eclipse.swt.widgets.Shell; public class DisplayViewAction extends SelectedNodeEnabledAction implements ImageAction { - private static DisplayViewAction action; + private static DisplayViewAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private DisplayViewAction(Shell shell) { super("&Display View"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'D'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("display.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("display.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Display the selected view image in a separate window"); } public static DisplayViewAction getAction(Shell shell) { - if (action == null) { - action = new DisplayViewAction(shell); + if (sAction == null) { + sAction = new DisplayViewAction(shell); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().showCapture(shell); + HierarchyViewerDirector.getDirector().showCapture(mShell); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java index 7ef7109..72280f9 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java @@ -21,7 +21,7 @@ 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 com.android.hierarchyviewerlib.models.DeviceSelectionModel.IWindowChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; @@ -29,18 +29,18 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -public class InspectScreenshotAction extends Action implements ImageAction, WindowChangeListener { +public class InspectScreenshotAction extends Action implements ImageAction, IWindowChangeListener { - private static InspectScreenshotAction action; + private static InspectScreenshotAction sAction; - private Image image; + private Image mImage; private InspectScreenshotAction() { super("Inspect &Screenshot"); setAccelerator(SWT.MOD1 + 'S'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("inspect-screenshot.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("inspect-screenshot.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Inspect a screenshot in the pixel perfect view"); setEnabled( DeviceSelectionModel.getModel().getSelectedDevice() != null); @@ -48,10 +48,10 @@ public class InspectScreenshotAction extends Action implements ImageAction, Wind } public static InspectScreenshotAction getAction() { - if (action == null) { - action = new InspectScreenshotAction(); + if (sAction == null) { + sAction = new InspectScreenshotAction(); } - return action; + return sAction; } @Override @@ -60,7 +60,7 @@ public class InspectScreenshotAction extends Action implements ImageAction, Wind } public Image getImage() { - return image; + return mImage; } public void deviceChanged(IDevice device) { diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java index aaf0ff0..83da0ce 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java @@ -26,24 +26,24 @@ import org.eclipse.swt.widgets.Display; public class InvalidateAction extends SelectedNodeEnabledAction implements ImageAction { - private static InvalidateAction action; + private static InvalidateAction sAction; - private Image image; + private Image mImage; private InvalidateAction() { super("&Invalidate Layout"); setAccelerator(SWT.MOD1 + 'I'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("invalidate.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("invalidate.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Invalidate the layout for the current window"); } public static InvalidateAction getAction() { - if (action == null) { - action = new InvalidateAction(); + if (sAction == null) { + sAction = new InvalidateAction(); } - return action; + return sAction; } @Override @@ -52,6 +52,6 @@ public class InvalidateAction extends SelectedNodeEnabledAction implements Image } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java index c948914..81c1b02 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java @@ -27,35 +27,35 @@ import org.eclipse.swt.widgets.Shell; public class LoadOverlayAction extends PixelPerfectEnabledAction implements ImageAction { - private static LoadOverlayAction action; + private static LoadOverlayAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private LoadOverlayAction(Shell shell) { super("Load &Overlay"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'O'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("load-overlay.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("load-overlay.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Load an image to overlay the screenshot"); } public static LoadOverlayAction getAction(Shell shell) { - if (action == null) { - action = new LoadOverlayAction(shell); + if (sAction == null) { + sAction = new LoadOverlayAction(shell); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().loadOverlay(shell); + HierarchyViewerDirector.getDirector().loadOverlay(mShell); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java index d26b2ef..9629716 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java @@ -21,7 +21,7 @@ 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 com.android.hierarchyviewerlib.models.DeviceSelectionModel.IWindowChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; @@ -29,18 +29,18 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; -public class LoadViewHierarchyAction extends Action implements ImageAction, WindowChangeListener { +public class LoadViewHierarchyAction extends Action implements ImageAction, IWindowChangeListener { - private static LoadViewHierarchyAction action; + private static LoadViewHierarchyAction sAction; - private Image image; + private Image mImage; private LoadViewHierarchyAction() { super("Load View &Hierarchy"); setAccelerator(SWT.MOD1 + 'H'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Load the view hierarchy into the tree view"); setEnabled( DeviceSelectionModel.getModel().getSelectedWindow() != null); @@ -48,10 +48,10 @@ public class LoadViewHierarchyAction extends Action implements ImageAction, Wind } public static LoadViewHierarchyAction getAction() { - if (action == null) { - action = new LoadViewHierarchyAction(); + if (sAction == null) { + sAction = new LoadViewHierarchyAction(); } - return action; + return sAction; } @Override @@ -60,7 +60,7 @@ public class LoadViewHierarchyAction extends Action implements ImageAction, Wind } public Image getImage() { - return image; + return mImage; } public void deviceChanged(IDevice device) { diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java index 5e31829..e104b03 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java @@ -27,32 +27,32 @@ import org.eclipse.swt.widgets.Display; public class PixelPerfectAutoRefreshAction extends PixelPerfectEnabledAction implements ImageAction { - private static PixelPerfectAutoRefreshAction action; + private static PixelPerfectAutoRefreshAction sAction; - private Image image; + private Image mImage; private PixelPerfectAutoRefreshAction() { super("Auto &Refresh", Action.AS_CHECK_BOX); setAccelerator(SWT.MOD1 + 'R'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("auto-refresh.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("auto-refresh.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Automatically refresh the screenshot"); } public static PixelPerfectAutoRefreshAction getAction() { - if (action == null) { - action = new PixelPerfectAutoRefreshAction(); + if (sAction == null) { + sAction = new PixelPerfectAutoRefreshAction(); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefresh(action.isChecked()); + HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefresh(sAction.isChecked()); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java index 9423d10..b423d14 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java @@ -17,12 +17,12 @@ package com.android.hierarchyviewerlib.actions; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.swt.widgets.Display; -public class PixelPerfectEnabledAction extends Action implements ImageChangeListener { +public class PixelPerfectEnabledAction extends Action implements IImageChangeListener { public PixelPerfectEnabledAction(String name) { super(name); setEnabled(PixelPerfectModel.getModel().getImage() != null); diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java index a5d7514..2e06bbd 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java @@ -26,24 +26,24 @@ import org.eclipse.swt.widgets.Display; public class RefreshPixelPerfectAction extends PixelPerfectEnabledAction implements ImageAction { - private static RefreshPixelPerfectAction action; + private static RefreshPixelPerfectAction sAction; - private Image image; + private Image mImage; private RefreshPixelPerfectAction() { super("&Refresh Screenshot"); setAccelerator(SWT.F5); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("refresh-windows.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("refresh-windows.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Refresh the screenshot"); } public static RefreshPixelPerfectAction getAction() { - if (action == null) { - action = new RefreshPixelPerfectAction(); + if (sAction == null) { + sAction = new RefreshPixelPerfectAction(); } - return action; + return sAction; } @Override @@ -52,6 +52,6 @@ public class RefreshPixelPerfectAction extends PixelPerfectEnabledAction impleme } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java index 41214df..8c17760 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java @@ -26,24 +26,24 @@ import org.eclipse.swt.widgets.Display; public class RefreshPixelPerfectTreeAction extends PixelPerfectEnabledAction implements ImageAction { - private static RefreshPixelPerfectTreeAction action; + private static RefreshPixelPerfectTreeAction sAction; - private Image image; + private Image mImage; private RefreshPixelPerfectTreeAction() { super("Refresh &Tree"); setAccelerator(SWT.MOD1 + 'T'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Refresh the tree"); } public static RefreshPixelPerfectTreeAction getAction() { - if (action == null) { - action = new RefreshPixelPerfectTreeAction(); + if (sAction == null) { + sAction = new RefreshPixelPerfectTreeAction(); } - return action; + return sAction; } @Override @@ -52,6 +52,6 @@ public class RefreshPixelPerfectTreeAction extends PixelPerfectEnabledAction imp } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java index 06c48ee..8f15c1c 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java @@ -26,24 +26,24 @@ import org.eclipse.swt.widgets.Display; public class RefreshViewAction extends TreeViewEnabledAction implements ImageAction { - private static RefreshViewAction action; + private static RefreshViewAction sAction; - private Image image; + private Image mImage; private RefreshViewAction() { super("Load View &Hierarchy"); setAccelerator(SWT.MOD1 + 'H'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("load-view-hierarchy.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Reload the view hierarchy"); } public static RefreshViewAction getAction() { - if (action == null) { - action = new RefreshViewAction(); + if (sAction == null) { + sAction = new RefreshViewAction(); } - return action; + return sAction; } @Override @@ -52,6 +52,6 @@ public class RefreshViewAction extends TreeViewEnabledAction implements ImageAct } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java index 47d692a..6097ad3 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java @@ -27,24 +27,24 @@ import org.eclipse.swt.widgets.Display; public class RefreshWindowsAction extends Action implements ImageAction { - private static RefreshWindowsAction action; + private static RefreshWindowsAction sAction; - private Image image; + private Image mImage; private RefreshWindowsAction() { super("&Refresh"); setAccelerator(SWT.F5); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("refresh-windows.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("refresh-windows.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Refresh the list of devices"); } public static RefreshWindowsAction getAction() { - if (action == null) { - action = new RefreshWindowsAction(); + if (sAction == null) { + sAction = new RefreshWindowsAction(); } - return action; + return sAction; } @Override @@ -53,6 +53,6 @@ public class RefreshWindowsAction extends Action implements ImageAction { } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java index e3d6f8f..5a79933 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java @@ -26,24 +26,24 @@ import org.eclipse.swt.widgets.Display; public class RequestLayoutAction extends SelectedNodeEnabledAction implements ImageAction { - private static RequestLayoutAction action; + private static RequestLayoutAction sAction; - private Image image; + private Image mImage; private RequestLayoutAction() { super("Request &Layout"); setAccelerator(SWT.MOD1 + 'L'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("request-layout.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("request-layout.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Request the view to lay out"); } public static RequestLayoutAction getAction() { - if (action == null) { - action = new RequestLayoutAction(); + if (sAction == null) { + sAction = new RequestLayoutAction(); } - return action; + return sAction; } @Override @@ -52,6 +52,6 @@ public class RequestLayoutAction extends SelectedNodeEnabledAction implements Im } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java index 9781d42..45d6da5 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java @@ -27,35 +27,35 @@ import org.eclipse.swt.widgets.Shell; public class SavePixelPerfectAction extends PixelPerfectEnabledAction implements ImageAction { - private static SavePixelPerfectAction action; + private static SavePixelPerfectAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private SavePixelPerfectAction(Shell shell) { super("&Save as PNG"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'S'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("save.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("save.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Save the screenshot as a PNG image"); } public static SavePixelPerfectAction getAction(Shell shell) { - if (action == null) { - action = new SavePixelPerfectAction(shell); + if (sAction == null) { + sAction = new SavePixelPerfectAction(shell); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().savePixelPerfect(shell); + HierarchyViewerDirector.getDirector().savePixelPerfect(mShell); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java index 094b101..69df7e0 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java @@ -27,35 +27,35 @@ import org.eclipse.swt.widgets.Shell; public class SaveTreeViewAction extends TreeViewEnabledAction implements ImageAction { - private static SaveTreeViewAction action; + private static SaveTreeViewAction sAction; - private Image image; + private Image mImage; - private Shell shell; + private Shell mShell; private SaveTreeViewAction(Shell shell) { super("&Save as PNG"); - this.shell = shell; + this.mShell = shell; setAccelerator(SWT.MOD1 + 'S'); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - image = imageLoader.loadImage("save.png", Display.getDefault()); - setImageDescriptor(ImageDescriptor.createFromImage(image)); + mImage = imageLoader.loadImage("save.png", Display.getDefault()); //$NON-NLS-1$ + setImageDescriptor(ImageDescriptor.createFromImage(mImage)); setToolTipText("Save the tree view as a PNG image"); } public static SaveTreeViewAction getAction(Shell shell) { - if (action == null) { - action = new SaveTreeViewAction(shell); + if (sAction == null) { + sAction = new SaveTreeViewAction(shell); } - return action; + return sAction; } @Override public void run() { - HierarchyViewerDirector.getDirector().saveTreeView(shell); + HierarchyViewerDirector.getDirector().saveTreeView(mShell); } public Image getImage() { - return image; + return mImage; } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java index 86f75a4..f051f69 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java @@ -17,12 +17,12 @@ package com.android.hierarchyviewerlib.actions; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.swt.widgets.Display; -public class SelectedNodeEnabledAction extends Action implements TreeChangeListener { +public class SelectedNodeEnabledAction extends Action implements ITreeChangeListener { public SelectedNodeEnabledAction(String name) { super(name); setEnabled(TreeViewModel.getModel().getTree() != null diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java index 9ac7fb1..7354ed5 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java @@ -17,12 +17,12 @@ package com.android.hierarchyviewerlib.actions; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import org.eclipse.jface.action.Action; import org.eclipse.swt.widgets.Display; -public class TreeViewEnabledAction extends Action implements TreeChangeListener { +public class TreeViewEnabledAction extends Action implements ITreeChangeListener { public TreeViewEnabledAction(String name) { super(name); setEnabled(TreeViewModel.getModel().getTree() != null); 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 399e470..d00c4dc 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java @@ -60,14 +60,14 @@ public class DeviceBridge { private static final int SERVICE_CODE_IS_SERVER_RUNNING = 3; - private static AndroidDebugBridge bridge; + private static AndroidDebugBridge sBridge; - private static final HashMap<IDevice, Integer> devicePortMap = new HashMap<IDevice, Integer>(); + private static final HashMap<IDevice, Integer> sDevicePortMap = new HashMap<IDevice, Integer>(); - private static final HashMap<IDevice, ViewServerInfo> viewServerInfo = + private static final HashMap<IDevice, ViewServerInfo> sViewServerInfo = new HashMap<IDevice, ViewServerInfo>(); - private static int nextLocalPort = DEFAULT_SERVER_PORT; + private static int sNextLocalPort = DEFAULT_SERVER_PORT; public static class ViewServerInfo { public final int protocolVersion; @@ -81,11 +81,11 @@ public class DeviceBridge { } public static void initDebugBridge(String adbLocation) { - if (bridge == null) { + if (sBridge == null) { AndroidDebugBridge.init(false /* debugger support */); } - if (bridge == null || !bridge.isConnected()) { - bridge = AndroidDebugBridge.createBridge(adbLocation, true); + if (sBridge == null || !sBridge.isConnected()) { + sBridge = AndroidDebugBridge.createBridge(adbLocation, true); } } @@ -94,10 +94,10 @@ public class DeviceBridge { } public static IDevice[] getDevices() { - if (bridge == null) { + if (sBridge == null) { return new IDevice[0]; } - return bridge.getDevices(); + return sBridge.getDevices(); } /* @@ -121,12 +121,12 @@ public class DeviceBridge { * @param device */ public static void setupDeviceForward(IDevice device) { - synchronized (devicePortMap) { + synchronized (sDevicePortMap) { if (device.getState() == IDevice.DeviceState.ONLINE) { - int localPort = nextLocalPort++; + int localPort = sNextLocalPort++; try { device.createForward(localPort, DEFAULT_SERVER_PORT); - devicePortMap.put(device, localPort); + sDevicePortMap.put(device, localPort); } catch (TimeoutException e) { Log.e(TAG, "Timeout setting up port forwarding for " + device); } catch (AdbCommandRejectedException e) { @@ -141,12 +141,12 @@ public class DeviceBridge { } public static void removeDeviceForward(IDevice device) { - synchronized (devicePortMap) { - final Integer localPort = devicePortMap.get(device); + synchronized (sDevicePortMap) { + final Integer localPort = sDevicePortMap.get(device); if (localPort != null) { try { device.removeForward(localPort, DEFAULT_SERVER_PORT); - devicePortMap.remove(device); + sDevicePortMap.remove(device); } catch (TimeoutException e) { Log.e(TAG, "Timeout removing port forwarding for " + device); } catch (AdbCommandRejectedException e) { @@ -160,8 +160,8 @@ public class DeviceBridge { } public static int getDeviceLocalPort(IDevice device) { - synchronized (devicePortMap) { - Integer port = devicePortMap.get(device); + synchronized (sDevicePortMap) { + Integer port = sDevicePortMap.get(device); if (port != null) { return port; } @@ -235,15 +235,15 @@ public class DeviceBridge { } private static String buildStartServerShellCommand(int port) { - return String.format("service call window %d i32 %d", SERVICE_CODE_START_SERVER, port); + return String.format("service call window %d i32 %d", SERVICE_CODE_START_SERVER, port); //$NON-NLS-1$ } private static String buildStopServerShellCommand() { - return String.format("service call window %d", SERVICE_CODE_STOP_SERVER); + return String.format("service call window %d", SERVICE_CODE_STOP_SERVER); //$NON-NLS-1$ } private static String buildIsServerRunningShellCommand() { - return String.format("service call window %d", SERVICE_CODE_IS_SERVER_RUNNING); + return String.format("service call window %d", SERVICE_CODE_IS_SERVER_RUNNING); //$NON-NLS-1$ } private static class BooleanResultReader extends MultiLineReceiver { @@ -256,7 +256,7 @@ public class DeviceBridge { @Override public void processNewLines(String[] strings) { if (strings.length > 0) { - Pattern pattern = Pattern.compile(".*?\\([0-9]{8} ([0-9]{8}).*"); + Pattern pattern = Pattern.compile(".*?\\([0-9]{8} ([0-9]{8}).*"); //$NON-NLS-1$ Matcher matcher = pattern.matcher(strings[0]); if (matcher.matches()) { if (Integer.parseInt(matcher.group(1)) == 1) { @@ -277,7 +277,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(device); - connection.sendCommand("SERVER"); + connection.sendCommand("SERVER"); //$NON-NLS-1$ String line = connection.getInputStream().readLine(); if (line != null) { server = Integer.parseInt(line); @@ -292,7 +292,7 @@ public class DeviceBridge { connection = null; try { connection = new DeviceConnection(device); - connection.sendCommand("PROTOCOL"); + connection.sendCommand("PROTOCOL"); //$NON-NLS-1$ String line = connection.getInputStream().readLine(); if (line != null) { protocol = Integer.parseInt(line); @@ -308,21 +308,21 @@ public class DeviceBridge { return null; } ViewServerInfo returnValue = new ViewServerInfo(server, protocol); - synchronized (viewServerInfo) { - viewServerInfo.put(device, returnValue); + synchronized (sViewServerInfo) { + sViewServerInfo.put(device, returnValue); } return returnValue; } public static ViewServerInfo getViewServerInfo(IDevice device) { - synchronized (viewServerInfo) { - return viewServerInfo.get(device); + synchronized (sViewServerInfo) { + return sViewServerInfo.get(device); } } public static void removeViewServerInfo(IDevice device) { - synchronized (viewServerInfo) { - viewServerInfo.remove(device); + synchronized (sViewServerInfo) { + sViewServerInfo.remove(device); } } @@ -336,11 +336,11 @@ public class DeviceBridge { ViewServerInfo serverInfo = getViewServerInfo(device); try { connection = new DeviceConnection(device); - connection.sendCommand("LIST"); + connection.sendCommand("LIST"); //$NON-NLS-1$ BufferedReader in = connection.getInputStream(); String line; while ((line = in.readLine()) != null) { - if ("DONE.".equalsIgnoreCase(line)) { + if ("DONE.".equalsIgnoreCase(line)) { //$NON-NLS-1$ break; } @@ -391,7 +391,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(device); - connection.sendCommand("GET_FOCUS"); + connection.sendCommand("GET_FOCUS"); //$NON-NLS-1$ String line = connection.getInputStream().readLine(); if (line == null || line.length() == 0) { return -1; @@ -411,7 +411,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(window.getDevice()); - connection.sendCommand("DUMP " + window.encode()); + connection.sendCommand("DUMP " + window.encode()); //$NON-NLS-1$ BufferedReader in = connection.getInputStream(); ViewNode currentNode = null; int currentDepth = -1; @@ -457,11 +457,11 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(window.getDevice()); - connection.sendCommand("PROFILE " + window.encode() + " " + viewNode.toString()); + connection.sendCommand("PROFILE " + window.encode() + " " + viewNode.toString()); //$NON-NLS-1$ BufferedReader in = connection.getInputStream(); int protocol; - synchronized (viewServerInfo) { - protocol = viewServerInfo.get(window.getDevice()).protocolVersion; + synchronized (sViewServerInfo) { + protocol = sViewServerInfo.get(window.getDevice()).protocolVersion; } if (protocol < 3) { return loadProfileData(viewNode, in); @@ -485,8 +485,8 @@ public class DeviceBridge { private static boolean loadProfileData(ViewNode node, BufferedReader in) throws IOException { String line; - if ((line = in.readLine()) == null || line.equalsIgnoreCase("-1 -1 -1") - || line.equalsIgnoreCase("DONE.")) { + if ((line = in.readLine()) == null || line.equalsIgnoreCase("-1 -1 -1") //$NON-NLS-1$ + || line.equalsIgnoreCase("DONE.")) { //$NON-NLS-1$ return false; } String[] data = line.split(" "); @@ -513,7 +513,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(window.getDevice()); - connection.sendCommand("CAPTURE " + window.encode() + " " + viewNode.toString()); + connection.sendCommand("CAPTURE " + window.encode() + " " + viewNode.toString()); //$NON-NLS-1$ return new Image(Display.getDefault(), connection.getSocket().getInputStream()); } catch (Exception e) { Log.e(TAG, "Unable to capture data for node " + viewNode + " in window " @@ -533,7 +533,7 @@ public class DeviceBridge { try { connection = new DeviceConnection(window.getDevice()); - connection.sendCommand("CAPTURE_LAYERS " + window.encode()); + connection.sendCommand("CAPTURE_LAYERS " + window.encode()); //$NON-NLS-1$ in = new DataInputStream(new BufferedInputStream(connection.getSocket() @@ -604,7 +604,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(viewNode.window.getDevice()); - connection.sendCommand("INVALIDATE " + viewNode.window.encode() + " " + viewNode); + connection.sendCommand("INVALIDATE " + viewNode.window.encode() + " " + viewNode); //$NON-NLS-1$ } catch (Exception e) { Log.e(TAG, "Unable to invalidate view " + viewNode + " in window " + viewNode.window + " on device " + viewNode.window.getDevice()); @@ -617,7 +617,7 @@ public class DeviceBridge { DeviceConnection connection = null; try { connection = new DeviceConnection(viewNode.window.getDevice()); - connection.sendCommand("REQUEST_LAYOUT " + viewNode.window.encode() + " " + viewNode); + connection.sendCommand("REQUEST_LAYOUT " + viewNode.window.encode() + " " + viewNode); //$NON-NLS-1$ } catch (Exception e) { Log.e(TAG, "Unable to request layout for node " + viewNode + " in window " + viewNode.window + " on device " + viewNode.window.getDevice()); diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceConnection.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceConnection.java index cda1a77..f750d5c 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceConnection.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceConnection.java @@ -34,42 +34,42 @@ import java.nio.channels.SocketChannel; public class DeviceConnection { // Now a socket channel, since socket channels are friendly with interrupts. - private SocketChannel socketChannel; + private SocketChannel mSocketChannel; - private BufferedReader in; + private BufferedReader mIn; - private BufferedWriter out; + private BufferedWriter mOut; public DeviceConnection(IDevice device) throws IOException { - socketChannel = SocketChannel.open(); + mSocketChannel = SocketChannel.open(); int port = DeviceBridge.getDeviceLocalPort(device); if (port == -1) { throw new IOException(); } - socketChannel.connect(new InetSocketAddress("127.0.0.1", port)); - socketChannel.socket().setSoTimeout(40000); + mSocketChannel.connect(new InetSocketAddress("127.0.0.1", port)); //$NON-NLS-1$ + mSocketChannel.socket().setSoTimeout(40000); } public BufferedReader getInputStream() throws IOException { - if (in == null) { - in = new BufferedReader(new InputStreamReader(socketChannel.socket().getInputStream())); + if (mIn == null) { + mIn = new BufferedReader(new InputStreamReader(mSocketChannel.socket().getInputStream())); } - return in; + return mIn; } public BufferedWriter getOutputStream() throws IOException { - if (out == null) { - out = - new BufferedWriter(new OutputStreamWriter(socketChannel.socket() + if (mOut == null) { + mOut = + new BufferedWriter(new OutputStreamWriter(mSocketChannel.socket() .getOutputStream())); } - return out; + return mOut; } public Socket getSocket() { - return socketChannel.socket(); + return mSocketChannel.socket(); } public void sendCommand(String command) throws IOException { @@ -81,19 +81,19 @@ public class DeviceConnection { public void close() { try { - if (in != null) { - in.close(); + if (mIn != null) { + mIn.close(); } } catch (IOException e) { } try { - if (out != null) { - out.close(); + if (mOut != null) { + mOut.close(); } } catch (IOException e) { } try { - socketChannel.close(); + mSocketChannel.close(); } catch (IOException e) { } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java index 6457159..d925404 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java @@ -183,58 +183,58 @@ public class ViewNode { } }); - id = namedProperties.get("mID").value; + id = namedProperties.get("mID").value; //$NON-NLS-1$ left = - namedProperties.containsKey("mLeft") ? getInt("mLeft", 0) : getInt("layout:mLeft", + namedProperties.containsKey("mLeft") ? getInt("mLeft", 0) : getInt("layout:mLeft", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 0); - top = namedProperties.containsKey("mTop") ? getInt("mTop", 0) : getInt("layout:mTop", 0); + top = namedProperties.containsKey("mTop") ? getInt("mTop", 0) : getInt("layout:mTop", 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ width = - namedProperties.containsKey("getWidth()") ? getInt("getWidth()", 0) : getInt( - "layout:getWidth()", 0); + namedProperties.containsKey("getWidth()") ? getInt("getWidth()", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "layout:getWidth()", 0); //$NON-NLS-1$ height = - namedProperties.containsKey("getHeight()") ? getInt("getHeight()", 0) : getInt( - "layout:getHeight()", 0); + namedProperties.containsKey("getHeight()") ? getInt("getHeight()", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "layout:getHeight()", 0); //$NON-NLS-1$ scrollX = - namedProperties.containsKey("mScrollX") ? getInt("mScrollX", 0) : getInt( - "scrolling:mScrollX", 0); + namedProperties.containsKey("mScrollX") ? getInt("mScrollX", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "scrolling:mScrollX", 0); //$NON-NLS-1$ scrollY = - namedProperties.containsKey("mScrollY") ? getInt("mScrollY", 0) : getInt( - "scrolling:mScrollY", 0); + namedProperties.containsKey("mScrollY") ? getInt("mScrollY", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "scrolling:mScrollY", 0); //$NON-NLS-1$ paddingLeft = - namedProperties.containsKey("mPaddingLeft") ? getInt("mPaddingLeft", 0) : getInt( - "padding:mPaddingLeft", 0); + namedProperties.containsKey("mPaddingLeft") ? getInt("mPaddingLeft", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "padding:mPaddingLeft", 0); //$NON-NLS-1$ paddingRight = - namedProperties.containsKey("mPaddingRight") ? getInt("mPaddingRight", 0) : getInt( - "padding:mPaddingRight", 0); + namedProperties.containsKey("mPaddingRight") ? getInt("mPaddingRight", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "padding:mPaddingRight", 0); //$NON-NLS-1$ paddingTop = - namedProperties.containsKey("mPaddingTop") ? getInt("mPaddingTop", 0) : getInt( - "padding:mPaddingTop", 0); + namedProperties.containsKey("mPaddingTop") ? getInt("mPaddingTop", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "padding:mPaddingTop", 0); //$NON-NLS-1$ paddingBottom = - namedProperties.containsKey("mPaddingBottom") ? getInt("mPaddingBottom", 0) - : getInt("padding:mPaddingBottom", 0); + namedProperties.containsKey("mPaddingBottom") ? getInt("mPaddingBottom", 0) //$NON-NLS-1$ //$NON-NLS-2$ + : getInt("padding:mPaddingBottom", 0); //$NON-NLS-1$ marginLeft = - namedProperties.containsKey("layout_leftMargin") ? getInt("layout_leftMargin", - Integer.MIN_VALUE) : getInt("layout:layout_leftMargin", Integer.MIN_VALUE); + namedProperties.containsKey("layout_leftMargin") ? getInt("layout_leftMargin", //$NON-NLS-1$ //$NON-NLS-2$ + Integer.MIN_VALUE) : getInt("layout:layout_leftMargin", Integer.MIN_VALUE); //$NON-NLS-1$ marginRight = - namedProperties.containsKey("layout_rightMargin") ? getInt("layout_rightMargin", - Integer.MIN_VALUE) : getInt("layout:layout_rightMargin", Integer.MIN_VALUE); + namedProperties.containsKey("layout_rightMargin") ? getInt("layout_rightMargin", //$NON-NLS-1$ //$NON-NLS-2$ + Integer.MIN_VALUE) : getInt("layout:layout_rightMargin", Integer.MIN_VALUE); //$NON-NLS-1$ marginTop = - namedProperties.containsKey("layout_topMargin") ? getInt("layout_topMargin", - Integer.MIN_VALUE) : getInt("layout:layout_topMargin", Integer.MIN_VALUE); + namedProperties.containsKey("layout_topMargin") ? getInt("layout_topMargin", //$NON-NLS-1$ //$NON-NLS-2$ + Integer.MIN_VALUE) : getInt("layout:layout_topMargin", Integer.MIN_VALUE); //$NON-NLS-1$ marginBottom = - namedProperties.containsKey("layout_bottomMargin") ? getInt("layout_bottomMargin", + namedProperties.containsKey("layout_bottomMargin") ? getInt("layout_bottomMargin", //$NON-NLS-1$ //$NON-NLS-2$ Integer.MIN_VALUE) - : getInt("layout:layout_bottomMargin", Integer.MIN_VALUE); + : getInt("layout:layout_bottomMargin", Integer.MIN_VALUE); //$NON-NLS-1$ baseline = - namedProperties.containsKey("getBaseline()") ? getInt("getBaseline()", 0) : getInt( - "layout:getBaseline()", 0); + namedProperties.containsKey("getBaseline()") ? getInt("getBaseline()", 0) : getInt( //$NON-NLS-1$ //$NON-NLS-2$ + "layout:getBaseline()", 0); //$NON-NLS-1$ willNotDraw = - namedProperties.containsKey("willNotDraw()") ? getBoolean("willNotDraw()", false) - : getBoolean("drawing:willNotDraw()", false); + namedProperties.containsKey("willNotDraw()") ? getBoolean("willNotDraw()", false) //$NON-NLS-1$ //$NON-NLS-2$ + : getBoolean("drawing:willNotDraw()", false); //$NON-NLS-1$ hasFocus = - namedProperties.containsKey("hasFocus()") ? getBoolean("hasFocus()", false) - : getBoolean("focus:hasFocus()", false); + namedProperties.containsKey("hasFocus()") ? getBoolean("hasFocus()", false) //$NON-NLS-1$ //$NON-NLS-2$ + : getBoolean("focus:hasFocus()", false); //$NON-NLS-1$ hasMargins = marginLeft != Integer.MIN_VALUE && marginRight != Integer.MIN_VALUE @@ -307,9 +307,9 @@ public class ViewNode { int dotIndex = name.lastIndexOf('.'); String shortName = (dotIndex == -1) ? name : name.substring(dotIndex + 1); filtered = - !text.equals("") + !text.equals("") //$NON-NLS-1$ && (shortName.toLowerCase().contains(text.toLowerCase()) || (!id - .equals("NO_ID") && id.toLowerCase().contains(text.toLowerCase()))); + .equals("NO_ID") && id.toLowerCase().contains(text.toLowerCase()))); //$NON-NLS-1$ final int N = children.size(); for (int i = 0; i < N; i++) { children.get(i).filter(text); @@ -342,7 +342,7 @@ public class ViewNode { @Override public String toString() { - return name + "@" + hashCode; + return name + "@" + hashCode; //$NON-NLS-1$ } public static class Property { diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/Window.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/Window.java index 1869a51..af79081 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/Window.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/Window.java @@ -24,37 +24,37 @@ import com.android.ddmlib.IDevice; */ public class Window { - private String title; + private String mTitle; - private int hashCode; + private int mHashCode; - private IDevice device; + private IDevice mDevice; public Window(IDevice device, String title, int hashCode) { - this.device = device; - this.title = title; - this.hashCode = hashCode; + this.mDevice = device; + this.mTitle = title; + this.mHashCode = hashCode; } public String getTitle() { - return title; + return mTitle; } public int getHashCode() { - return hashCode; + return mHashCode; } public String encode() { - return Integer.toHexString(hashCode); + return Integer.toHexString(mHashCode); } @Override public String toString() { - return title; + return mTitle; } public IDevice getDevice() { - return device; + return mDevice; } public static Window getFocusedWindow(IDevice device) { @@ -69,8 +69,8 @@ public class Window { @Override public boolean equals(Object other) { if (other instanceof Window) { - return hashCode == ((Window) other).hashCode - && device.getSerialNumber().equals(((Window) other).device.getSerialNumber()); + return mHashCode == ((Window) other).mHashCode + && mDevice.getSerialNumber().equals(((Window) other).mDevice.getSerialNumber()); } return false; } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java index 26797d2..a0cc635 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java @@ -29,10 +29,10 @@ import java.util.HashMap; * It notifies all it's listeners of changes. */ public class WindowUpdater { - private static HashMap<IDevice, ArrayList<IWindowChangeListener>> windowChangeListeners = + private static HashMap<IDevice, ArrayList<IWindowChangeListener>> sWindowChangeListeners = new HashMap<IDevice, ArrayList<IWindowChangeListener>>(); - private static HashMap<IDevice, Thread> listeningThreads = new HashMap<IDevice, Thread>(); + private static HashMap<IDevice, Thread> sListeningThreads = new HashMap<IDevice, Thread>(); public static interface IWindowChangeListener { public void windowsChanged(IDevice device); @@ -41,58 +41,58 @@ public class WindowUpdater { } public static void terminate() { - synchronized (listeningThreads) { - for (IDevice device : listeningThreads.keySet()) { - listeningThreads.get(device).interrupt(); + synchronized (sListeningThreads) { + for (IDevice device : sListeningThreads.keySet()) { + sListeningThreads.get(device).interrupt(); } } } public static void startListenForWindowChanges(IWindowChangeListener listener, IDevice device) { - synchronized (windowChangeListeners) { + synchronized (sWindowChangeListeners) { // In this case, a listening thread already exists, so we don't need // to create another one. - if (windowChangeListeners.containsKey(device)) { - windowChangeListeners.get(device).add(listener); + if (sWindowChangeListeners.containsKey(device)) { + sWindowChangeListeners.get(device).add(listener); return; } ArrayList<IWindowChangeListener> listeners = new ArrayList<IWindowChangeListener>(); listeners.add(listener); - windowChangeListeners.put(device, listeners); + sWindowChangeListeners.put(device, listeners); } // Start listening Thread listeningThread = new Thread(new WindowChangeMonitor(device)); - synchronized (listeningThreads) { - listeningThreads.put(device, listeningThread); + synchronized (sListeningThreads) { + sListeningThreads.put(device, listeningThread); } listeningThread.start(); } public static void stopListenForWindowChanges(IWindowChangeListener listener, IDevice device) { - synchronized (windowChangeListeners) { - ArrayList<IWindowChangeListener> listeners = windowChangeListeners.get(device); + synchronized (sWindowChangeListeners) { + ArrayList<IWindowChangeListener> listeners = sWindowChangeListeners.get(device); listeners.remove(listener); // There are more listeners, so don't stop the listening thread. if (listeners.size() != 0) { return; } - windowChangeListeners.remove(device); + sWindowChangeListeners.remove(device); } // Everybody left, so the party's over! Thread listeningThread; - synchronized (listeningThreads) { - listeningThread = listeningThreads.get(device); - listeningThreads.remove(device); + synchronized (sListeningThreads) { + listeningThread = sListeningThreads.get(device); + sListeningThreads.remove(device); } listeningThread.interrupt(); } private static IWindowChangeListener[] getWindowChangeListenersAsArray(IDevice device) { IWindowChangeListener[] listeners; - synchronized (windowChangeListeners) { + synchronized (sWindowChangeListeners) { ArrayList<IWindowChangeListener> windowChangeListenerList = - windowChangeListeners.get(device); + sWindowChangeListeners.get(device); if (windowChangeListenerList == null) { return null; } 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 09dfe76..d029d39 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/DeviceSelectionModel.java @@ -29,84 +29,84 @@ import java.util.HashMap; */ public class DeviceSelectionModel { - private final HashMap<IDevice, Window[]> deviceMap = new HashMap<IDevice, Window[]>(); + private final HashMap<IDevice, Window[]> mDeviceMap = new HashMap<IDevice, Window[]>(); - private final HashMap<IDevice, Integer> focusedWindowHashes = new HashMap<IDevice, Integer>(); + private final HashMap<IDevice, Integer> mFocusedWindowHashes = new HashMap<IDevice, Integer>(); - private final ArrayList<IDevice> deviceList = new ArrayList<IDevice>(); + private final ArrayList<IDevice> mDeviceList = new ArrayList<IDevice>(); - private final ArrayList<WindowChangeListener> windowChangeListeners = - new ArrayList<WindowChangeListener>(); + private final ArrayList<IWindowChangeListener> mWindowChangeListeners = + new ArrayList<IWindowChangeListener>(); - private IDevice selectedDevice; + private IDevice mSelectedDevice; - private Window selectedWindow; + private Window mSelectedWindow; - private static DeviceSelectionModel model; + private static DeviceSelectionModel sModel; public static DeviceSelectionModel getModel() { - if (model == null) { - model = new DeviceSelectionModel(); + if (sModel == null) { + sModel = new DeviceSelectionModel(); } - return model; + return sModel; } public boolean containsDevice(IDevice device) { - synchronized (deviceMap) { - return deviceMap.containsKey(device); + synchronized (mDeviceMap) { + return mDeviceMap.containsKey(device); } } public void addDevice(IDevice device, Window[] windows) { - synchronized (deviceMap) { - deviceMap.put(device, windows); - deviceList.add(device); + synchronized (mDeviceMap) { + mDeviceMap.put(device, windows); + mDeviceList.add(device); } notifyDeviceConnected(device); } public void removeDevice(IDevice device) { boolean selectionChanged = false; - synchronized (deviceMap) { - deviceList.remove(device); - if (!deviceList.contains(device)) { - deviceMap.remove(device); - focusedWindowHashes.remove(device); - if (selectedDevice == device) { - selectedDevice = null; - selectedWindow = null; + synchronized (mDeviceMap) { + mDeviceList.remove(device); + if (!mDeviceList.contains(device)) { + mDeviceMap.remove(device); + mFocusedWindowHashes.remove(device); + if (mSelectedDevice == device) { + mSelectedDevice = null; + mSelectedWindow = null; selectionChanged = true; } } } notifyDeviceDisconnected(device); if (selectionChanged) { - notifySelectionChanged(selectedDevice, selectedWindow); + notifySelectionChanged(mSelectedDevice, mSelectedWindow); } } public void updateDevice(IDevice device, Window[] windows) { boolean selectionChanged = false; - synchronized (deviceMap) { - deviceMap.put(device, windows); + synchronized (mDeviceMap) { + mDeviceMap.put(device, windows); // If the selected window no longer exists, we clear the selection. - if (selectedDevice == device && selectedWindow != null) { + if (mSelectedDevice == device && mSelectedWindow != null) { boolean windowStillExists = false; for (int i = 0; i < windows.length && !windowStillExists; i++) { - if (windows[i].equals(selectedWindow)) { + if (windows[i].equals(mSelectedWindow)) { windowStillExists = true; } } if (!windowStillExists) { - selectedDevice = null; - selectedWindow = null; + mSelectedDevice = null; + mSelectedWindow = null; selectionChanged = true; } } } notifyDeviceChanged(device); if (selectionChanged) { - notifySelectionChanged(selectedDevice, selectedWindow); + notifySelectionChanged(mSelectedDevice, mSelectedWindow); } } @@ -115,8 +115,8 @@ public class DeviceSelectionModel { */ public void updateFocusedWindow(IDevice device, int focusedWindow) { Integer oldValue = null; - synchronized (deviceMap) { - oldValue = focusedWindowHashes.put(device, new Integer(focusedWindow)); + synchronized (mDeviceMap) { + oldValue = mFocusedWindowHashes.put(device, new Integer(focusedWindow)); } // Only notify if the values are different. It would be cool if Java // containers accepted basic types like int. @@ -125,7 +125,7 @@ public class DeviceSelectionModel { } } - public static interface WindowChangeListener { + public static interface IWindowChangeListener { public void deviceConnected(IDevice device); public void deviceChanged(IDevice device); @@ -137,21 +137,21 @@ public class DeviceSelectionModel { public void selectionChanged(IDevice device, Window window); } - private WindowChangeListener[] getWindowChangeListenerList() { - WindowChangeListener[] listeners = null; - synchronized (windowChangeListeners) { - if (windowChangeListeners.size() == 0) { + private IWindowChangeListener[] getWindowChangeListenerList() { + IWindowChangeListener[] listeners = null; + synchronized (mWindowChangeListeners) { + if (mWindowChangeListeners.size() == 0) { return null; } listeners = - windowChangeListeners.toArray(new WindowChangeListener[windowChangeListeners + mWindowChangeListeners.toArray(new IWindowChangeListener[mWindowChangeListeners .size()]); } return listeners; } private void notifyDeviceConnected(IDevice device) { - WindowChangeListener[] listeners = getWindowChangeListenerList(); + IWindowChangeListener[] listeners = getWindowChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].deviceConnected(device); @@ -160,7 +160,7 @@ public class DeviceSelectionModel { } private void notifyDeviceChanged(IDevice device) { - WindowChangeListener[] listeners = getWindowChangeListenerList(); + IWindowChangeListener[] listeners = getWindowChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].deviceChanged(device); @@ -169,7 +169,7 @@ public class DeviceSelectionModel { } private void notifyDeviceDisconnected(IDevice device) { - WindowChangeListener[] listeners = getWindowChangeListenerList(); + IWindowChangeListener[] listeners = getWindowChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].deviceDisconnected(device); @@ -178,7 +178,7 @@ public class DeviceSelectionModel { } private void notifyFocusChanged(IDevice device) { - WindowChangeListener[] listeners = getWindowChangeListenerList(); + IWindowChangeListener[] listeners = getWindowChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].focusChanged(device); @@ -187,7 +187,7 @@ public class DeviceSelectionModel { } private void notifySelectionChanged(IDevice device, Window window) { - WindowChangeListener[] listeners = getWindowChangeListenerList(); + IWindowChangeListener[] listeners = getWindowChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].selectionChanged(device, window); @@ -195,28 +195,28 @@ public class DeviceSelectionModel { } } - public void addWindowChangeListener(WindowChangeListener listener) { - synchronized (windowChangeListeners) { - windowChangeListeners.add(listener); + public void addWindowChangeListener(IWindowChangeListener listener) { + synchronized (mWindowChangeListeners) { + mWindowChangeListeners.add(listener); } } - public void removeWindowChangeListener(WindowChangeListener listener) { - synchronized (windowChangeListeners) { - windowChangeListeners.remove(listener); + public void removeWindowChangeListener(IWindowChangeListener listener) { + synchronized (mWindowChangeListeners) { + mWindowChangeListeners.remove(listener); } } public IDevice[] getDevices() { - synchronized (deviceMap) { - return deviceList.toArray(new IDevice[deviceList.size()]); + synchronized (mDeviceMap) { + return mDeviceList.toArray(new IDevice[mDeviceList.size()]); } } public Window[] getWindows(IDevice device) { Window[] windows; - synchronized (deviceMap) { - windows = deviceMap.get(device); + synchronized (mDeviceMap) { + windows = mDeviceMap.get(device); } return windows; } @@ -225,8 +225,8 @@ public class DeviceSelectionModel { // that a window with hashcode -1 gets highlighted. If you remember, this is // the infamous <Focused Window> public int getFocusedWindow(IDevice device) { - synchronized (deviceMap) { - Integer focusedWindow = focusedWindowHashes.get(device); + synchronized (mDeviceMap) { + Integer focusedWindow = mFocusedWindowHashes.get(device); if (focusedWindow == null) { return -1; } @@ -235,22 +235,22 @@ public class DeviceSelectionModel { } public void setSelection(IDevice device, Window window) { - synchronized (deviceMap) { - selectedDevice = device; - selectedWindow = window; + synchronized (mDeviceMap) { + mSelectedDevice = device; + mSelectedWindow = window; } notifySelectionChanged(device, window); } public IDevice getSelectedDevice() { - synchronized (deviceMap) { - return selectedDevice; + synchronized (mDeviceMap) { + return mSelectedDevice; } } public Window getSelectedWindow() { - synchronized (deviceMap) { - return selectedWindow; + synchronized (mDeviceMap) { + return mSelectedWindow; } } } 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 e52db14..004adb2 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java @@ -35,52 +35,52 @@ public class PixelPerfectModel { public static final int DEFAULT_OVERLAY_TRANSPARENCY_PERCENTAGE = 50; - private IDevice device; + private IDevice mDevice; - private Image image; + private Image mImage; - private Point crosshairLocation; + private Point mCrosshairLocation; - private ViewNode viewNode; + private ViewNode mViewNode; - private ViewNode selected; + private ViewNode mSelectedNode; - private int zoom; + private int mZoom; - private final ArrayList<ImageChangeListener> imageChangeListeners = - new ArrayList<ImageChangeListener>(); + private final ArrayList<IImageChangeListener> mImageChangeListeners = + new ArrayList<IImageChangeListener>(); - private Image overlayImage; + private Image mOverlayImage; - private double overlayTransparency = DEFAULT_OVERLAY_TRANSPARENCY_PERCENTAGE / 100.0; + private double mOverlayTransparency = DEFAULT_OVERLAY_TRANSPARENCY_PERCENTAGE / 100.0; - private static PixelPerfectModel model; + private static PixelPerfectModel sModel; public static PixelPerfectModel getModel() { - if (model == null) { - model = new PixelPerfectModel(); + if (sModel == null) { + sModel = new PixelPerfectModel(); } - return model; + return sModel; } public void setData(final IDevice device, final Image image, final ViewNode viewNode) { - final Image toDispose = this.image; - final Image toDispose2 = this.overlayImage; + final Image toDispose = this.mImage; + final Image toDispose2 = this.mOverlayImage; Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (PixelPerfectModel.this) { - PixelPerfectModel.this.device = device; - PixelPerfectModel.this.image = image; - PixelPerfectModel.this.viewNode = viewNode; + PixelPerfectModel.this.mDevice = device; + PixelPerfectModel.this.mImage = image; + PixelPerfectModel.this.mViewNode = viewNode; if (image != null) { - PixelPerfectModel.this.crosshairLocation = + PixelPerfectModel.this.mCrosshairLocation = new Point(image.getBounds().width / 2, image.getBounds().height / 2); } else { - PixelPerfectModel.this.crosshairLocation = null; + PixelPerfectModel.this.mCrosshairLocation = null; } - overlayImage = null; - PixelPerfectModel.this.selected = null; - zoom = DEFAULT_ZOOM; + mOverlayImage = null; + PixelPerfectModel.this.mSelectedNode = null; + mZoom = DEFAULT_ZOOM; } } }); @@ -104,14 +104,14 @@ public class PixelPerfectModel { public void setCrosshairLocation(int x, int y) { synchronized (this) { - crosshairLocation = new Point(x, y); + mCrosshairLocation = new Point(x, y); } notifyCrosshairMoved(); } public void setSelected(ViewNode selected) { synchronized (this) { - this.selected = selected; + this.mSelectedNode = selected; } notifySelectionChanged(); } @@ -120,8 +120,8 @@ public class PixelPerfectModel { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (PixelPerfectModel.this) { - PixelPerfectModel.this.viewNode = viewNode; - PixelPerfectModel.this.selected = null; + PixelPerfectModel.this.mViewNode = viewNode; + PixelPerfectModel.this.mSelectedNode = null; } } }); @@ -129,11 +129,11 @@ public class PixelPerfectModel { } public void setImage(final Image image) { - final Image toDispose = this.image; + final Image toDispose = this.mImage; Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (PixelPerfectModel.this) { - PixelPerfectModel.this.image = image; + PixelPerfectModel.this.mImage = image; } } }); @@ -155,17 +155,17 @@ public class PixelPerfectModel { if (newZoom > MAX_ZOOM) { newZoom = MAX_ZOOM; } - zoom = newZoom; + mZoom = newZoom; } notifyZoomChanged(); } public void setOverlayImage(final Image overlayImage) { - final Image toDispose = this.overlayImage; + final Image toDispose = this.mOverlayImage; Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (PixelPerfectModel.this) { - PixelPerfectModel.this.overlayImage = overlayImage; + PixelPerfectModel.this.mOverlayImage = overlayImage; } } }); @@ -183,60 +183,60 @@ public class PixelPerfectModel { synchronized (this) { value = Math.max(value, 0); value = Math.min(value, 1); - overlayTransparency = value; + mOverlayTransparency = value; } notifyOverlayTransparencyChanged(); } public ViewNode getViewNode() { synchronized (this) { - return viewNode; + return mViewNode; } } public Point getCrosshairLocation() { synchronized (this) { - return crosshairLocation; + return mCrosshairLocation; } } public Image getImage() { synchronized (this) { - return image; + return mImage; } } public ViewNode getSelected() { synchronized (this) { - return selected; + return mSelectedNode; } } public IDevice getDevice() { synchronized (this) { - return device; + return mDevice; } } public int getZoom() { synchronized (this) { - return zoom; + return mZoom; } } public Image getOverlayImage() { synchronized (this) { - return overlayImage; + return mOverlayImage; } } public double getOverlayTransparency() { synchronized (this) { - return overlayTransparency; + return mOverlayTransparency; } } - public static interface ImageChangeListener { + public static interface IImageChangeListener { public void imageLoaded(); public void imageChanged(); @@ -254,21 +254,21 @@ public class PixelPerfectModel { public void overlayTransparencyChanged(); } - private ImageChangeListener[] getImageChangeListenerList() { - ImageChangeListener[] listeners = null; - synchronized (imageChangeListeners) { - if (imageChangeListeners.size() == 0) { + private IImageChangeListener[] getImageChangeListenerList() { + IImageChangeListener[] listeners = null; + synchronized (mImageChangeListeners) { + if (mImageChangeListeners.size() == 0) { return null; } listeners = - imageChangeListeners.toArray(new ImageChangeListener[imageChangeListeners + mImageChangeListeners.toArray(new IImageChangeListener[mImageChangeListeners .size()]); } return listeners; } public void notifyImageLoaded() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].imageLoaded(); @@ -277,7 +277,7 @@ public class PixelPerfectModel { } public void notifyImageChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].imageChanged(); @@ -286,7 +286,7 @@ public class PixelPerfectModel { } public void notifyCrosshairMoved() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].crosshairMoved(); @@ -295,7 +295,7 @@ public class PixelPerfectModel { } public void notifySelectionChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].selectionChanged(); @@ -304,7 +304,7 @@ public class PixelPerfectModel { } public void notifyTreeChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].treeChanged(); @@ -313,7 +313,7 @@ public class PixelPerfectModel { } public void notifyZoomChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].zoomChanged(); @@ -322,7 +322,7 @@ public class PixelPerfectModel { } public void notifyOverlayChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].overlayChanged(); @@ -331,7 +331,7 @@ public class PixelPerfectModel { } public void notifyOverlayTransparencyChanged() { - ImageChangeListener[] listeners = getImageChangeListenerList(); + IImageChangeListener[] listeners = getImageChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].overlayTransparencyChanged(); @@ -339,15 +339,15 @@ public class PixelPerfectModel { } } - public void addImageChangeListener(ImageChangeListener listener) { - synchronized (imageChangeListeners) { - imageChangeListeners.add(listener); + public void addImageChangeListener(IImageChangeListener listener) { + synchronized (mImageChangeListeners) { + mImageChangeListeners.add(listener); } } - public void removeImageChangeListener(ImageChangeListener listener) { - synchronized (imageChangeListeners) { - imageChangeListeners.remove(listener); + public void removeImageChangeListener(IImageChangeListener listener) { + synchronized (mImageChangeListeners) { + mImageChangeListeners.remove(listener); } } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/TreeViewModel.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/TreeViewModel.java index ba0fa57..279b5fd 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/TreeViewModel.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/TreeViewModel.java @@ -29,58 +29,58 @@ public class TreeViewModel { public static final double MIN_ZOOM = 0.2; - private Window window; + private Window mWindow; - private DrawableViewNode tree; + private DrawableViewNode mTree; - private DrawableViewNode selectedNode; + private DrawableViewNode mSelectedNode; - private Rectangle viewport; + private Rectangle mViewport; - private double zoom; + private double mZoom; - private final ArrayList<TreeChangeListener> treeChangeListeners = - new ArrayList<TreeChangeListener>(); + private final ArrayList<ITreeChangeListener> mTreeChangeListeners = + new ArrayList<ITreeChangeListener>(); - private static TreeViewModel model; + private static TreeViewModel sModel; public static TreeViewModel getModel() { - if (model == null) { - model = new TreeViewModel(); + if (sModel == null) { + sModel = new TreeViewModel(); } - return model; + return sModel; } public void setData(Window window, ViewNode viewNode) { synchronized (this) { - if (tree != null) { - tree.viewNode.dispose(); + if (mTree != null) { + mTree.viewNode.dispose(); } - this.window = window; + this.mWindow = window; if (viewNode == null) { - tree = null; + mTree = null; } else { - tree = new DrawableViewNode(viewNode); - tree.setLeft(); - tree.placeRoot(); + mTree = new DrawableViewNode(viewNode); + mTree.setLeft(); + mTree.placeRoot(); } - viewport = null; - zoom = 1; - selectedNode = null; + mViewport = null; + mZoom = 1; + mSelectedNode = null; } notifyTreeChanged(); } public void setSelection(DrawableViewNode selectedNode) { synchronized (this) { - this.selectedNode = selectedNode; + this.mSelectedNode = selectedNode; } notifySelectionChanged(); } public void setViewport(Rectangle viewport) { synchronized (this) { - this.viewport = viewport; + this.mViewport = viewport; } notifyViewportChanged(); } @@ -88,9 +88,9 @@ public class TreeViewModel { public void setZoom(double newZoom) { Point zoomPoint = null; synchronized (this) { - if (tree != null && viewport != null) { + if (mTree != null && mViewport != null) { zoomPoint = - new Point(viewport.x + viewport.width / 2, viewport.y + viewport.height / 2); + new Point(mViewport.x + mViewport.width / 2, mViewport.y + mViewport.height / 2); } } zoomOnPoint(newZoom, zoomPoint); @@ -98,18 +98,18 @@ public class TreeViewModel { public void zoomOnPoint(double newZoom, Point zoomPoint) { synchronized (this) { - if (tree != null && this.viewport != null) { + if (mTree != null && this.mViewport != null) { if (newZoom < MIN_ZOOM) { newZoom = MIN_ZOOM; } if (newZoom > MAX_ZOOM) { newZoom = MAX_ZOOM; } - viewport.x = zoomPoint.x - (zoomPoint.x - viewport.x) * zoom / newZoom; - viewport.y = zoomPoint.y - (zoomPoint.y - viewport.y) * zoom / newZoom; - viewport.width = viewport.width * zoom / newZoom; - viewport.height = viewport.height * zoom / newZoom; - zoom = newZoom; + mViewport.x = zoomPoint.x - (zoomPoint.x - mViewport.x) * mZoom / newZoom; + mViewport.y = zoomPoint.y - (zoomPoint.y - mViewport.y) * mZoom / newZoom; + mViewport.width = mViewport.width * mZoom / newZoom; + mViewport.height = mViewport.height * mZoom / newZoom; + mZoom = newZoom; } } notifyZoomChanged(); @@ -117,35 +117,35 @@ public class TreeViewModel { public DrawableViewNode getTree() { synchronized (this) { - return tree; + return mTree; } } public Window getWindow() { synchronized (this) { - return window; + return mWindow; } } public Rectangle getViewport() { synchronized (this) { - return viewport; + return mViewport; } } public double getZoom() { synchronized (this) { - return zoom; + return mZoom; } } public DrawableViewNode getSelection() { synchronized (this) { - return selectedNode; + return mSelectedNode; } } - public static interface TreeChangeListener { + public static interface ITreeChangeListener { public void treeChanged(); public void selectionChanged(); @@ -155,20 +155,20 @@ public class TreeViewModel { public void zoomChanged(); } - private TreeChangeListener[] getTreeChangeListenerList() { - TreeChangeListener[] listeners = null; - synchronized (treeChangeListeners) { - if (treeChangeListeners.size() == 0) { + private ITreeChangeListener[] getTreeChangeListenerList() { + ITreeChangeListener[] listeners = null; + synchronized (mTreeChangeListeners) { + if (mTreeChangeListeners.size() == 0) { return null; } listeners = - treeChangeListeners.toArray(new TreeChangeListener[treeChangeListeners.size()]); + mTreeChangeListeners.toArray(new ITreeChangeListener[mTreeChangeListeners.size()]); } return listeners; } public void notifyTreeChanged() { - TreeChangeListener[] listeners = getTreeChangeListenerList(); + ITreeChangeListener[] listeners = getTreeChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].treeChanged(); @@ -177,7 +177,7 @@ public class TreeViewModel { } public void notifySelectionChanged() { - TreeChangeListener[] listeners = getTreeChangeListenerList(); + ITreeChangeListener[] listeners = getTreeChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].selectionChanged(); @@ -186,7 +186,7 @@ public class TreeViewModel { } public void notifyViewportChanged() { - TreeChangeListener[] listeners = getTreeChangeListenerList(); + ITreeChangeListener[] listeners = getTreeChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].viewportChanged(); @@ -195,7 +195,7 @@ public class TreeViewModel { } public void notifyZoomChanged() { - TreeChangeListener[] listeners = getTreeChangeListenerList(); + ITreeChangeListener[] listeners = getTreeChangeListenerList(); if (listeners != null) { for (int i = 0; i < listeners.length; i++) { listeners[i].zoomChanged(); @@ -203,15 +203,15 @@ public class TreeViewModel { } } - public void addTreeChangeListener(TreeChangeListener listener) { - synchronized (treeChangeListeners) { - treeChangeListeners.add(listener); + public void addTreeChangeListener(ITreeChangeListener listener) { + synchronized (mTreeChangeListeners) { + mTreeChangeListeners.add(listener); } } - public void removeTreeChangeListener(TreeChangeListener listener) { - synchronized (treeChangeListeners) { - treeChangeListeners.remove(listener); + public void removeTreeChangeListener(ITreeChangeListener listener) { + synchronized (mTreeChangeListeners) { + mTreeChangeListeners.remove(listener); } } } 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 ecee8d0..6ff8125 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java @@ -40,172 +40,172 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; public class CaptureDisplay { - private static Shell shell; + private static Shell sShell; - private static Canvas canvas; + private static Canvas sCanvas; - private static Image image; + private static Image sImage; - private static ViewNode viewNode; + private static ViewNode sViewNode; - private static Composite buttonBar; + private static Composite sButtonBar; - private static Button onWhite; + private static Button sOnWhite; - private static Button onBlack; + private static Button sOnBlack; - private static Button showExtras; + private static Button sShowExtras; public static void show(Shell parentShell, ViewNode viewNode, Image image) { - if (shell == null) { + if (sShell == null) { createShell(); } - if (shell.isVisible() && CaptureDisplay.viewNode != null) { - CaptureDisplay.viewNode.dereferenceImage(); + if (sShell.isVisible() && CaptureDisplay.sViewNode != null) { + CaptureDisplay.sViewNode.dereferenceImage(); } - CaptureDisplay.image = image; - CaptureDisplay.viewNode = viewNode; + CaptureDisplay.sImage = image; + CaptureDisplay.sViewNode = viewNode; viewNode.referenceImage(); - shell.setText(viewNode.name); + sShell.setText(viewNode.name); - boolean shellVisible = shell.isVisible(); + boolean shellVisible = sShell.isVisible(); if (!shellVisible) { - shell.setSize(0, 0); + sShell.setSize(0, 0); } Rectangle bounds = - shell.computeTrim(0, 0, Math.max(buttonBar.getBounds().width, - image.getBounds().width), buttonBar.getBounds().height + sShell.computeTrim(0, 0, Math.max(sButtonBar.getBounds().width, + image.getBounds().width), sButtonBar.getBounds().height + image.getBounds().height + 5); - shell.setSize(bounds.width, bounds.height); + sShell.setSize(bounds.width, bounds.height); if (!shellVisible) { - shell.setLocation(parentShell.getBounds().x + sShell.setLocation(parentShell.getBounds().x + (parentShell.getBounds().width - bounds.width) / 2, parentShell.getBounds().y + (parentShell.getBounds().height - bounds.height) / 2); } - shell.open(); + sShell.open(); if (shellVisible) { - canvas.redraw(); + sCanvas.redraw(); } } private static void createShell() { - shell = new Shell(Display.getDefault(), SWT.CLOSE | SWT.TITLE); + sShell = new Shell(Display.getDefault(), SWT.CLOSE | SWT.TITLE); GridLayout gridLayout = new GridLayout(); gridLayout.marginWidth = 0; gridLayout.marginHeight = 0; - shell.setLayout(gridLayout); + sShell.setLayout(gridLayout); - buttonBar = new Composite(shell, SWT.NONE); + sButtonBar = new Composite(sShell, SWT.NONE); RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL); rowLayout.pack = true; rowLayout.center = true; - buttonBar.setLayout(rowLayout); - Composite buttons = new Composite(buttonBar, SWT.NONE); + sButtonBar.setLayout(rowLayout); + Composite buttons = new Composite(sButtonBar, SWT.NONE); buttons.setLayout(new FillLayout()); - onWhite = new Button(buttons, SWT.TOGGLE); - onWhite.setText("On White"); - onBlack = new Button(buttons, SWT.TOGGLE); - onBlack.setText("On Black"); - onBlack.setSelection(true); - onWhite.addSelectionListener(whiteSelectionListener); - onBlack.addSelectionListener(blackSelectionListener); + sOnWhite = new Button(buttons, SWT.TOGGLE); + sOnWhite.setText("On White"); + sOnBlack = new Button(buttons, SWT.TOGGLE); + sOnBlack.setText("On Black"); + sOnBlack.setSelection(true); + sOnWhite.addSelectionListener(sWhiteSelectionListener); + sOnBlack.addSelectionListener(sBlackSelectionListener); - showExtras = new Button(buttonBar, SWT.CHECK); - showExtras.setText("Show Extras"); - showExtras.addSelectionListener(extrasSelectionListener); + sShowExtras = new Button(sButtonBar, SWT.CHECK); + sShowExtras.setText("Show Extras"); + sShowExtras.addSelectionListener(sExtrasSelectionListener); - canvas = new Canvas(shell, SWT.NONE); - canvas.setLayoutData(new GridData(GridData.FILL_BOTH)); - canvas.addPaintListener(paintListener); + sCanvas = new Canvas(sShell, SWT.NONE); + sCanvas.setLayoutData(new GridData(GridData.FILL_BOTH)); + sCanvas.addPaintListener(sPaintListener); - shell.addShellListener(shellListener); + sShell.addShellListener(sShellListener); ImageLoader imageLoader = ImageLoader.getLoader(HierarchyViewerDirector.class); - Image image = imageLoader.loadImage("display.png", Display.getDefault()); - shell.setImage(image); + Image image = imageLoader.loadImage("display.png", Display.getDefault()); //$NON-NLS-1$ + sShell.setImage(image); } - private static PaintListener paintListener = new PaintListener() { + private static PaintListener sPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { - if (onWhite.getSelection()) { + if (sOnWhite.getSelection()) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); } else { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); } - e.gc.fillRectangle(0, 0, canvas.getBounds().width, canvas.getBounds().height); - if (image != null) { - int width = image.getBounds().width; - int height = image.getBounds().height; - int x = (canvas.getBounds().width - width) / 2; - int y = (canvas.getBounds().height - height) / 2; - e.gc.drawImage(image, x, y); - if (showExtras.getSelection()) { - if ((viewNode.paddingLeft | viewNode.paddingRight | viewNode.paddingTop | viewNode.paddingBottom) != 0) { + e.gc.fillRectangle(0, 0, sCanvas.getBounds().width, sCanvas.getBounds().height); + if (sImage != null) { + int width = sImage.getBounds().width; + int height = sImage.getBounds().height; + int x = (sCanvas.getBounds().width - width) / 2; + int y = (sCanvas.getBounds().height - height) / 2; + e.gc.drawImage(sImage, x, y); + if (sShowExtras.getSelection()) { + if ((sViewNode.paddingLeft | sViewNode.paddingRight | sViewNode.paddingTop | sViewNode.paddingBottom) != 0) { e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLUE)); - e.gc.drawRectangle(x + viewNode.paddingLeft, y + viewNode.paddingTop, width - - viewNode.paddingLeft - viewNode.paddingRight - 1, height - - viewNode.paddingTop - viewNode.paddingBottom - 1); + e.gc.drawRectangle(x + sViewNode.paddingLeft, y + sViewNode.paddingTop, width + - sViewNode.paddingLeft - sViewNode.paddingRight - 1, height + - sViewNode.paddingTop - sViewNode.paddingBottom - 1); } - if (viewNode.hasMargins) { + if (sViewNode.hasMargins) { e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_GREEN)); - e.gc.drawRectangle(x - viewNode.marginLeft, y - viewNode.marginTop, width - + viewNode.marginLeft + viewNode.marginRight - 1, height - + viewNode.marginTop + viewNode.marginBottom - 1); + e.gc.drawRectangle(x - sViewNode.marginLeft, y - sViewNode.marginTop, width + + sViewNode.marginLeft + sViewNode.marginRight - 1, height + + sViewNode.marginTop + sViewNode.marginBottom - 1); } - if (viewNode.baseline != -1) { + if (sViewNode.baseline != -1) { e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED)); - e.gc.drawLine(x, y + viewNode.baseline, x + width - 1, viewNode.baseline); + e.gc.drawLine(x, y + sViewNode.baseline, x + width - 1, sViewNode.baseline); } } } } }; - private static ShellAdapter shellListener = new ShellAdapter() { + private static ShellAdapter sShellListener = new ShellAdapter() { @Override public void shellClosed(ShellEvent e) { e.doit = false; - shell.setVisible(false); - if (viewNode != null) { - viewNode.dereferenceImage(); + sShell.setVisible(false); + if (sViewNode != null) { + sViewNode.dereferenceImage(); } } }; - private static SelectionListener whiteSelectionListener = new SelectionListener() { + private static SelectionListener sWhiteSelectionListener = new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { // pass } public void widgetSelected(SelectionEvent e) { - onWhite.setSelection(true); - onBlack.setSelection(false); - canvas.redraw(); + sOnWhite.setSelection(true); + sOnBlack.setSelection(false); + sCanvas.redraw(); } }; - private static SelectionListener blackSelectionListener = new SelectionListener() { + private static SelectionListener sBlackSelectionListener = new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { // pass } public void widgetSelected(SelectionEvent e) { - onBlack.setSelection(true); - onWhite.setSelection(false); - canvas.redraw(); + sOnBlack.setSelection(true); + sOnWhite.setSelection(false); + sCanvas.redraw(); } }; - private static SelectionListener extrasSelectionListener = new SelectionListener() { + private static SelectionListener sExtrasSelectionListener = new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { // pass } public void widgetSelected(SelectionEvent e) { - canvas.redraw(); + sCanvas.redraw(); } }; } 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 4e0748f..4f2e17e 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java @@ -21,7 +21,7 @@ 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 com.android.hierarchyviewerlib.models.DeviceSelectionModel.IWindowChangeListener; import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.ILabelProvider; @@ -47,29 +47,29 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; -public class DeviceSelector extends Composite implements WindowChangeListener, SelectionListener { - private TreeViewer treeViewer; +public class DeviceSelector extends Composite implements IWindowChangeListener, SelectionListener { + private TreeViewer mTreeViewer; - private Tree tree; + private Tree mTree; - private DeviceSelectionModel model; + private DeviceSelectionModel mModel; - private Font boldFont; + private Font mBoldFont; - private Image deviceImage; + private Image mDeviceImage; - private Image emulatorImage; + private Image mEmulatorImage; private final static int ICON_WIDTH = 16; - private boolean doTreeViewStuff; + private boolean mDoTreeViewStuff; - private boolean doPixelPerfectStuff; + private boolean mDoPixelPerfectStuff; private class ContentProvider implements ITreeContentProvider, ILabelProvider, IFontProvider { public Object[] getChildren(Object parentElement) { - if (parentElement instanceof IDevice && doTreeViewStuff) { - Window[] list = model.getWindows((IDevice) parentElement); + if (parentElement instanceof IDevice && mDoTreeViewStuff) { + Window[] list = mModel.getWindows((IDevice) parentElement); if (list != null) { return list; } @@ -85,8 +85,8 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S } public boolean hasChildren(Object element) { - if (element instanceof IDevice && doTreeViewStuff) { - Window[] list = model.getWindows((IDevice) element); + if (element instanceof IDevice && mDoTreeViewStuff) { + Window[] list = mModel.getWindows((IDevice) element); if (list != null) { return list.length != 0; } @@ -96,7 +96,7 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public Object[] getElements(Object inputElement) { if (inputElement instanceof DeviceSelectionModel) { - return model.getDevices(); + return mModel.getDevices(); } return new Object[0]; } @@ -112,9 +112,9 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public Image getImage(Object element) { if (element instanceof IDevice) { if (((IDevice) element).isEmulator()) { - return emulatorImage; + return mEmulatorImage; } - return deviceImage; + return mDeviceImage; } return null; } @@ -130,9 +130,9 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public Font getFont(Object element) { if (element instanceof Window) { - int focusedWindow = model.getFocusedWindow(((Window) element).getDevice()); + int focusedWindow = mModel.getFocusedWindow(((Window) element).getDevice()); if (focusedWindow == ((Window) element).getHashCode()) { - return boldFont; + return mBoldFont; } } return null; @@ -154,28 +154,28 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public DeviceSelector(Composite parent, boolean doTreeViewStuff, boolean doPixelPerfectStuff) { super(parent, SWT.NONE); - this.doTreeViewStuff = doTreeViewStuff; - this.doPixelPerfectStuff = doPixelPerfectStuff; + this.mDoTreeViewStuff = doTreeViewStuff; + this.mDoPixelPerfectStuff = doPixelPerfectStuff; setLayout(new FillLayout()); - treeViewer = new TreeViewer(this, SWT.SINGLE); - treeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS); + mTreeViewer = new TreeViewer(this, SWT.SINGLE); + mTreeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS); - tree = treeViewer.getTree(); - tree.setLinesVisible(true); - tree.addSelectionListener(this); + mTree = mTreeViewer.getTree(); + mTree.setLinesVisible(true); + mTree.addSelectionListener(this); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); loadResources(); - model = DeviceSelectionModel.getModel(); + mModel = DeviceSelectionModel.getModel(); ContentProvider contentProvider = new ContentProvider(); - treeViewer.setContentProvider(contentProvider); - treeViewer.setLabelProvider(contentProvider); - model.addWindowChangeListener(this); - treeViewer.setInput(model); + mTreeViewer.setContentProvider(contentProvider); + mTreeViewer.setLabelProvider(contentProvider); + mModel.addWindowChangeListener(this); + mTreeViewer.setInput(mModel); - addControlListener(controlListener); + addControlListener(mControlListener); } public void loadResources() { @@ -189,38 +189,38 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S .getStyle() | SWT.BOLD); } - boldFont = new Font(Display.getDefault(), newFontData); + mBoldFont = new Font(Display.getDefault(), newFontData); ImageLoader loader = ImageLoader.getDdmUiLibLoader(); - deviceImage = - loader.loadImage(display, "device.png", ICON_WIDTH, ICON_WIDTH, display + mDeviceImage = + loader.loadImage(display, "device.png", ICON_WIDTH, ICON_WIDTH, display //$NON-NLS-1$ .getSystemColor(SWT.COLOR_RED)); - emulatorImage = - loader.loadImage(display, "emulator.png", ICON_WIDTH, ICON_WIDTH, display + mEmulatorImage = + loader.loadImage(display, "emulator.png", ICON_WIDTH, ICON_WIDTH, display //$NON-NLS-1$ .getSystemColor(SWT.COLOR_BLUE)); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeWindowChangeListener(DeviceSelector.this); - boldFont.dispose(); + mModel.removeWindowChangeListener(DeviceSelector.this); + mBoldFont.dispose(); } }; // If the window gets too small, hide the data, otherwise SWT throws an // ERROR. - private ControlListener controlListener = new ControlAdapter() { + private ControlListener mControlListener = new ControlAdapter() { private boolean noInput = false; @Override public void controlResized(ControlEvent e) { if (getBounds().height <= 38) { - treeViewer.setInput(null); + mTreeViewer.setInput(null); noInput = true; } else if (noInput) { - treeViewer.setInput(model); + mTreeViewer.setInput(mModel); noInput = false; } } @@ -228,20 +228,20 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S @Override public boolean setFocus() { - return tree.setFocus(); + return mTree.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; + if (this.mDoTreeViewStuff != doTreeViewStuff + || this.mDoPixelPerfectStuff != doPixelPerfectStuff) { + final boolean expandAll = !this.mDoTreeViewStuff && doTreeViewStuff; + this.mDoTreeViewStuff = doTreeViewStuff; + this.mDoPixelPerfectStuff = doPixelPerfectStuff; Display.getDefault().syncExec(new Runnable() { public void run() { - treeViewer.refresh(); + mTreeViewer.refresh(); if (expandAll) { - treeViewer.expandAll(); + mTreeViewer.expandAll(); } } }); @@ -251,8 +251,8 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void deviceConnected(final IDevice device) { Display.getDefault().syncExec(new Runnable() { public void run() { - treeViewer.refresh(); - treeViewer.setExpandedState(device, true); + mTreeViewer.refresh(); + mTreeViewer.setExpandedState(device, true); } }); } @@ -260,11 +260,11 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void deviceChanged(final IDevice device) { Display.getDefault().syncExec(new Runnable() { public void run() { - TreeSelection selection = (TreeSelection) treeViewer.getSelection(); - treeViewer.refresh(device); + TreeSelection selection = (TreeSelection) mTreeViewer.getSelection(); + mTreeViewer.refresh(device); if (selection.getFirstElement() instanceof Window && ((Window) selection.getFirstElement()).getDevice() == device) { - treeViewer.setSelection(selection, true); + mTreeViewer.setSelection(selection, true); } } }); @@ -273,7 +273,7 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void deviceDisconnected(final IDevice device) { Display.getDefault().syncExec(new Runnable() { public void run() { - treeViewer.refresh(); + mTreeViewer.refresh(); } }); } @@ -281,11 +281,11 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void focusChanged(final IDevice device) { Display.getDefault().syncExec(new Runnable() { public void run() { - TreeSelection selection = (TreeSelection) treeViewer.getSelection(); - treeViewer.refresh(device); + TreeSelection selection = (TreeSelection) mTreeViewer.getSelection(); + mTreeViewer.refresh(device); if (selection.getFirstElement() instanceof Window && ((Window) selection.getFirstElement()).getDevice() == device) { - treeViewer.setSelection(selection, true); + mTreeViewer.setSelection(selection, true); } } }); @@ -297,9 +297,9 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void widgetDefaultSelected(SelectionEvent e) { Object selection = ((TreeItem) e.item).getData(); - if (selection instanceof IDevice && doPixelPerfectStuff) { + if (selection instanceof IDevice && mDoPixelPerfectStuff) { HierarchyViewerDirector.getDirector().loadPixelPerfectData((IDevice) selection); - } else if (selection instanceof Window && doTreeViewStuff) { + } else if (selection instanceof Window && mDoTreeViewStuff) { HierarchyViewerDirector.getDirector().loadViewTreeData((Window) selection); } } @@ -307,9 +307,9 @@ public class DeviceSelector extends Composite implements WindowChangeListener, S public void widgetSelected(SelectionEvent e) { Object selection = ((TreeItem) e.item).getData(); if (selection instanceof IDevice) { - model.setSelection((IDevice) selection, null); + mModel.setSelection((IDevice) selection, null); } else if (selection instanceof Window) { - model.setSelection(((Window) selection).getDevice(), (Window) selection); + mModel.setSelection(((Window) selection).getDevice(), (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 1a13e48..94c63aa 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java @@ -18,7 +18,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.HierarchyViewerDirector; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode.Point; @@ -40,66 +40,66 @@ import org.eclipse.swt.widgets.Listener; import java.util.ArrayList; -public class LayoutViewer extends Canvas implements TreeChangeListener { +public class LayoutViewer extends Canvas implements ITreeChangeListener { - private TreeViewModel model; + private TreeViewModel mModel; - private DrawableViewNode tree; + private DrawableViewNode mTree; - private DrawableViewNode selectedNode; + private DrawableViewNode mSelectedNode; - private Transform transform; + private Transform mTransform; - private Transform inverse; + private Transform mInverse; - private double scale; + private double mScale; - private boolean showExtras = false; + private boolean mShowExtras = false; - private boolean onBlack = true; + private boolean mOnBlack = true; public LayoutViewer(Composite parent) { super(parent, SWT.NONE); - model = TreeViewModel.getModel(); - model.addTreeChangeListener(this); + mModel = TreeViewModel.getModel(); + mModel.addTreeChangeListener(this); - addDisposeListener(disposeListener); - addPaintListener(paintListener); - addListener(SWT.Resize, resizeListener); - addMouseListener(mouseListener); + addDisposeListener(mDisposeListener); + addPaintListener(mPaintListener); + addListener(SWT.Resize, mResizeListener); + addMouseListener(mMouseListener); - transform = new Transform(Display.getDefault()); - inverse = new Transform(Display.getDefault()); + mTransform = new Transform(Display.getDefault()); + mInverse = new Transform(Display.getDefault()); treeChanged(); } public void setShowExtras(boolean show) { - showExtras = show; + mShowExtras = show; doRedraw(); } public void setOnBlack(boolean value) { - onBlack = value; + mOnBlack = value; doRedraw(); } public boolean getOnBlack() { - return onBlack; + return mOnBlack; } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeTreeChangeListener(LayoutViewer.this); - transform.dispose(); - inverse.dispose(); - if (selectedNode != null) { - selectedNode.viewNode.dereferenceImage(); + mModel.removeTreeChangeListener(LayoutViewer.this); + mTransform.dispose(); + mInverse.dispose(); + if (mSelectedNode != null) { + mSelectedNode.viewNode.dereferenceImage(); } } }; - private Listener resizeListener = new Listener() { + private Listener mResizeListener = new Listener() { public void handleEvent(Event e) { synchronized (this) { setTransform(); @@ -107,12 +107,12 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { } }; - private MouseListener mouseListener = new MouseListener() { + private MouseListener mMouseListener = new MouseListener() { public void mouseDoubleClick(MouseEvent e) { - if (selectedNode != null) { + if (mSelectedNode != null) { HierarchyViewerDirector.getDirector() - .showCapture(getShell(), selectedNode.viewNode); + .showCapture(getShell(), mSelectedNode.viewNode); } } @@ -120,21 +120,21 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { boolean selectionChanged = false; DrawableViewNode newSelection = null; synchronized (LayoutViewer.this) { - if (tree != null) { + if (mTree != null) { float[] pt = { e.x, e.y }; - inverse.transform(pt); + mInverse.transform(pt); newSelection = - updateSelection(tree, pt[0], pt[1], 0, 0, 0, 0, tree.viewNode.width, - tree.viewNode.height); - if (selectedNode != newSelection) { + updateSelection(mTree, pt[0], pt[1], 0, 0, 0, 0, mTree.viewNode.width, + mTree.viewNode.height); + if (mSelectedNode != newSelection) { selectionChanged = true; } } } if (selectionChanged) { - model.setSelection(newSelection); + mModel.setSelection(newSelection); } } @@ -175,29 +175,29 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { return node; } - private PaintListener paintListener = new PaintListener() { + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (LayoutViewer.this) { - if (onBlack) { + if (mOnBlack) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); } else { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); } e.gc.fillRectangle(0, 0, getBounds().width, getBounds().height); - if (tree != null) { - e.gc.setLineWidth((int) Math.ceil(0.3 / scale)); - e.gc.setTransform(transform); - if (onBlack) { + if (mTree != null) { + e.gc.setLineWidth((int) Math.ceil(0.3 / mScale)); + e.gc.setTransform(mTransform); + if (mOnBlack) { e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); } else { e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); } Rectangle parentClipping = e.gc.getClipping(); - e.gc.setClipping(0, 0, tree.viewNode.width + (int) Math.ceil(0.3 / scale), - tree.viewNode.height + (int) Math.ceil(0.3 / scale)); - paintRecursive(e.gc, tree, 0, 0, true); + e.gc.setClipping(0, 0, mTree.viewNode.width + (int) Math.ceil(0.3 / mScale), + mTree.viewNode.height + (int) Math.ceil(0.3 / mScale)); + paintRecursive(e.gc, mTree, 0, 0, true); - if (selectedNode != null) { + if (mSelectedNode != null) { e.gc.setClipping(parentClipping); // w00t, let's be nice and display the whole path in @@ -205,8 +205,8 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { ArrayList<Point> rightLeftDistances = new ArrayList<Point>(); int left = 0; int top = 0; - DrawableViewNode currentNode = selectedNode; - while (currentNode != tree) { + DrawableViewNode currentNode = mSelectedNode; + while (currentNode != mTree) { left += currentNode.viewNode.left; top += currentNode.viewNode.top; currentNode = currentNode.parent; @@ -215,7 +215,7 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { rightLeftDistances.add(new Point(left, top)); } e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_DARK_RED)); - currentNode = selectedNode.parent; + currentNode = mSelectedNode.parent; final int N = rightLeftDistances.size(); for (int i = 0; i < N; i++) { e.gc.drawRectangle((int) (left - rightLeftDistances.get(i).x), @@ -224,23 +224,23 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { currentNode = currentNode.parent; } - if (showExtras && selectedNode.viewNode.image != null) { - e.gc.drawImage(selectedNode.viewNode.image, left, top); - if (onBlack) { + if (mShowExtras && mSelectedNode.viewNode.image != null) { + e.gc.drawImage(mSelectedNode.viewNode.image, left, top); + if (mOnBlack) { e.gc.setForeground(Display.getDefault().getSystemColor( SWT.COLOR_WHITE)); } else { e.gc.setForeground(Display.getDefault().getSystemColor( SWT.COLOR_BLACK)); } - paintRecursive(e.gc, selectedNode, left, top, true); + paintRecursive(e.gc, mSelectedNode, left, top, true); } e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED)); - e.gc.setLineWidth((int) Math.ceil(2 / scale)); - e.gc.drawRectangle(left, top, selectedNode.viewNode.width, - selectedNode.viewNode.height); + e.gc.setLineWidth((int) Math.ceil(2 / mScale)); + e.gc.drawRectangle(left, top, mSelectedNode.viewNode.width, + mSelectedNode.viewNode.height); } } } @@ -260,11 +260,11 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { int x1 = Math.max(parentClipping.x, left); int x2 = Math.min(parentClipping.x + parentClipping.width, left + node.viewNode.width - + (int) Math.ceil(0.3 / scale)); + + (int) Math.ceil(0.3 / mScale)); int y1 = Math.max(parentClipping.y, top); int y2 = Math.min(parentClipping.y + parentClipping.height, top + node.viewNode.height - + (int) Math.ceil(0.3 / scale)); + + (int) Math.ceil(0.3 / mScale)); // Clipping is weird... You set it to -5 and it comes out 17 or // something. @@ -293,38 +293,38 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { } private void setTransform() { - if (tree != null) { + if (mTree != null) { Rectangle bounds = getBounds(); int leftRightPadding = bounds.width <= 30 ? 0 : 5; int topBottomPadding = bounds.height <= 30 ? 0 : 5; - scale = - Math.min(1.0 * (bounds.width - leftRightPadding * 2) / tree.viewNode.width, 1.0 - * (bounds.height - topBottomPadding * 2) / tree.viewNode.height); - int scaledWidth = (int) Math.ceil(tree.viewNode.width * scale); - int scaledHeight = (int) Math.ceil(tree.viewNode.height * scale); - - transform.identity(); - inverse.identity(); - transform.translate((bounds.width - scaledWidth) / 2.0f, + mScale = + Math.min(1.0 * (bounds.width - leftRightPadding * 2) / mTree.viewNode.width, 1.0 + * (bounds.height - topBottomPadding * 2) / mTree.viewNode.height); + int scaledWidth = (int) Math.ceil(mTree.viewNode.width * mScale); + int scaledHeight = (int) Math.ceil(mTree.viewNode.height * mScale); + + mTransform.identity(); + mInverse.identity(); + mTransform.translate((bounds.width - scaledWidth) / 2.0f, (bounds.height - scaledHeight) / 2.0f); - inverse.translate((bounds.width - scaledWidth) / 2.0f, + mInverse.translate((bounds.width - scaledWidth) / 2.0f, (bounds.height - scaledHeight) / 2.0f); - transform.scale((float) scale, (float) scale); - inverse.scale((float) scale, (float) scale); + mTransform.scale((float) mScale, (float) mScale); + mInverse.scale((float) mScale, (float) mScale); if (bounds.width != 0 && bounds.height != 0) { - inverse.invert(); + mInverse.invert(); } } } public void selectionChanged() { synchronized (this) { - if (selectedNode != null) { - selectedNode.viewNode.dereferenceImage(); + if (mSelectedNode != null) { + mSelectedNode.viewNode.dereferenceImage(); } - selectedNode = model.getSelection(); - if (selectedNode != null) { - selectedNode.viewNode.referenceImage(); + mSelectedNode = mModel.getSelection(); + if (mSelectedNode != null) { + mSelectedNode.viewNode.referenceImage(); } } doRedraw(); @@ -335,13 +335,13 @@ public class LayoutViewer extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - if (selectedNode != null) { - selectedNode.viewNode.dereferenceImage(); + if (mSelectedNode != null) { + mSelectedNode.viewNode.dereferenceImage(); } - tree = model.getTree(); - selectedNode = model.getSelection(); - if (selectedNode != null) { - selectedNode.viewNode.referenceImage(); + mTree = mModel.getTree(); + mSelectedNode = mModel.getSelection(); + if (mSelectedNode != null) { + mSelectedNode.viewNode.referenceImage(); } setTransform(); } 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 42bcc59..90e19c6 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java @@ -18,7 +18,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.device.ViewNode; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; @@ -39,72 +39,72 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -public class PixelPerfect extends ScrolledComposite implements ImageChangeListener { - private Canvas canvas; +public class PixelPerfect extends ScrolledComposite implements IImageChangeListener { + private Canvas mCanvas; - private PixelPerfectModel model; + private PixelPerfectModel mModel; - private Image image; + private Image mImage; - private Color crosshairColor; + private Color mCrosshairColor; - private Color marginColor; + private Color mMarginColor; - private Color borderColor; + private Color mBorderColor; - private Color paddingColor; + private Color mPaddingColor; - private int width; + private int mWidth; - private int height; + private int mHeight; - private Point crosshairLocation; + private Point mCrosshairLocation; - private ViewNode selectedNode; + private ViewNode mSelectedNode; - private Image overlayImage; + private Image mOverlayImage; - private double overlayTransparency; + private double mOverlayTransparency; public PixelPerfect(Composite parent) { super(parent, SWT.H_SCROLL | SWT.V_SCROLL); - canvas = new Canvas(this, SWT.NONE); - setContent(canvas); + mCanvas = new Canvas(this, SWT.NONE); + setContent(mCanvas); setExpandHorizontal(true); setExpandVertical(true); - model = PixelPerfectModel.getModel(); - model.addImageChangeListener(this); + mModel = PixelPerfectModel.getModel(); + mModel.addImageChangeListener(this); - canvas.addPaintListener(paintListener); - canvas.addMouseListener(mouseListener); - canvas.addMouseMoveListener(mouseMoveListener); - canvas.addKeyListener(keyListener); + mCanvas.addPaintListener(mPaintListener); + mCanvas.addMouseListener(mMouseListener); + mCanvas.addMouseMoveListener(mMouseMoveListener); + mCanvas.addKeyListener(mKeyListener); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); - crosshairColor = new Color(Display.getDefault(), new RGB(0, 255, 255)); - 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)); + mCrosshairColor = new Color(Display.getDefault(), new RGB(0, 255, 255)); + mBorderColor = new Color(Display.getDefault(), new RGB(255, 0, 0)); + mMarginColor = new Color(Display.getDefault(), new RGB(0, 255, 0)); + mPaddingColor = new Color(Display.getDefault(), new RGB(0, 0, 255)); imageLoaded(); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeImageChangeListener(PixelPerfect.this); - crosshairColor.dispose(); - borderColor.dispose(); - paddingColor.dispose(); + mModel.removeImageChangeListener(PixelPerfect.this); + mCrosshairColor.dispose(); + mBorderColor.dispose(); + mPaddingColor.dispose(); } }; @Override public boolean setFocus() { - return canvas.setFocus(); + return mCanvas.setFocus(); } - private MouseListener mouseListener = new MouseListener() { + private MouseListener mMouseListener = new MouseListener() { public void mouseDoubleClick(MouseEvent e) { // pass @@ -120,7 +120,7 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen }; - private MouseMoveListener mouseMoveListener = new MouseMoveListener() { + private MouseMoveListener mMouseMoveListener = new MouseMoveListener() { public void mouseMove(MouseEvent e) { if (e.stateMask != 0) { handleMouseEvent(e); @@ -130,49 +130,49 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen private void handleMouseEvent(MouseEvent e) { synchronized (PixelPerfect.this) { - if (image == null) { + if (mImage == null) { return; } - int leftOffset = canvas.getSize().x / 2 - width / 2; - int topOffset = canvas.getSize().y / 2 - height / 2; + int leftOffset = mCanvas.getSize().x / 2 - mWidth / 2; + int topOffset = mCanvas.getSize().y / 2 - mHeight / 2; e.x -= leftOffset; e.y -= topOffset; e.x = Math.max(e.x, 0); - e.x = Math.min(e.x, width - 1); + e.x = Math.min(e.x, mWidth - 1); e.y = Math.max(e.y, 0); - e.y = Math.min(e.y, height - 1); + e.y = Math.min(e.y, mHeight - 1); } - model.setCrosshairLocation(e.x, e.y); + mModel.setCrosshairLocation(e.x, e.y); } - private KeyListener keyListener = new KeyListener() { + private KeyListener mKeyListener = new KeyListener() { public void keyPressed(KeyEvent e) { boolean crosshairMoved = false; synchronized (PixelPerfect.this) { - if (image != null) { + if (mImage != null) { switch (e.keyCode) { case SWT.ARROW_UP: - if (crosshairLocation.y != 0) { - crosshairLocation.y--; + if (mCrosshairLocation.y != 0) { + mCrosshairLocation.y--; crosshairMoved = true; } break; case SWT.ARROW_DOWN: - if (crosshairLocation.y != height - 1) { - crosshairLocation.y++; + if (mCrosshairLocation.y != mHeight - 1) { + mCrosshairLocation.y++; crosshairMoved = true; } break; case SWT.ARROW_LEFT: - if (crosshairLocation.x != 0) { - crosshairLocation.x--; + if (mCrosshairLocation.x != 0) { + mCrosshairLocation.x--; crosshairMoved = true; } break; case SWT.ARROW_RIGHT: - if (crosshairLocation.x != width - 1) { - crosshairLocation.x++; + if (mCrosshairLocation.x != mWidth - 1) { + mCrosshairLocation.x++; crosshairMoved = true; } break; @@ -180,7 +180,7 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen } } if (crosshairMoved) { - model.setCrosshairLocation(crosshairLocation.x, crosshairLocation.y); + mModel.setCrosshairLocation(mCrosshairLocation.x, mCrosshairLocation.y); } } @@ -190,43 +190,43 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen }; - private PaintListener paintListener = new PaintListener() { + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (PixelPerfect.this) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); - e.gc.fillRectangle(0, 0, canvas.getSize().x, canvas.getSize().y); - if (image != null) { + e.gc.fillRectangle(0, 0, mCanvas.getSize().x, mCanvas.getSize().y); + if (mImage != null) { // Let's be cool and put it in the center... - int leftOffset = canvas.getSize().x / 2 - width / 2; - int topOffset = canvas.getSize().y / 2 - height / 2; - e.gc.drawImage(image, leftOffset, topOffset); - if (overlayImage != null) { - e.gc.setAlpha((int) (overlayTransparency * 255)); + int leftOffset = mCanvas.getSize().x / 2 - mWidth / 2; + int topOffset = mCanvas.getSize().y / 2 - mHeight / 2; + e.gc.drawImage(mImage, leftOffset, topOffset); + if (mOverlayImage != null) { + e.gc.setAlpha((int) (mOverlayTransparency * 255)); int overlayTopOffset = - canvas.getSize().y / 2 + height / 2 - - overlayImage.getBounds().height; - e.gc.drawImage(overlayImage, leftOffset, overlayTopOffset); + mCanvas.getSize().y / 2 + mHeight / 2 + - mOverlayImage.getBounds().height; + e.gc.drawImage(mOverlayImage, leftOffset, overlayTopOffset); e.gc.setAlpha(255); } - if (selectedNode != null) { + if (mSelectedNode != null) { // If the screen is in landscape mode, the // coordinates are backwards. int leftShift = 0; int topShift = 0; - int nodeLeft = selectedNode.left; - int nodeTop = selectedNode.top; - int nodeWidth = selectedNode.width; - int nodeHeight = selectedNode.height; - int nodeMarginLeft = selectedNode.marginLeft; - int nodeMarginTop = selectedNode.marginTop; - int nodeMarginRight = selectedNode.marginRight; - int nodeMarginBottom = selectedNode.marginBottom; - int nodePadLeft = selectedNode.paddingLeft; - int nodePadTop = selectedNode.paddingTop; - int nodePadRight = selectedNode.paddingRight; - int nodePadBottom = selectedNode.paddingBottom; - ViewNode cur = selectedNode; + int nodeLeft = mSelectedNode.left; + int nodeTop = mSelectedNode.top; + int nodeWidth = mSelectedNode.width; + int nodeHeight = mSelectedNode.height; + int nodeMarginLeft = mSelectedNode.marginLeft; + int nodeMarginTop = mSelectedNode.marginTop; + int nodeMarginRight = mSelectedNode.marginRight; + int nodeMarginBottom = mSelectedNode.marginBottom; + int nodePadLeft = mSelectedNode.paddingLeft; + int nodePadTop = mSelectedNode.paddingTop; + int nodePadRight = mSelectedNode.paddingRight; + int nodePadBottom = mSelectedNode.paddingBottom; + ViewNode cur = mSelectedNode; while (cur.parent != null) { leftShift += cur.parent.left - cur.parent.scrollX; topShift += cur.parent.top - cur.parent.scrollY; @@ -235,44 +235,44 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen // Everything is sideways. if (cur.width > cur.height) { - e.gc.setForeground(paddingColor); - e.gc.drawRectangle(leftOffset + width - nodeTop - topShift - nodeHeight + e.gc.setForeground(mPaddingColor); + e.gc.drawRectangle(leftOffset + mWidth - nodeTop - topShift - nodeHeight + nodePadBottom, topOffset + leftShift + nodeLeft + nodePadLeft, nodeHeight - nodePadBottom - nodePadTop, nodeWidth - nodePadRight - nodePadLeft); - e.gc.setForeground(marginColor); - e.gc.drawRectangle(leftOffset + width - nodeTop - topShift - nodeHeight + e.gc.setForeground(mMarginColor); + e.gc.drawRectangle(leftOffset + mWidth - nodeTop - topShift - nodeHeight - nodeMarginBottom, topOffset + leftShift + nodeLeft - nodeMarginLeft, nodeHeight + nodeMarginBottom + nodeMarginTop, nodeWidth + nodeMarginRight + nodeMarginLeft); - e.gc.setForeground(borderColor); + e.gc.setForeground(mBorderColor); e.gc.drawRectangle( - leftOffset + width - nodeTop - topShift - nodeHeight, topOffset + leftOffset + mWidth - nodeTop - topShift - nodeHeight, topOffset + leftShift + nodeLeft, nodeHeight, nodeWidth); } else { - e.gc.setForeground(paddingColor); + e.gc.setForeground(mPaddingColor); e.gc.drawRectangle(leftOffset + leftShift + nodeLeft + nodePadLeft, topOffset + topShift + nodeTop + nodePadTop, nodeWidth - nodePadRight - nodePadLeft, nodeHeight - nodePadBottom - nodePadTop); - e.gc.setForeground(marginColor); + e.gc.setForeground(mMarginColor); e.gc.drawRectangle(leftOffset + leftShift + nodeLeft - nodeMarginLeft, topOffset + topShift + nodeTop - nodeMarginTop, nodeWidth + nodeMarginRight + nodeMarginLeft, nodeHeight + nodeMarginBottom + nodeMarginTop); - e.gc.setForeground(borderColor); + e.gc.setForeground(mBorderColor); e.gc.drawRectangle(leftOffset + leftShift + nodeLeft, topOffset + topShift + nodeTop, nodeWidth, nodeHeight); } } - if (crosshairLocation != null) { - e.gc.setForeground(crosshairColor); - e.gc.drawLine(leftOffset, topOffset + crosshairLocation.y, leftOffset - + width - 1, topOffset + crosshairLocation.y); - e.gc.drawLine(leftOffset + crosshairLocation.x, topOffset, leftOffset - + crosshairLocation.x, topOffset + height - 1); + if (mCrosshairLocation != null) { + e.gc.setForeground(mCrosshairColor); + e.gc.drawLine(leftOffset, topOffset + mCrosshairLocation.y, leftOffset + + mWidth - 1, topOffset + mCrosshairLocation.y); + e.gc.drawLine(leftOffset + mCrosshairLocation.x, topOffset, leftOffset + + mCrosshairLocation.x, topOffset + mHeight - 1); } } } @@ -282,21 +282,21 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen private void doRedraw() { Display.getDefault().syncExec(new Runnable() { public void run() { - canvas.redraw(); + mCanvas.redraw(); } }); } private void loadImage() { - image = model.getImage(); - if (image != null) { - width = image.getBounds().width; - height = image.getBounds().height; + mImage = mModel.getImage(); + if (mImage != null) { + mWidth = mImage.getBounds().width; + mHeight = mImage.getBounds().height; } else { - width = 0; - height = 0; + mWidth = 0; + mHeight = 0; } - setMinSize(width, height); + setMinSize(mWidth, mHeight); } public void imageLoaded() { @@ -304,10 +304,10 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen public void run() { synchronized (this) { loadImage(); - crosshairLocation = model.getCrosshairLocation(); - selectedNode = model.getSelected(); - overlayImage = model.getOverlayImage(); - overlayTransparency = model.getOverlayTransparency(); + mCrosshairLocation = mModel.getCrosshairLocation(); + mSelectedNode = mModel.getSelected(); + mOverlayImage = mModel.getOverlayImage(); + mOverlayTransparency = mModel.getOverlayTransparency(); } } }); @@ -327,14 +327,14 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen public void crosshairMoved() { synchronized (this) { - crosshairLocation = model.getCrosshairLocation(); + mCrosshairLocation = mModel.getCrosshairLocation(); } doRedraw(); } public void selectionChanged() { synchronized (this) { - selectedNode = model.getSelected(); + mSelectedNode = mModel.getSelected(); } doRedraw(); } @@ -344,7 +344,7 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - selectedNode = model.getSelected(); + mSelectedNode = mModel.getSelected(); } } }); @@ -357,15 +357,15 @@ public class PixelPerfect extends ScrolledComposite implements ImageChangeListen public void overlayChanged() { synchronized (this) { - overlayImage = model.getOverlayImage(); - overlayTransparency = model.getOverlayTransparency(); + mOverlayImage = mModel.getOverlayImage(); + mOverlayTransparency = mModel.getOverlayTransparency(); } doRedraw(); } public void overlayTransparencyChanged() { synchronized (this) { - overlayTransparency = model.getOverlayTransparency(); + mOverlayTransparency = mModel.getOverlayTransparency(); } doRedraw(); } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java index 5a593f6..3114d34 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java @@ -18,7 +18,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.HierarchyViewerDirector; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -34,13 +34,13 @@ 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 { +public class PixelPerfectControls extends Composite implements IImageChangeListener { - private Slider overlaySlider; + private Slider mOverlaySlider; - private Slider zoomSlider; + private Slider mZoomSlider; - private Slider autoRefreshSlider; + private Slider mAutoRefreshSlider; public PixelPerfectControls(Composite parent) { super(parent, SWT.NONE); @@ -114,56 +114,56 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen 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() + mOverlaySlider = new Slider(this, SWT.HORIZONTAL); + mOverlaySlider.setMinimum(0); + mOverlaySlider.setMaximum(101); + mOverlaySlider.setThumb(1); + mOverlaySlider.setSelection((int) Math.round(PixelPerfectModel.getModel() .getOverlayTransparency() * 100)); Image overlayImage = PixelPerfectModel.getModel().getOverlayImage(); - overlaySlider.setEnabled(overlayImage != null); + mOverlaySlider.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); + mOverlaySlider.setLayoutData(overlaySliderData); - overlaySlider.addSelectionListener(overlaySliderSelectionListener); + mOverlaySlider.addSelectionListener(overlaySliderSelectionListener); - autoRefreshSlider = new Slider(this, SWT.HORIZONTAL); - autoRefreshSlider.setMinimum(1); - autoRefreshSlider.setMaximum(41); - autoRefreshSlider.setThumb(1); - autoRefreshSlider.setSelection(HierarchyViewerDirector.getDirector() + mAutoRefreshSlider = new Slider(this, SWT.HORIZONTAL); + mAutoRefreshSlider.setMinimum(1); + mAutoRefreshSlider.setMaximum(41); + mAutoRefreshSlider.setThumb(1); + mAutoRefreshSlider.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); + refreshSliderData.left = new FormAttachment(mOverlaySlider, 0, SWT.LEFT); + mAutoRefreshSlider.setLayoutData(refreshSliderData); - autoRefreshSlider.addSelectionListener(refreshSliderSelectionListener); + mAutoRefreshSlider.addSelectionListener(mRefreshSliderSelectionListener); - zoomSlider = new Slider(this, SWT.HORIZONTAL); - zoomSlider.setMinimum(2); - zoomSlider.setMaximum(25); - zoomSlider.setThumb(1); - zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom()); + mZoomSlider = new Slider(this, SWT.HORIZONTAL); + mZoomSlider.setMinimum(2); + mZoomSlider.setMaximum(25); + mZoomSlider.setThumb(1); + mZoomSlider.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); + zoomSliderData.left = new FormAttachment(mOverlaySlider, 0, SWT.LEFT); + mZoomSlider.setLayoutData(zoomSliderData); - zoomSlider.addSelectionListener(zoomSliderSelectionListener); + mZoomSlider.addSelectionListener(mZoomSliderSelectionListener); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); PixelPerfectModel.getModel().addImageChangeListener(this); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this); } @@ -177,7 +177,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen } public void widgetSelected(SelectionEvent e) { - int newValue = overlaySlider.getSelection(); + int newValue = mOverlaySlider.getSelection(); if (oldValue != newValue) { PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this); PixelPerfectModel.getModel().setOverlayTransparency(newValue / 100.0); @@ -187,7 +187,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen } }; - private SelectionListener refreshSliderSelectionListener = new SelectionListener() { + private SelectionListener mRefreshSliderSelectionListener = new SelectionListener() { private int oldValue; public void widgetDefaultSelected(SelectionEvent e) { @@ -195,14 +195,14 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen } public void widgetSelected(SelectionEvent e) { - int newValue = autoRefreshSlider.getSelection(); + int newValue = mAutoRefreshSlider.getSelection(); if (oldValue != newValue) { HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefreshInterval(newValue); } } }; - private SelectionListener zoomSliderSelectionListener = new SelectionListener() { + private SelectionListener mZoomSliderSelectionListener = new SelectionListener() { private int oldValue; public void widgetDefaultSelected(SelectionEvent e) { @@ -210,7 +210,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen } public void widgetSelected(SelectionEvent e) { - int newValue = zoomSlider.getSelection(); + int newValue = mZoomSlider.getSelection(); if (oldValue != newValue) { PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this); PixelPerfectModel.getModel().setZoom(newValue); @@ -236,10 +236,10 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen Display.getDefault().syncExec(new Runnable() { public void run() { Image overlayImage = PixelPerfectModel.getModel().getOverlayImage(); - overlaySlider.setEnabled(overlayImage != null); + mOverlaySlider.setEnabled(overlayImage != null); if (PixelPerfectModel.getModel().getImage() == null) { } else { - zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom()); + mZoomSlider.setSelection(PixelPerfectModel.getModel().getZoom()); } } }); @@ -249,7 +249,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen Display.getDefault().syncExec(new Runnable() { public void run() { Image overlayImage = PixelPerfectModel.getModel().getOverlayImage(); - overlaySlider.setEnabled(overlayImage != null); + mOverlaySlider.setEnabled(overlayImage != null); } }); } @@ -257,7 +257,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen public void overlayTransparencyChanged() { Display.getDefault().syncExec(new Runnable() { public void run() { - overlaySlider.setSelection((int) (PixelPerfectModel.getModel() + mOverlaySlider.setSelection((int) (PixelPerfectModel.getModel() .getOverlayTransparency() * 100)); } }); @@ -270,7 +270,7 @@ public class PixelPerfectControls extends Composite implements ImageChangeListen public void zoomChanged() { Display.getDefault().syncExec(new Runnable() { public void run() { - zoomSlider.setSelection(PixelPerfectModel.getModel().getZoom()); + mZoomSlider.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 53afc9e..129dc4d 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java @@ -17,7 +17,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -42,72 +42,72 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { - private PixelPerfectModel model; +public class PixelPerfectLoupe extends Canvas implements IImageChangeListener { + private PixelPerfectModel mModel; - private Image image; + private Image mImage; - private Image grid; + private Image mGrid; - private Color crosshairColor; + private Color mCrosshairColor; - private int width; + private int mWidth; - private int height; + private int mHeight; - private Point crosshairLocation; + private Point mCrosshairLocation; - private int zoom; + private int mZoom; - private Transform transform; + private Transform mTransform; - private int canvasWidth; + private int mCanvasWidth; - private int canvasHeight; + private int mCanvasHeight; - private Image overlayImage; + private Image mOverlayImage; - private double overlayTransparency; + private double mOverlayTransparency; - private boolean showOverlay = false; + private boolean mShowOverlay = false; public PixelPerfectLoupe(Composite parent) { super(parent, SWT.NONE); - model = PixelPerfectModel.getModel(); - model.addImageChangeListener(this); + mModel = PixelPerfectModel.getModel(); + mModel.addImageChangeListener(this); - addPaintListener(paintListener); - addMouseListener(mouseListener); - addMouseWheelListener(mouseWheelListener); - addDisposeListener(disposeListener); - addKeyListener(keyListener); + addPaintListener(mPaintListener); + addMouseListener(mMouseListener); + addMouseWheelListener(mMouseWheelListener); + addDisposeListener(mDisposeListener); + addKeyListener(mKeyListener); - crosshairColor = new Color(Display.getDefault(), new RGB(255, 94, 254)); + mCrosshairColor = new Color(Display.getDefault(), new RGB(255, 94, 254)); - transform = new Transform(Display.getDefault()); + mTransform = new Transform(Display.getDefault()); imageLoaded(); } public void setShowOverlay(boolean value) { synchronized (this) { - showOverlay = value; + mShowOverlay = value; } doRedraw(); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeImageChangeListener(PixelPerfectLoupe.this); - crosshairColor.dispose(); - transform.dispose(); - if (grid != null) { - grid.dispose(); + mModel.removeImageChangeListener(PixelPerfectLoupe.this); + mCrosshairColor.dispose(); + mTransform.dispose(); + if (mGrid != null) { + mGrid.dispose(); } } }; - private MouseListener mouseListener = new MouseListener() { + private MouseListener mMouseListener = new MouseListener() { public void mouseDoubleClick(MouseEvent e) { // pass @@ -123,20 +123,20 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { }; - private MouseWheelListener mouseWheelListener = new MouseWheelListener() { + private MouseWheelListener mMouseWheelListener = new MouseWheelListener() { public void mouseScrolled(MouseEvent e) { int newZoom = -1; synchronized (PixelPerfectLoupe.this) { - if (image != null && crosshairLocation != null) { + if (mImage != null && mCrosshairLocation != null) { if (e.count > 0) { - newZoom = zoom + 1; + newZoom = mZoom + 1; } else { - newZoom = zoom - 1; + newZoom = mZoom - 1; } } } if (newZoom != -1) { - model.setZoom(newZoom); + mModel.setZoom(newZoom); } } }; @@ -145,51 +145,51 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { int newX = -1; int newY = -1; synchronized (PixelPerfectLoupe.this) { - if (image == null) { + if (mImage == null) { return; } - int zoomedX = -crosshairLocation.x * zoom - zoom / 2 + getBounds().width / 2; - int zoomedY = -crosshairLocation.y * zoom - zoom / 2 + getBounds().height / 2; - int x = (e.x - zoomedX) / zoom; - int y = (e.y - zoomedY) / zoom; - if (x >= 0 && x < width && y >= 0 && y < height) { + int zoomedX = -mCrosshairLocation.x * mZoom - mZoom / 2 + getBounds().width / 2; + int zoomedY = -mCrosshairLocation.y * mZoom - mZoom / 2 + getBounds().height / 2; + int x = (e.x - zoomedX) / mZoom; + int y = (e.y - zoomedY) / mZoom; + if (x >= 0 && x < mWidth && y >= 0 && y < mHeight) { newX = x; newY = y; } } if (newX != -1) { - model.setCrosshairLocation(newX, newY); + mModel.setCrosshairLocation(newX, newY); } } - private KeyListener keyListener = new KeyListener() { + private KeyListener mKeyListener = new KeyListener() { public void keyPressed(KeyEvent e) { boolean crosshairMoved = false; synchronized (PixelPerfectLoupe.this) { - if (image != null) { + if (mImage != null) { switch (e.keyCode) { case SWT.ARROW_UP: - if (crosshairLocation.y != 0) { - crosshairLocation.y--; + if (mCrosshairLocation.y != 0) { + mCrosshairLocation.y--; crosshairMoved = true; } break; case SWT.ARROW_DOWN: - if (crosshairLocation.y != height - 1) { - crosshairLocation.y++; + if (mCrosshairLocation.y != mHeight - 1) { + mCrosshairLocation.y++; crosshairMoved = true; } break; case SWT.ARROW_LEFT: - if (crosshairLocation.x != 0) { - crosshairLocation.x--; + if (mCrosshairLocation.x != 0) { + mCrosshairLocation.x--; crosshairMoved = true; } break; case SWT.ARROW_RIGHT: - if (crosshairLocation.x != width - 1) { - crosshairLocation.x++; + if (mCrosshairLocation.x != mWidth - 1) { + mCrosshairLocation.x++; crosshairMoved = true; } break; @@ -197,7 +197,7 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { } } if (crosshairMoved) { - model.setCrosshairLocation(crosshairLocation.x, crosshairLocation.y); + mModel.setCrosshairLocation(mCrosshairLocation.x, mCrosshairLocation.y); } } @@ -207,70 +207,69 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { }; - private PaintListener paintListener = new PaintListener() { - @SuppressWarnings("deprecation") + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (PixelPerfectLoupe.this) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); e.gc.fillRectangle(0, 0, getSize().x, getSize().y); - if (image != null && crosshairLocation != null) { - int zoomedX = -crosshairLocation.x * zoom - zoom / 2 + getBounds().width / 2; - int zoomedY = -crosshairLocation.y * zoom - zoom / 2 + getBounds().height / 2; - transform.translate(zoomedX, zoomedY); - transform.scale(zoom, zoom); + if (mImage != null && mCrosshairLocation != null) { + int zoomedX = -mCrosshairLocation.x * mZoom - mZoom / 2 + getBounds().width / 2; + int zoomedY = -mCrosshairLocation.y * mZoom - mZoom / 2 + getBounds().height / 2; + mTransform.translate(zoomedX, zoomedY); + mTransform.scale(mZoom, mZoom); e.gc.setInterpolation(SWT.NONE); - e.gc.setTransform(transform); - e.gc.drawImage(image, 0, 0); - if (showOverlay && overlayImage != null) { - e.gc.setAlpha((int) (overlayTransparency * 255)); - e.gc.drawImage(overlayImage, 0, height - overlayImage.getBounds().height); + e.gc.setTransform(mTransform); + e.gc.drawImage(mImage, 0, 0); + if (mShowOverlay && mOverlayImage != null) { + e.gc.setAlpha((int) (mOverlayTransparency * 255)); + e.gc.drawImage(mOverlayImage, 0, mHeight - mOverlayImage.getBounds().height); e.gc.setAlpha(255); } - transform.identity(); - e.gc.setTransform(transform); + mTransform.identity(); + e.gc.setTransform(mTransform); // If the size of the canvas has changed, we need to make // another grid. - if (grid != null - && (canvasWidth != getBounds().width || canvasHeight != getBounds().height)) { - grid.dispose(); - grid = null; + if (mGrid != null + && (mCanvasWidth != getBounds().width || mCanvasHeight != getBounds().height)) { + mGrid.dispose(); + mGrid = null; } - canvasWidth = getBounds().width; - canvasHeight = getBounds().height; - if (grid == null) { + mCanvasWidth = getBounds().width; + mCanvasHeight = getBounds().height; + if (mGrid == null) { // Make a transparent image; ImageData imageData = - new ImageData(canvasWidth + zoom + 1, canvasHeight + zoom + 1, 1, + new ImageData(mCanvasWidth + mZoom + 1, mCanvasHeight + mZoom + 1, 1, new PaletteData(new RGB[] { new RGB(0, 0, 0) })); imageData.transparentPixel = 0; // Draw the grid. - grid = new Image(Display.getDefault(), imageData); - GC gc = new GC(grid); + mGrid = new Image(Display.getDefault(), imageData); + GC gc = new GC(mGrid); gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); - for (int x = 0; x <= canvasWidth + zoom; x += zoom) { - gc.drawLine(x, 0, x, canvasHeight + zoom); + for (int x = 0; x <= mCanvasWidth + mZoom; x += mZoom) { + gc.drawLine(x, 0, x, mCanvasHeight + mZoom); } - for (int y = 0; y <= canvasHeight + zoom; y += zoom) { - gc.drawLine(0, y, canvasWidth + zoom, y); + for (int y = 0; y <= mCanvasHeight + mZoom; y += mZoom) { + gc.drawLine(0, y, mCanvasWidth + mZoom, y); } gc.dispose(); } - e.gc.setClipping(new Rectangle(zoomedX, zoomedY, width * zoom + 1, height - * zoom + 1)); + e.gc.setClipping(new Rectangle(zoomedX, zoomedY, mWidth * mZoom + 1, mHeight + * mZoom + 1)); e.gc.setAlpha(76); - e.gc.drawImage(grid, (canvasWidth / 2 - zoom / 2) % zoom - zoom, - (canvasHeight / 2 - zoom / 2) % zoom - zoom); + e.gc.drawImage(mGrid, (mCanvasWidth / 2 - mZoom / 2) % mZoom - mZoom, + (mCanvasHeight / 2 - mZoom / 2) % mZoom - mZoom); e.gc.setAlpha(255); - e.gc.setForeground(crosshairColor); - e.gc.drawLine(0, canvasHeight / 2, canvasWidth - 1, canvasHeight / 2); - e.gc.drawLine(canvasWidth / 2, 0, canvasWidth / 2, canvasHeight - 1); + e.gc.setForeground(mCrosshairColor); + e.gc.drawLine(0, mCanvasHeight / 2, mCanvasWidth - 1, mCanvasHeight / 2); + e.gc.drawLine(mCanvasWidth / 2, 0, mCanvasWidth / 2, mCanvasHeight - 1); } } } @@ -285,13 +284,13 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { } private void loadImage() { - image = model.getImage(); - if (image != null) { - width = image.getBounds().width; - height = image.getBounds().height; + mImage = mModel.getImage(); + if (mImage != null) { + mWidth = mImage.getBounds().width; + mHeight = mImage.getBounds().height; } else { - width = 0; - height = 0; + mWidth = 0; + mHeight = 0; } } @@ -301,10 +300,10 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { public void run() { synchronized (this) { loadImage(); - crosshairLocation = model.getCrosshairLocation(); - zoom = model.getZoom(); - overlayImage = model.getOverlayImage(); - overlayTransparency = model.getOverlayTransparency(); + mCrosshairLocation = mModel.getCrosshairLocation(); + mZoom = mModel.getZoom(); + mOverlayImage = mModel.getOverlayImage(); + mOverlayTransparency = mModel.getOverlayTransparency(); } } }); @@ -324,7 +323,7 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { public void crosshairMoved() { synchronized (this) { - crosshairLocation = model.getCrosshairLocation(); + mCrosshairLocation = mModel.getCrosshairLocation(); } doRedraw(); } @@ -341,14 +340,14 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - if (grid != null) { + if (mGrid != null) { // To notify that the zoom level has changed, we get rid // of the // grid. - grid.dispose(); - grid = null; + mGrid.dispose(); + mGrid = null; } - zoom = model.getZoom(); + mZoom = mModel.getZoom(); } } }); @@ -357,15 +356,15 @@ public class PixelPerfectLoupe extends Canvas implements ImageChangeListener { public void overlayChanged() { synchronized (this) { - overlayImage = model.getOverlayImage(); - overlayTransparency = model.getOverlayTransparency(); + mOverlayImage = mModel.getOverlayImage(); + mOverlayTransparency = mModel.getOverlayTransparency(); } doRedraw(); } public void overlayTransparencyChanged() { synchronized (this) { - overlayTransparency = model.getOverlayTransparency(); + mOverlayTransparency = mModel.getOverlayTransparency(); } doRedraw(); } 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 afe3dc8..6680523 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java @@ -17,7 +17,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -32,14 +32,14 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -public class PixelPerfectPixelPanel extends Canvas implements ImageChangeListener { - private PixelPerfectModel model; +public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListener { + private PixelPerfectModel mModel; - private Image image; + private Image mImage; - private Image overlayImage; + private Image mOverlayImage; - private Point crosshairLocation; + private Point mCrosshairLocation; public static final int PREFERRED_WIDTH = 180; @@ -47,11 +47,11 @@ public class PixelPerfectPixelPanel extends Canvas implements ImageChangeListene public PixelPerfectPixelPanel(Composite parent) { super(parent, SWT.NONE); - model = PixelPerfectModel.getModel(); - model.addImageChangeListener(this); + mModel = PixelPerfectModel.getModel(); + mModel.addImageChangeListener(this); - addPaintListener(paintListener); - addDisposeListener(disposeListener); + addPaintListener(mPaintListener); + addDisposeListener(mDisposeListener); imageLoaded(); } @@ -63,21 +63,21 @@ public class PixelPerfectPixelPanel extends Canvas implements ImageChangeListene return new Point(width, height); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeImageChangeListener(PixelPerfectPixelPanel.this); + mModel.removeImageChangeListener(PixelPerfectPixelPanel.this); } }; - private PaintListener paintListener = new PaintListener() { + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (PixelPerfectPixelPanel.this) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); e.gc.fillRectangle(0, 0, getBounds().width, getBounds().height); - if (image != null) { + if (mImage != null) { RGB pixel = - image.getImageData().palette.getRGB(image.getImageData().getPixel( - crosshairLocation.x, crosshairLocation.y)); + mImage.getImageData().palette.getRGB(mImage.getImageData().getPixel( + mCrosshairLocation.x, mCrosshairLocation.y)); Color rgbColor = new Color(Display.getDefault(), pixel); e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); e.gc.setBackground(rgbColor); @@ -97,19 +97,19 @@ public class PixelPerfectPixelPanel extends Canvas implements ImageChangeListene e.gc.drawText(Integer.toString(pixel.blue), 97, 35, true); e.gc.drawText("X:", 132, 4, true); e.gc.drawText("Y:", 132, 20, true); - e.gc.drawText(Integer.toString(crosshairLocation.x) + " px", 149, 4, true); - e.gc.drawText(Integer.toString(crosshairLocation.y) + " px", 149, 20, true); + e.gc.drawText(Integer.toString(mCrosshairLocation.x) + " px", 149, 4, true); + e.gc.drawText(Integer.toString(mCrosshairLocation.y) + " px", 149, 20, true); - if (overlayImage != null) { - int xInOverlay = crosshairLocation.x; + if (mOverlayImage != null) { + int xInOverlay = mCrosshairLocation.x; int yInOverlay = - crosshairLocation.y - - (image.getBounds().height - overlayImage.getBounds().height); + mCrosshairLocation.y + - (mImage.getBounds().height - mOverlayImage.getBounds().height); if (xInOverlay >= 0 && yInOverlay >= 0 - && xInOverlay < overlayImage.getBounds().width - && yInOverlay < overlayImage.getBounds().height) { + && xInOverlay < mOverlayImage.getBounds().width + && yInOverlay < mOverlayImage.getBounds().height) { pixel = - overlayImage.getImageData().palette.getRGB(overlayImage + mOverlayImage.getImageData().palette.getRGB(mOverlayImage .getImageData().getPixel(xInOverlay, yInOverlay)); rgbColor = new Color(Display.getDefault(), pixel); e.gc @@ -146,30 +146,30 @@ public class PixelPerfectPixelPanel extends Canvas implements ImageChangeListene public void crosshairMoved() { synchronized (this) { - crosshairLocation = model.getCrosshairLocation(); + mCrosshairLocation = mModel.getCrosshairLocation(); } doRedraw(); } public void imageChanged() { synchronized (this) { - image = model.getImage(); + mImage = mModel.getImage(); } doRedraw(); } public void imageLoaded() { synchronized (this) { - image = model.getImage(); - crosshairLocation = model.getCrosshairLocation(); - overlayImage = model.getOverlayImage(); + mImage = mModel.getImage(); + mCrosshairLocation = mModel.getCrosshairLocation(); + mOverlayImage = mModel.getOverlayImage(); } doRedraw(); } public void overlayChanged() { synchronized (this) { - overlayImage = model.getOverlayImage(); + mOverlayImage = mModel.getOverlayImage(); } doRedraw(); } 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 d34dcf2..da7cd62 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java @@ -19,7 +19,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.ddmuilib.ImageLoader; import com.android.hierarchyviewerlib.device.ViewNode; import com.android.hierarchyviewerlib.models.PixelPerfectModel; -import com.android.hierarchyviewerlib.models.PixelPerfectModel.ImageChangeListener; +import com.android.hierarchyviewerlib.models.PixelPerfectModel.IImageChangeListener; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -40,17 +40,17 @@ import org.eclipse.swt.widgets.Tree; import java.util.List; -public class PixelPerfectTree extends Composite implements ImageChangeListener, SelectionListener { +public class PixelPerfectTree extends Composite implements IImageChangeListener, SelectionListener { - private TreeViewer treeViewer; + private TreeViewer mTreeViewer; - private Tree tree; + private Tree mTree; - private PixelPerfectModel model; + private PixelPerfectModel mModel; - private Image folderImage; + private Image mFolderImage; - private Image fileImage; + private Image mFileImage; private class ContentProvider implements ITreeContentProvider, ILabelProvider { public Object[] getChildren(Object element) { @@ -99,9 +99,9 @@ public class PixelPerfectTree extends Composite implements ImageChangeListener, public Image getImage(Object element) { if (element instanceof ViewNode) { if (hasChildren(element)) { - return folderImage; + return mFolderImage; } - return fileImage; + return mFileImage; } return null; } @@ -130,47 +130,47 @@ public class PixelPerfectTree extends Composite implements ImageChangeListener, public PixelPerfectTree(Composite parent) { super(parent, SWT.NONE); setLayout(new FillLayout()); - treeViewer = new TreeViewer(this, SWT.SINGLE); - treeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS); + mTreeViewer = new TreeViewer(this, SWT.SINGLE); + mTreeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS); - tree = treeViewer.getTree(); - tree.addSelectionListener(this); + mTree = mTreeViewer.getTree(); + mTree.addSelectionListener(this); loadResources(); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); - model = PixelPerfectModel.getModel(); + mModel = PixelPerfectModel.getModel(); ContentProvider contentProvider = new ContentProvider(); - treeViewer.setContentProvider(contentProvider); - treeViewer.setLabelProvider(contentProvider); - treeViewer.setInput(model); - model.addImageChangeListener(this); + mTreeViewer.setContentProvider(contentProvider); + mTreeViewer.setLabelProvider(contentProvider); + mTreeViewer.setInput(mModel); + mModel.addImageChangeListener(this); } private void loadResources() { ImageLoader loader = ImageLoader.getDdmUiLibLoader(); - fileImage = loader.loadImage("file.png", Display.getDefault()); - folderImage = loader.loadImage("folder.png", Display.getDefault()); + mFileImage = loader.loadImage("file.png", Display.getDefault()); + mFolderImage = loader.loadImage("folder.png", Display.getDefault()); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeImageChangeListener(PixelPerfectTree.this); + mModel.removeImageChangeListener(PixelPerfectTree.this); } }; @Override public boolean setFocus() { - return tree.setFocus(); + return mTree.setFocus(); } public void imageLoaded() { Display.getDefault().syncExec(new Runnable() { public void run() { - treeViewer.refresh(); - treeViewer.expandAll(); + mTreeViewer.refresh(); + mTreeViewer.expandAll(); } }); } @@ -197,10 +197,10 @@ public class PixelPerfectTree extends Composite implements ImageChangeListener, public void widgetSelected(SelectionEvent e) { // To combat phantom selection... - if (((TreeSelection) treeViewer.getSelection()).isEmpty()) { - model.setSelected(null); + if (((TreeSelection) mTreeViewer.getSelection()).isEmpty()) { + mModel.setSelected(null); } else { - model.setSelected((ViewNode) e.item.getData()); + mModel.setSelected((ViewNode) e.item.getData()); } } 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 14068a3..4396a1f 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java @@ -19,7 +19,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.device.ViewNode; import com.android.hierarchyviewerlib.device.ViewNode.Property; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode; import com.android.hierarchyviewerlib.ui.util.TreeColumnResizer; @@ -45,25 +45,25 @@ import org.eclipse.swt.widgets.TreeColumn; import java.util.ArrayList; -public class PropertyViewer extends Composite implements TreeChangeListener { - private TreeViewModel model; +public class PropertyViewer extends Composite implements ITreeChangeListener { + private TreeViewModel mModel; - private TreeViewer treeViewer; + private TreeViewer mTreeViewer; - private Tree tree; + private Tree mTree; - private DrawableViewNode selectedNode; + private DrawableViewNode mSelectedNode; - private Font smallFont; + private Font mSmallFont; private class ContentProvider implements ITreeContentProvider, ITableLabelProvider { public Object[] getChildren(Object parentElement) { synchronized (PropertyViewer.this) { - if (selectedNode != null && parentElement instanceof String) { + if (mSelectedNode != null && parentElement instanceof String) { String category = (String) parentElement; ArrayList<Property> returnValue = new ArrayList<Property>(); - for (Property property : selectedNode.viewNode.properties) { + for (Property property : mSelectedNode.viewNode.properties) { if (category.equals(ViewNode.MISCELLANIOUS)) { if (property.name.indexOf(':') == -1) { returnValue.add(property); @@ -82,8 +82,8 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public Object getParent(Object element) { synchronized (PropertyViewer.this) { - if (selectedNode != null && element instanceof Property) { - if (selectedNode.viewNode.categories.size() == 0) { + if (mSelectedNode != null && element instanceof Property) { + if (mSelectedNode.viewNode.categories.size() == 0) { return null; } String name = ((Property) element).name; @@ -99,9 +99,9 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public boolean hasChildren(Object element) { synchronized (PropertyViewer.this) { - if (selectedNode != null && element instanceof String) { + if (mSelectedNode != null && element instanceof String) { String category = (String) element; - for (String name : selectedNode.viewNode.namedProperties.keySet()) { + for (String name : mSelectedNode.viewNode.namedProperties.keySet()) { if (category.equals(ViewNode.MISCELLANIOUS)) { if (name.indexOf(':') == -1) { return true; @@ -119,13 +119,13 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public Object[] getElements(Object inputElement) { synchronized (PropertyViewer.this) { - if (selectedNode != null && inputElement instanceof TreeViewModel) { - if (selectedNode.viewNode.categories.size() == 0) { - return selectedNode.viewNode.properties - .toArray(new Property[selectedNode.viewNode.properties.size()]); + if (mSelectedNode != null && inputElement instanceof TreeViewModel) { + if (mSelectedNode.viewNode.categories.size() == 0) { + return mSelectedNode.viewNode.properties + .toArray(new Property[mSelectedNode.viewNode.properties.size()]); } else { - return selectedNode.viewNode.categories - .toArray(new String[selectedNode.viewNode.categories.size()]); + return mSelectedNode.viewNode.categories + .toArray(new String[mSelectedNode.viewNode.categories.size()]); } } return new Object[0]; @@ -146,7 +146,7 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public String getColumnText(Object element, int column) { synchronized (PropertyViewer.this) { - if (selectedNode != null) { + if (mSelectedNode != null) { if (element instanceof String && column == 0) { String category = (String) element; return Character.toUpperCase(category.charAt(0)) + category.substring(1); @@ -184,32 +184,32 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public PropertyViewer(Composite parent) { super(parent, SWT.NONE); setLayout(new FillLayout()); - treeViewer = new TreeViewer(this, SWT.NONE); + mTreeViewer = new TreeViewer(this, SWT.NONE); - tree = treeViewer.getTree(); - tree.setLinesVisible(true); - tree.setHeaderVisible(true); + mTree = mTreeViewer.getTree(); + mTree.setLinesVisible(true); + mTree.setHeaderVisible(true); - TreeColumn propertyColumn = new TreeColumn(tree, SWT.NONE); + TreeColumn propertyColumn = new TreeColumn(mTree, SWT.NONE); propertyColumn.setText("Property"); - TreeColumn valueColumn = new TreeColumn(tree, SWT.NONE); + TreeColumn valueColumn = new TreeColumn(mTree, SWT.NONE); valueColumn.setText("Value"); - model = TreeViewModel.getModel(); + mModel = TreeViewModel.getModel(); ContentProvider contentProvider = new ContentProvider(); - treeViewer.setContentProvider(contentProvider); - treeViewer.setLabelProvider(contentProvider); - treeViewer.setInput(model); - model.addTreeChangeListener(this); + mTreeViewer.setContentProvider(contentProvider); + mTreeViewer.setLabelProvider(contentProvider); + mTreeViewer.setInput(mModel); + mModel.addTreeChangeListener(this); loadResources(); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); - tree.setFont(smallFont); + mTree.setFont(mSmallFont); new TreeColumnResizer(this, propertyColumn, valueColumn); - addControlListener(controlListener); + addControlListener(mControlListener); treeChanged(); } @@ -222,20 +222,20 @@ public class PropertyViewer extends Composite implements TreeChangeListener { for (int i = 0; i < fontData.length; i++) { newFontData[i] = new FontData(fontData[i].getName(), 8, fontData[i].getStyle()); } - smallFont = new Font(Display.getDefault(), newFontData); + mSmallFont = new Font(Display.getDefault(), newFontData); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeTreeChangeListener(PropertyViewer.this); - smallFont.dispose(); + mModel.removeTreeChangeListener(PropertyViewer.this); + mSmallFont.dispose(); } }; // If the window gets too small, hide the data, otherwise SWT throws an // ERROR. - private ControlListener controlListener = new ControlAdapter() { + private ControlListener mControlListener = new ControlAdapter() { private boolean noInput = false; private boolean noHeader = false; @@ -243,17 +243,17 @@ public class PropertyViewer extends Composite implements TreeChangeListener { @Override public void controlResized(ControlEvent e) { if (getBounds().height <= 20) { - tree.setHeaderVisible(false); + mTree.setHeaderVisible(false); noHeader = true; } else if (noHeader) { - tree.setHeaderVisible(true); + mTree.setHeaderVisible(true); noHeader = false; } if (getBounds().height <= 38) { - treeViewer.setInput(null); + mTreeViewer.setInput(null); noInput = true; } else if (noInput) { - treeViewer.setInput(model); + mTreeViewer.setInput(mModel); noInput = false; } } @@ -261,14 +261,14 @@ public class PropertyViewer extends Composite implements TreeChangeListener { public void selectionChanged() { synchronized (this) { - selectedNode = model.getSelection(); + mSelectedNode = mModel.getSelection(); } doRefresh(); } public void treeChanged() { synchronized (this) { - selectedNode = model.getSelection(); + mSelectedNode = mModel.getSelection(); } doRefresh(); } @@ -284,7 +284,7 @@ public class PropertyViewer extends Composite implements TreeChangeListener { private void doRefresh() { Display.getDefault().syncExec(new Runnable() { public void run() { - treeViewer.refresh(); + mTreeViewer.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 ea53ee4..3b90629 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java @@ -16,12 +16,11 @@ 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; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode.Point; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode.Rectangle; @@ -53,67 +52,67 @@ import org.eclipse.swt.widgets.Listener; import java.text.DecimalFormat; -public class TreeView extends Canvas implements TreeChangeListener { +public class TreeView extends Canvas implements ITreeChangeListener { - private TreeViewModel model; + private TreeViewModel mModel; - private DrawableViewNode tree; + private DrawableViewNode mTree; - private DrawableViewNode selectedNode; + private DrawableViewNode mSelectedNode; - private Rectangle viewport; + private Rectangle mViewport; - private Transform transform; + private Transform mTransform; - private Transform inverse; + private Transform mInverse; - private double zoom; + private double mZoom; - private Point lastPoint; + private Point mLastPoint; - private boolean alreadySelectedOnMouseDown; + private boolean mAlreadySelectedOnMouseDown; - private boolean doubleClicked; + private boolean mDoubleClicked; - private boolean nodeMoved; + private boolean mNodeMoved; - private DrawableViewNode draggedNode; + private DrawableViewNode mDraggedNode; public static final int LINE_PADDING = 10; public static final float BEZIER_FRACTION = 0.35f; - private static Image redImage; + private static Image sRedImage; - private static Image yellowImage; + private static Image sYellowImage; - private static Image greenImage; + private static Image sGreenImage; - private static Image notSelectedImage; + private static Image sNotSelectedImage; - private static Image selectedImage; + private static Image sSelectedImage; - private static Image filteredImage; + private static Image sFilteredImage; - private static Image filteredSelectedImage; + private static Image sFilteredSelectedImage; - private static Font systemFont; + private static Font sSystemFont; - private Color boxColor; + private Color mBoxColor; - private Color textBackgroundColor; + private Color mTextBackgroundColor; - private Rectangle selectedRectangleLocation; + private Rectangle mSelectedRectangleLocation; - private Point buttonCenter; + private Point mButtonCenter; private static final int BUTTON_SIZE = 13; - private Image scaledSelectedImage; + private Image mScaledSelectedImage; - private boolean buttonClicked; + private boolean mButtonClicked; - private DrawableViewNode lastDrawnSelectedViewNode; + private DrawableViewNode mLastDrawnSelectedViewNode; // The profile-image box needs to be moved to, // so add some dragging leeway. @@ -149,87 +148,87 @@ public class TreeView extends Canvas implements TreeChangeListener { public TreeView(Composite parent) { super(parent, SWT.NONE); - model = TreeViewModel.getModel(); - model.addTreeChangeListener(this); + mModel = TreeViewModel.getModel(); + mModel.addTreeChangeListener(this); - addPaintListener(paintListener); - addMouseListener(mouseListener); - addMouseMoveListener(mouseMoveListener); - addMouseWheelListener(mouseWheelListener); - addListener(SWT.Resize, resizeListener); - addDisposeListener(disposeListener); - addKeyListener(keyListener); + addPaintListener(mPaintListener); + addMouseListener(mMouseListener); + addMouseMoveListener(mMouseMoveListener); + addMouseWheelListener(mMouseWheelListener); + addListener(SWT.Resize, mResizeListener); + addDisposeListener(mDisposeListener); + addKeyListener(mKeyListener); loadResources(); - transform = new Transform(Display.getDefault()); - inverse = new Transform(Display.getDefault()); + mTransform = new Transform(Display.getDefault()); + mInverse = new Transform(Display.getDefault()); loadAllData(); } private void loadResources() { ImageLoader loader = ImageLoader.getLoader(this.getClass()); - redImage = loader.loadImage("red.png", Display.getDefault()); - yellowImage = loader.loadImage("yellow.png", Display.getDefault()); - greenImage = loader.loadImage("green.png", Display.getDefault()); - notSelectedImage = loader.loadImage("not-selected.png", Display.getDefault()); - selectedImage = loader.loadImage("selected.png", Display.getDefault()); - filteredImage = loader.loadImage("filtered.png", Display.getDefault()); - filteredSelectedImage = loader.loadImage("selected-filtered.png", Display.getDefault()); - boxColor = new Color(Display.getDefault(), new RGB(225, 225, 225)); - textBackgroundColor = new Color(Display.getDefault(), new RGB(82, 82, 82)); - if (scaledSelectedImage != null) { - scaledSelectedImage.dispose(); + sRedImage = loader.loadImage("red.png", Display.getDefault()); //$NON-NLS-1$ + sYellowImage = loader.loadImage("yellow.png", Display.getDefault()); //$NON-NLS-1$ + sGreenImage = loader.loadImage("green.png", Display.getDefault()); //$NON-NLS-1$ + sNotSelectedImage = loader.loadImage("not-selected.png", Display.getDefault()); //$NON-NLS-1$ + sSelectedImage = loader.loadImage("selected.png", Display.getDefault()); //$NON-NLS-1$ + sFilteredImage = loader.loadImage("filtered.png", Display.getDefault()); //$NON-NLS-1$ + sFilteredSelectedImage = loader.loadImage("selected-filtered.png", Display.getDefault()); //$NON-NLS-1$ + mBoxColor = new Color(Display.getDefault(), new RGB(225, 225, 225)); + mTextBackgroundColor = new Color(Display.getDefault(), new RGB(82, 82, 82)); + if (mScaledSelectedImage != null) { + mScaledSelectedImage.dispose(); } - systemFont = Display.getDefault().getSystemFont(); + sSystemFont = Display.getDefault().getSystemFont(); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeTreeChangeListener(TreeView.this); - transform.dispose(); - inverse.dispose(); - boxColor.dispose(); - textBackgroundColor.dispose(); - if (tree != null) { - model.setViewport(null); + mModel.removeTreeChangeListener(TreeView.this); + mTransform.dispose(); + mInverse.dispose(); + mBoxColor.dispose(); + mTextBackgroundColor.dispose(); + if (mTree != null) { + mModel.setViewport(null); } } }; - private Listener resizeListener = new Listener() { + private Listener mResizeListener = new Listener() { public void handleEvent(Event e) { synchronized (TreeView.this) { - if (tree != null && viewport != null) { + if (mTree != null && mViewport != null) { // Keep the center in the same place. Point viewCenter = - new Point(viewport.x + viewport.width / 2, viewport.y + viewport.height + new Point(mViewport.x + mViewport.width / 2, mViewport.y + mViewport.height / 2); - viewport.width = getBounds().width / zoom; - viewport.height = getBounds().height / zoom; - viewport.x = viewCenter.x - viewport.width / 2; - viewport.y = viewCenter.y - viewport.height / 2; + mViewport.width = getBounds().width / mZoom; + mViewport.height = getBounds().height / mZoom; + mViewport.x = viewCenter.x - mViewport.width / 2; + mViewport.y = viewCenter.y - mViewport.height / 2; } } - if (viewport != null) { - model.setViewport(viewport); + if (mViewport != null) { + mModel.setViewport(mViewport); } } }; - private KeyListener keyListener = new KeyListener() { + private KeyListener mKeyListener = new KeyListener() { public void keyPressed(KeyEvent e) { boolean selectionChanged = false; DrawableViewNode clickedNode = null; synchronized (TreeView.this) { - if (tree != null && viewport != null && selectedNode != null) { + if (mTree != null && mViewport != null && mSelectedNode != null) { switch (e.keyCode) { case SWT.ARROW_LEFT: - if (selectedNode.parent != null) { - selectedNode = selectedNode.parent; + if (mSelectedNode.parent != null) { + mSelectedNode = mSelectedNode.parent; selectionChanged = true; } break; @@ -238,7 +237,7 @@ public class TreeView extends Canvas implements TreeChangeListener { // On up and down, it is cool to go up and down only // the leaf nodes. // It goes well with the layout viewer - DrawableViewNode currentNode = selectedNode; + DrawableViewNode currentNode = mSelectedNode; while (currentNode.parent != null && currentNode.viewNode.index == 0) { currentNode = currentNode.parent; } @@ -254,11 +253,11 @@ public class TreeView extends Canvas implements TreeChangeListener { } } if (selectionChanged) { - selectedNode = currentNode; + mSelectedNode = currentNode; } break; case SWT.ARROW_DOWN: - currentNode = selectedNode; + currentNode = mSelectedNode; while (currentNode.parent != null && currentNode.viewNode.index + 1 == currentNode.parent.children .size()) { @@ -274,45 +273,45 @@ public class TreeView extends Canvas implements TreeChangeListener { } } if (selectionChanged) { - selectedNode = currentNode; + mSelectedNode = currentNode; } break; case SWT.ARROW_RIGHT: DrawableViewNode rightNode = null; double mostOverlap = 0; - final int N = selectedNode.children.size(); + final int N = mSelectedNode.children.size(); // We consider all the children and pick the one // who's tree overlaps the most. for (int i = 0; i < N; i++) { - DrawableViewNode child = selectedNode.children.get(i); + DrawableViewNode child = mSelectedNode.children.get(i); DrawableViewNode topMostChild = child; while (topMostChild.children.size() != 0) { topMostChild = topMostChild.children.get(0); } double overlap = Math.min(DrawableViewNode.NODE_HEIGHT, Math.min( - selectedNode.top + DrawableViewNode.NODE_HEIGHT + mSelectedNode.top + DrawableViewNode.NODE_HEIGHT - topMostChild.top, topMostChild.top - + child.treeHeight - selectedNode.top)); + + child.treeHeight - mSelectedNode.top)); if (overlap > mostOverlap) { mostOverlap = overlap; rightNode = child; } } if (rightNode != null) { - selectedNode = rightNode; + mSelectedNode = rightNode; selectionChanged = true; } break; case SWT.CR: - clickedNode = selectedNode; + clickedNode = mSelectedNode; break; } } } if (selectionChanged) { - model.setSelection(selectedNode); + mModel.setSelection(mSelectedNode); } if (clickedNode != null) { HierarchyViewerDirector.getDirector().showCapture(getShell(), clickedNode.viewNode); @@ -323,71 +322,72 @@ public class TreeView extends Canvas implements TreeChangeListener { } }; - private MouseListener mouseListener = new MouseListener() { + private MouseListener mMouseListener = new MouseListener() { public void mouseDoubleClick(MouseEvent e) { DrawableViewNode clickedNode = null; synchronized (TreeView.this) { - if (tree != null && viewport != null) { + if (mTree != null && mViewport != null) { Point pt = transformPoint(e.x, e.y); - clickedNode = tree.getSelected(pt.x, pt.y); + clickedNode = mTree.getSelected(pt.x, pt.y); } } if (clickedNode != null) { HierarchyViewerDirector.getDirector().showCapture(getShell(), clickedNode.viewNode); - doubleClicked = true; + mDoubleClicked = true; } } public void mouseDown(MouseEvent e) { boolean selectionChanged = false; synchronized (TreeView.this) { - if (tree != null && viewport != null) { + if (mTree != null && mViewport != null) { Point pt = transformPoint(e.x, e.y); // Ignore profiling rectangle, except for... - if (selectedRectangleLocation != null - && pt.x >= selectedRectangleLocation.x - && pt.x < selectedRectangleLocation.x + selectedRectangleLocation.width - && pt.y >= selectedRectangleLocation.y - && pt.y < selectedRectangleLocation.y - + selectedRectangleLocation.height) { + if (mSelectedRectangleLocation != null + && pt.x >= mSelectedRectangleLocation.x + && pt.x < mSelectedRectangleLocation.x + + mSelectedRectangleLocation.width + && pt.y >= mSelectedRectangleLocation.y + && pt.y < mSelectedRectangleLocation.y + + mSelectedRectangleLocation.height) { // the small button! - if ((pt.x - buttonCenter.x) * (pt.x - buttonCenter.x) - + (pt.y - buttonCenter.y) * (pt.y - buttonCenter.y) <= (BUTTON_SIZE * BUTTON_SIZE) / 4) { - buttonClicked = true; + if ((pt.x - mButtonCenter.x) * (pt.x - mButtonCenter.x) + + (pt.y - mButtonCenter.y) * (pt.y - mButtonCenter.y) <= (BUTTON_SIZE * BUTTON_SIZE) / 4) { + mButtonClicked = true; doRedraw(); } return; } - draggedNode = tree.getSelected(pt.x, pt.y); + mDraggedNode = mTree.getSelected(pt.x, pt.y); // Update the selection. - if (draggedNode != null && draggedNode != selectedNode) { - selectedNode = draggedNode; + if (mDraggedNode != null && mDraggedNode != mSelectedNode) { + mSelectedNode = mDraggedNode; selectionChanged = true; - alreadySelectedOnMouseDown = false; - } else if (draggedNode != null) { - alreadySelectedOnMouseDown = true; + mAlreadySelectedOnMouseDown = false; + } else if (mDraggedNode != null) { + mAlreadySelectedOnMouseDown = true; } // Can't drag the root. - if (draggedNode == tree) { - draggedNode = null; + if (mDraggedNode == mTree) { + mDraggedNode = null; } - if (draggedNode != null) { - lastPoint = pt; + if (mDraggedNode != null) { + mLastPoint = pt; } else { - lastPoint = new Point(e.x, e.y); + mLastPoint = new Point(e.x, e.y); } - nodeMoved = false; - doubleClicked = false; + mNodeMoved = false; + mDoubleClicked = false; } } if (selectionChanged) { - model.setSelection(selectedNode); + mModel.setSelection(mSelectedNode); } } @@ -397,8 +397,8 @@ public class TreeView extends Canvas implements TreeChangeListener { boolean viewportChanged = false; boolean selectionChanged = false; synchronized (TreeView.this) { - if (tree != null && viewport != null && lastPoint != null) { - if (draggedNode == null) { + if (mTree != null && mViewport != null && mLastPoint != null) { + if (mDraggedNode == null) { // The viewport moves. handleMouseDrag(new Point(e.x, e.y)); viewportChanged = true; @@ -412,36 +412,36 @@ public class TreeView extends Canvas implements TreeChangeListener { // double click event. // During a double click, we don't want to deselect. Point pt = transformPoint(e.x, e.y); - DrawableViewNode mouseUpOn = tree.getSelected(pt.x, pt.y); - if (mouseUpOn != null && mouseUpOn == selectedNode - && alreadySelectedOnMouseDown && !nodeMoved && !doubleClicked) { - selectedNode = null; + DrawableViewNode mouseUpOn = mTree.getSelected(pt.x, pt.y); + if (mouseUpOn != null && mouseUpOn == mSelectedNode + && mAlreadySelectedOnMouseDown && !mNodeMoved && !mDoubleClicked) { + mSelectedNode = null; selectionChanged = true; } - lastPoint = null; - draggedNode = null; + mLastPoint = null; + mDraggedNode = null; redraw = true; } // Just clicked the button here. - if (buttonClicked) { + if (mButtonClicked) { HierarchyViewerDirector.getDirector().showCapture(getShell(), - selectedNode.viewNode); - buttonClicked = false; + mSelectedNode.viewNode); + mButtonClicked = false; redrawButton = true; } } // Complicated. if (viewportChanged) { - model.setViewport(viewport); + mModel.setViewport(mViewport); } else if (redraw) { - model.removeTreeChangeListener(TreeView.this); - model.notifyViewportChanged(); + mModel.removeTreeChangeListener(TreeView.this); + mModel.notifyViewportChanged(); if (selectionChanged) { - model.setSelection(selectedNode); + mModel.setSelection(mSelectedNode); } - model.addTreeChangeListener(TreeView.this); + mModel.addTreeChangeListener(TreeView.this); doRedraw(); } else if (redrawButton) { doRedraw(); @@ -450,13 +450,13 @@ public class TreeView extends Canvas implements TreeChangeListener { }; - private MouseMoveListener mouseMoveListener = new MouseMoveListener() { + private MouseMoveListener mMouseMoveListener = new MouseMoveListener() { public void mouseMove(MouseEvent e) { boolean redraw = false; boolean viewportChanged = false; synchronized (TreeView.this) { - if (tree != null && viewport != null && lastPoint != null) { - if (draggedNode == null) { + if (mTree != null && mViewport != null && mLastPoint != null) { + if (mDraggedNode == null) { handleMouseDrag(new Point(e.x, e.y)); viewportChanged = true; } else { @@ -466,11 +466,11 @@ public class TreeView extends Canvas implements TreeChangeListener { } } if (viewportChanged) { - model.setViewport(viewport); + mModel.setViewport(mViewport); } else if (redraw) { - model.removeTreeChangeListener(TreeView.this); - model.notifyViewportChanged(); - model.addTreeChangeListener(TreeView.this); + mModel.removeTreeChangeListener(TreeView.this); + mModel.notifyViewportChanged(); + mModel.addTreeChangeListener(TreeView.this); doRedraw(); } } @@ -479,102 +479,102 @@ public class TreeView extends Canvas implements TreeChangeListener { private void handleMouseDrag(Point pt) { // Case 1: a node is dragged. DrawableViewNode knows how to handle this. - if (draggedNode != null) { - if (lastPoint.y - pt.y != 0) { - nodeMoved = true; + if (mDraggedNode != null) { + if (mLastPoint.y - pt.y != 0) { + mNodeMoved = true; } - draggedNode.move(lastPoint.y - pt.y); - lastPoint = pt; + mDraggedNode.move(mLastPoint.y - pt.y); + mLastPoint = pt; return; } // Case 2: the viewport is dragged. We have to make sure we respect the // bounds - don't let the user drag way out... + some leeway for the // profiling box. - double xDif = (lastPoint.x - pt.x) / zoom; - double yDif = (lastPoint.y - pt.y) / zoom; - - double treeX = tree.bounds.x - DRAG_LEEWAY; - double treeY = tree.bounds.y - DRAG_LEEWAY; - double treeWidth = tree.bounds.width + 2 * DRAG_LEEWAY; - double treeHeight = tree.bounds.height + 2 * DRAG_LEEWAY; - - if (viewport.width > treeWidth) { - if (xDif < 0 && viewport.x + viewport.width > treeX + treeWidth) { - viewport.x = Math.max(viewport.x + xDif, treeX + treeWidth - viewport.width); - } else if (xDif > 0 && viewport.x < treeX) { - viewport.x = Math.min(viewport.x + xDif, treeX); + double xDif = (mLastPoint.x - pt.x) / mZoom; + double yDif = (mLastPoint.y - pt.y) / mZoom; + + double treeX = mTree.bounds.x - DRAG_LEEWAY; + double treeY = mTree.bounds.y - DRAG_LEEWAY; + double treeWidth = mTree.bounds.width + 2 * DRAG_LEEWAY; + double treeHeight = mTree.bounds.height + 2 * DRAG_LEEWAY; + + if (mViewport.width > treeWidth) { + if (xDif < 0 && mViewport.x + mViewport.width > treeX + treeWidth) { + mViewport.x = Math.max(mViewport.x + xDif, treeX + treeWidth - mViewport.width); + } else if (xDif > 0 && mViewport.x < treeX) { + mViewport.x = Math.min(mViewport.x + xDif, treeX); } } else { - if (xDif < 0 && viewport.x > treeX) { - viewport.x = Math.max(viewport.x + xDif, treeX); - } else if (xDif > 0 && viewport.x + viewport.width < treeX + treeWidth) { - viewport.x = Math.min(viewport.x + xDif, treeX + treeWidth - viewport.width); + if (xDif < 0 && mViewport.x > treeX) { + mViewport.x = Math.max(mViewport.x + xDif, treeX); + } else if (xDif > 0 && mViewport.x + mViewport.width < treeX + treeWidth) { + mViewport.x = Math.min(mViewport.x + xDif, treeX + treeWidth - mViewport.width); } } - if (viewport.height > treeHeight) { - if (yDif < 0 && viewport.y + viewport.height > treeY + treeHeight) { - viewport.y = Math.max(viewport.y + yDif, treeY + treeHeight - viewport.height); - } else if (yDif > 0 && viewport.y < treeY) { - viewport.y = Math.min(viewport.y + yDif, treeY); + if (mViewport.height > treeHeight) { + if (yDif < 0 && mViewport.y + mViewport.height > treeY + treeHeight) { + mViewport.y = Math.max(mViewport.y + yDif, treeY + treeHeight - mViewport.height); + } else if (yDif > 0 && mViewport.y < treeY) { + mViewport.y = Math.min(mViewport.y + yDif, treeY); } } else { - if (yDif < 0 && viewport.y > treeY) { - viewport.y = Math.max(viewport.y + yDif, treeY); - } else if (yDif > 0 && viewport.y + viewport.height < treeY + treeHeight) { - viewport.y = Math.min(viewport.y + yDif, treeY + treeHeight - viewport.height); + if (yDif < 0 && mViewport.y > treeY) { + mViewport.y = Math.max(mViewport.y + yDif, treeY); + } else if (yDif > 0 && mViewport.y + mViewport.height < treeY + treeHeight) { + mViewport.y = Math.min(mViewport.y + yDif, treeY + treeHeight - mViewport.height); } } - lastPoint = pt; + mLastPoint = pt; } private Point transformPoint(double x, double y) { float[] pt = { (float) x, (float) y }; - inverse.transform(pt); + mInverse.transform(pt); return new Point(pt[0], pt[1]); } - private MouseWheelListener mouseWheelListener = new MouseWheelListener() { + private MouseWheelListener mMouseWheelListener = new MouseWheelListener() { public void mouseScrolled(MouseEvent e) { Point zoomPoint = null; synchronized (TreeView.this) { - if (tree != null && viewport != null) { - zoom += Math.ceil(e.count / 3.0) * 0.1; + if (mTree != null && mViewport != null) { + mZoom += Math.ceil(e.count / 3.0) * 0.1; zoomPoint = transformPoint(e.x, e.y); } } if (zoomPoint != null) { - model.zoomOnPoint(zoom, zoomPoint); + mModel.zoomOnPoint(mZoom, zoomPoint); } } }; - private PaintListener paintListener = new PaintListener() { + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (TreeView.this) { e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK)); e.gc.fillRectangle(0, 0, getBounds().width, getBounds().height); - if (tree != null && viewport != null) { + if (mTree != null && mViewport != null) { // Easy stuff! - e.gc.setTransform(transform); + e.gc.setTransform(mTransform); e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); Path connectionPath = new Path(Display.getDefault()); - paintRecursive(e.gc, transform, tree, selectedNode, connectionPath); + paintRecursive(e.gc, mTransform, mTree, mSelectedNode, connectionPath); e.gc.drawPath(connectionPath); connectionPath.dispose(); // Draw the profiling box. - if (selectedNode != null) { + if (mSelectedNode != null) { e.gc.setAlpha(200); // Draw the little triangle - int x = selectedNode.left + DrawableViewNode.NODE_WIDTH / 2; - int y = (int) selectedNode.top + 4; - e.gc.setBackground(boxColor); + int x = mSelectedNode.left + DrawableViewNode.NODE_WIDTH / 2; + int y = (int) mSelectedNode.top + 4; + e.gc.setBackground(mBoxColor); e.gc.fillPolygon(new int[] { x, y, x - 11, y - 11, x + 11, y - 11 }); @@ -583,22 +583,22 @@ public class TreeView extends Canvas implements TreeChangeListener { y -= 10 + RECT_HEIGHT; e.gc.fillRoundRectangle(x - RECT_WIDTH / 2, y, RECT_WIDTH, RECT_HEIGHT, 30, 30); - selectedRectangleLocation = + mSelectedRectangleLocation = new Rectangle(x - RECT_WIDTH / 2, y, RECT_WIDTH, RECT_HEIGHT); e.gc.setAlpha(255); // Draw the button - buttonCenter = + mButtonCenter = new Point(x - BUTTON_RIGHT_OFFSET + (RECT_WIDTH - BUTTON_SIZE) / 2, y + BUTTON_TOP_OFFSET + BUTTON_SIZE / 2); - if (buttonClicked) { + if (mButtonClicked) { e.gc .setBackground(Display.getDefault().getSystemColor( SWT.COLOR_BLACK)); } else { - e.gc.setBackground(textBackgroundColor); + e.gc.setBackground(mTextBackgroundColor); } e.gc.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE)); @@ -614,36 +614,36 @@ public class TreeView extends Canvas implements TreeChangeListener { y += 15; // If there is an image, draw it. - if (selectedNode.viewNode.image != null - && selectedNode.viewNode.image.getBounds().height != 1 - && selectedNode.viewNode.image.getBounds().width != 1) { + if (mSelectedNode.viewNode.image != null + && mSelectedNode.viewNode.image.getBounds().height != 1 + && mSelectedNode.viewNode.image.getBounds().width != 1) { // Scaling the image to the right size takes lots of // time, so we want to do it only once. // If the selection changed, get rid of the old // image. - if (lastDrawnSelectedViewNode != selectedNode) { - if (scaledSelectedImage != null) { - scaledSelectedImage.dispose(); - scaledSelectedImage = null; + if (mLastDrawnSelectedViewNode != mSelectedNode) { + if (mScaledSelectedImage != null) { + mScaledSelectedImage.dispose(); + mScaledSelectedImage = null; } - lastDrawnSelectedViewNode = selectedNode; + mLastDrawnSelectedViewNode = mSelectedNode; } - if (scaledSelectedImage == null) { + if (mScaledSelectedImage == null) { double ratio = - 1.0 * selectedNode.viewNode.image.getBounds().width - / selectedNode.viewNode.image.getBounds().height; + 1.0 * mSelectedNode.viewNode.image.getBounds().width + / mSelectedNode.viewNode.image.getBounds().height; int newWidth, newHeight; if (ratio > 1.0 * IMAGE_WIDTH / IMAGE_HEIGHT) { newWidth = - Math.min(IMAGE_WIDTH, selectedNode.viewNode.image + Math.min(IMAGE_WIDTH, mSelectedNode.viewNode.image .getBounds().width); newHeight = (int) (newWidth / ratio); } else { newHeight = - Math.min(IMAGE_HEIGHT, selectedNode.viewNode.image + Math.min(IMAGE_HEIGHT, mSelectedNode.viewNode.image .getBounds().height); newWidth = (int) (newHeight * ratio); } @@ -653,33 +653,34 @@ public class TreeView extends Canvas implements TreeChangeListener { // resolution under zoom. newWidth = Math.max(newWidth * 2, 1); newHeight = Math.max(newHeight * 2, 1); - scaledSelectedImage = + mScaledSelectedImage = new Image(Display.getDefault(), newWidth, newHeight); - GC gc = new GC(scaledSelectedImage); - gc.setBackground(textBackgroundColor); + GC gc = new GC(mScaledSelectedImage); + gc.setBackground(mTextBackgroundColor); gc.fillRectangle(0, 0, newWidth, newHeight); - gc.drawImage(selectedNode.viewNode.image, 0, 0, - selectedNode.viewNode.image.getBounds().width, - selectedNode.viewNode.image.getBounds().height, 0, 0, + gc.drawImage(mSelectedNode.viewNode.image, 0, 0, + mSelectedNode.viewNode.image.getBounds().width, + mSelectedNode.viewNode.image.getBounds().height, 0, 0, newWidth, newHeight); gc.dispose(); } // Draw the background rectangle - e.gc.setBackground(textBackgroundColor); - e.gc.fillRoundRectangle(x - scaledSelectedImage.getBounds().width / 4 + e.gc.setBackground(mTextBackgroundColor); + e.gc.fillRoundRectangle(x - mScaledSelectedImage.getBounds().width / 4 - IMAGE_OFFSET, y - + (IMAGE_HEIGHT - scaledSelectedImage.getBounds().height / 2) - / 2 - IMAGE_OFFSET, scaledSelectedImage.getBounds().width / 2 - + 2 * IMAGE_OFFSET, scaledSelectedImage.getBounds().height / 2 + + (IMAGE_HEIGHT - mScaledSelectedImage.getBounds().height / 2) + / 2 - IMAGE_OFFSET, mScaledSelectedImage.getBounds().width / 2 + + 2 * IMAGE_OFFSET, mScaledSelectedImage.getBounds().height / 2 + 2 * IMAGE_OFFSET, IMAGE_ROUNDING, IMAGE_ROUNDING); // Under max zoom, we want the image to be // untransformed. So, get back to the identity // transform. - int imageX = x - scaledSelectedImage.getBounds().width / 4; + int imageX = x - mScaledSelectedImage.getBounds().width / 4; int imageY = - y + (IMAGE_HEIGHT - scaledSelectedImage.getBounds().height / 2) + y + + (IMAGE_HEIGHT - mScaledSelectedImage.getBounds().height / 2) / 2; Transform untransformedTransform = new Transform(Display.getDefault()); @@ -687,15 +688,15 @@ public class TreeView extends Canvas implements TreeChangeListener { float[] pt = new float[] { imageX, imageY }; - transform.transform(pt); - e.gc.drawImage(scaledSelectedImage, 0, 0, scaledSelectedImage - .getBounds().width, scaledSelectedImage.getBounds().height, - (int) pt[0], (int) pt[1], (int) (scaledSelectedImage + mTransform.transform(pt); + e.gc.drawImage(mScaledSelectedImage, 0, 0, mScaledSelectedImage + .getBounds().width, mScaledSelectedImage.getBounds().height, + (int) pt[0], (int) pt[1], (int) (mScaledSelectedImage .getBounds().width - * zoom / 2), - (int) (scaledSelectedImage.getBounds().height * zoom / 2)); + * mZoom / 2), + (int) (mScaledSelectedImage.getBounds().height * mZoom / 2)); untransformedTransform.dispose(); - e.gc.setTransform(transform); + e.gc.setTransform(mTransform); } // Text stuff @@ -706,24 +707,24 @@ public class TreeView extends Canvas implements TreeChangeListener { e.gc.setFont(font); String text = - selectedNode.viewNode.viewCount + " view" - + (selectedNode.viewNode.viewCount != 1 ? "s" : ""); + mSelectedNode.viewNode.viewCount + " view" + + (mSelectedNode.viewNode.viewCount != 1 ? "s" : ""); DecimalFormat formatter = new DecimalFormat("0.000"); String measureText = "Measure: " - + (selectedNode.viewNode.measureTime != -1 ? formatter - .format(selectedNode.viewNode.measureTime) + + (mSelectedNode.viewNode.measureTime != -1 ? formatter + .format(mSelectedNode.viewNode.measureTime) + " ms" : "n/a"); String layoutText = "Layout: " - + (selectedNode.viewNode.layoutTime != -1 ? formatter - .format(selectedNode.viewNode.layoutTime) + + (mSelectedNode.viewNode.layoutTime != -1 ? formatter + .format(mSelectedNode.viewNode.layoutTime) + " ms" : "n/a"); String drawText = "Draw: " - + (selectedNode.viewNode.drawTime != -1 ? formatter - .format(selectedNode.viewNode.drawTime) + + (mSelectedNode.viewNode.drawTime != -1 ? formatter + .format(mSelectedNode.viewNode.drawTime) + " ms" : "n/a"); org.eclipse.swt.graphics.Point titleExtent = e.gc.stringExtent(text); @@ -740,7 +741,7 @@ public class TreeView extends Canvas implements TreeChangeListener { + layoutExtent.y + TEXT_SPACING + drawExtent.y + 2 * TEXT_TOP_OFFSET; - e.gc.setBackground(textBackgroundColor); + e.gc.setBackground(mTextBackgroundColor); e.gc.fillRoundRectangle(x - boxWidth / 2, y, boxWidth, boxHeight, TEXT_ROUNDING, TEXT_ROUNDING); @@ -767,8 +768,8 @@ public class TreeView extends Canvas implements TreeChangeListener { font.dispose(); } else { - selectedRectangleLocation = null; - buttonCenter = null; + mSelectedRectangleLocation = null; + mButtonCenter = null; } } } @@ -778,13 +779,13 @@ public class TreeView extends Canvas implements TreeChangeListener { private static void paintRecursive(GC gc, Transform transform, DrawableViewNode node, DrawableViewNode selectedNode, Path connectionPath) { if (selectedNode == node && node.viewNode.filtered) { - gc.drawImage(filteredSelectedImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sFilteredSelectedImage, node.left, (int) Math.round(node.top)); } else if (selectedNode == node) { - gc.drawImage(selectedImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sSelectedImage, node.left, (int) Math.round(node.top)); } else if (node.viewNode.filtered) { - gc.drawImage(filteredImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sFilteredImage, node.left, (int) Math.round(node.top)); } else { - gc.drawImage(notSelectedImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sNotSelectedImage, node.left, (int) Math.round(node.top)); } int fontHeight = gc.getFontMetrics().getHeight(); @@ -816,44 +817,44 @@ public class TreeView extends Canvas implements TreeChangeListener { y = node.top + DrawableViewNode.NODE_HEIGHT - DrawableViewNode.CONTENT_TOP_BOTTOM_PADDING - - redImage.getBounds().height; + - sRedImage.getBounds().height; x += - (contentWidth - (redImage.getBounds().width * 3 + 2 * DrawableViewNode.CONTENT_INTER_PADDING)) / 2; + (contentWidth - (sRedImage.getBounds().width * 3 + 2 * DrawableViewNode.CONTENT_INTER_PADDING)) / 2; switch (node.viewNode.measureRating) { case GREEN: - gc.drawImage(greenImage, (int) x, (int) y); + gc.drawImage(sGreenImage, (int) x, (int) y); break; case YELLOW: - gc.drawImage(yellowImage, (int) x, (int) y); + gc.drawImage(sYellowImage, (int) x, (int) y); break; case RED: - gc.drawImage(redImage, (int) x, (int) y); + gc.drawImage(sRedImage, (int) x, (int) y); break; } - x += redImage.getBounds().width + DrawableViewNode.CONTENT_INTER_PADDING; + x += sRedImage.getBounds().width + DrawableViewNode.CONTENT_INTER_PADDING; switch (node.viewNode.layoutRating) { case GREEN: - gc.drawImage(greenImage, (int) x, (int) y); + gc.drawImage(sGreenImage, (int) x, (int) y); break; case YELLOW: - gc.drawImage(yellowImage, (int) x, (int) y); + gc.drawImage(sYellowImage, (int) x, (int) y); break; case RED: - gc.drawImage(redImage, (int) x, (int) y); + gc.drawImage(sRedImage, (int) x, (int) y); break; } - x += redImage.getBounds().width + DrawableViewNode.CONTENT_INTER_PADDING; + x += sRedImage.getBounds().width + DrawableViewNode.CONTENT_INTER_PADDING; switch (node.viewNode.drawRating) { case GREEN: - gc.drawImage(greenImage, (int) x, (int) y); + gc.drawImage(sGreenImage, (int) x, (int) y); break; case YELLOW: - gc.drawImage(yellowImage, (int) x, (int) y); + gc.drawImage(sYellowImage, (int) x, (int) y); break; case RED: - gc.drawImage(redImage, (int) x, (int) y); + gc.drawImage(sRedImage, (int) x, (int) y); break; } } @@ -953,7 +954,7 @@ public class TreeView extends Canvas implements TreeChangeListener { } private static Font getFont(int size, boolean bold) { - FontData[] fontData = systemFont.getFontData(); + FontData[] fontData = sSystemFont.getFontData(); for (int i = 0; i < fontData.length; i++) { fontData[i].setHeight(size); if (bold) { @@ -972,17 +973,17 @@ public class TreeView extends Canvas implements TreeChangeListener { } public void loadAllData() { - boolean newViewport = viewport == null; + boolean newViewport = mViewport == 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 + mTree = mModel.getTree(); + mSelectedNode = mModel.getSelection(); + mViewport = mModel.getViewport(); + mZoom = mModel.getZoom(); + if (mTree != null && mViewport == null) { + mViewport = + new Rectangle(0, mTree.top + DrawableViewNode.NODE_HEIGHT / 2 - getBounds().height / 2, getBounds().width, getBounds().height); } else { @@ -992,7 +993,7 @@ public class TreeView extends Canvas implements TreeChangeListener { } }); if (newViewport) { - model.setViewport(viewport); + mModel.setViewport(mViewport); } } @@ -1002,37 +1003,37 @@ public class TreeView extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - tree = model.getTree(); - selectedNode = model.getSelection(); - if (tree == null) { - viewport = null; + mTree = mModel.getTree(); + mSelectedNode = mModel.getSelection(); + if (mTree == null) { + mViewport = null; } else { - viewport = - new Rectangle(0, tree.top + DrawableViewNode.NODE_HEIGHT / 2 + mViewport = + new Rectangle(0, mTree.top + DrawableViewNode.NODE_HEIGHT / 2 - getBounds().height / 2, getBounds().width, getBounds().height); } } } }); - if (viewport != null) { - model.setViewport(viewport); + if (mViewport != null) { + mModel.setViewport(mViewport); } else { doRedraw(); } } private void setTransform() { - if (viewport != null && tree != null) { + if (mViewport != null && mTree != null) { // Set the transform. - transform.identity(); - inverse.identity(); - - transform.scale((float) zoom, (float) zoom); - inverse.scale((float) zoom, (float) zoom); - transform.translate((float) -viewport.x, (float) -viewport.y); - inverse.translate((float) -viewport.x, (float) -viewport.y); - inverse.invert(); + mTransform.identity(); + mInverse.identity(); + + mTransform.scale((float) mZoom, (float) mZoom); + mInverse.scale((float) mZoom, (float) mZoom); + mTransform.translate((float) -mViewport.x, (float) -mViewport.y); + mInverse.translate((float) -mViewport.x, (float) -mViewport.y); + mInverse.invert(); } } @@ -1041,8 +1042,8 @@ public class TreeView extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - viewport = model.getViewport(); - zoom = model.getZoom(); + mViewport = mModel.getViewport(); + mZoom = mModel.getZoom(); setTransform(); } } @@ -1056,10 +1057,10 @@ public class TreeView extends Canvas implements TreeChangeListener { public void selectionChanged() { synchronized (this) { - selectedNode = model.getSelection(); - if (selectedNode != null && selectedNode.viewNode.image == null) { + mSelectedNode = mModel.getSelection(); + if (mSelectedNode != null && mSelectedNode.viewNode.image == null) { HierarchyViewerDirector.getDirector() - .loadCaptureInBackground(selectedNode.viewNode); + .loadCaptureInBackground(mSelectedNode.viewNode); } } 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 index 08117b5..5c794e4 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java @@ -18,7 +18,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.hierarchyviewerlib.HierarchyViewerDirector; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; @@ -35,11 +35,11 @@ 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 { +public class TreeViewControls extends Composite implements ITreeChangeListener { - private Text filterText; + private Text mFilterText; - private Slider zoomSlider; + private Slider mZoomSlider; public TreeViewControls(Composite parent) { super(parent, SWT.NONE); @@ -52,44 +52,44 @@ public class TreeViewControls extends Composite implements TreeChangeListener { 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()); + mFilterText = new Text(this, SWT.LEFT | SWT.SINGLE); + mFilterText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + mFilterText.addModifyListener(mFilterTextModifyListener); + mFilterText.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); + mZoomSlider = 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)); + mZoomSlider.setLayoutData(zoomSliderGridData); + mZoomSlider.setMinimum((int) (TreeViewModel.MIN_ZOOM * 10)); + mZoomSlider.setMaximum((int) (TreeViewModel.MAX_ZOOM * 10 + 1)); + mZoomSlider.setThumb(1); + mZoomSlider.setSelection((int) Math.round(TreeViewModel.getModel().getZoom() * 10)); - zoomSlider.addSelectionListener(zoomSliderSelectionListener); + mZoomSlider.addSelectionListener(mZoomSliderSelectionListener); Label largeZoomLabel = new Label(this, SWT.NONE); largeZoomLabel .setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, true)); largeZoomLabel.setText("200%"); - addDisposeListener(disposeListener); + addDisposeListener(mDisposeListener); TreeViewModel.getModel().addTreeChangeListener(this); } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { TreeViewModel.getModel().removeTreeChangeListener(TreeViewControls.this); } }; - private SelectionListener zoomSliderSelectionListener = new SelectionListener() { + private SelectionListener mZoomSliderSelectionListener = new SelectionListener() { private int oldValue; public void widgetDefaultSelected(SelectionEvent e) { @@ -97,7 +97,7 @@ public class TreeViewControls extends Composite implements TreeChangeListener { } public void widgetSelected(SelectionEvent e) { - int newValue = zoomSlider.getSelection(); + int newValue = mZoomSlider.getSelection(); if (oldValue != newValue) { TreeViewModel.getModel().removeTreeChangeListener(TreeViewControls.this); TreeViewModel.getModel().setZoom(newValue / 10.0); @@ -107,9 +107,9 @@ public class TreeViewControls extends Composite implements TreeChangeListener { } }; - private ModifyListener filterTextModifyListener = new ModifyListener() { + private ModifyListener mFilterTextModifyListener = new ModifyListener() { public void modifyText(ModifyEvent e) { - HierarchyViewerDirector.getDirector().filterNodes(filterText.getText()); + HierarchyViewerDirector.getDirector().filterNodes(mFilterText.getText()); } }; @@ -121,10 +121,10 @@ public class TreeViewControls extends Composite implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { if (TreeViewModel.getModel().getTree() != null) { - zoomSlider.setSelection((int) Math + mZoomSlider.setSelection((int) Math .round(TreeViewModel.getModel().getZoom() * 10)); } - filterText.setText(""); + mFilterText.setText(""); //$NON-NLS-1$ } }); } @@ -136,7 +136,7 @@ public class TreeViewControls extends Composite implements TreeChangeListener { public void zoomChanged() { Display.getDefault().syncExec(new Runnable() { public void run() { - zoomSlider.setSelection((int) Math.round(TreeViewModel.getModel().getZoom() * 10)); + mZoomSlider.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 fb01b86..34167dd 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java @@ -18,7 +18,7 @@ package com.android.hierarchyviewerlib.ui; import com.android.ddmuilib.ImageLoader; import com.android.hierarchyviewerlib.models.TreeViewModel; -import com.android.hierarchyviewerlib.models.TreeViewModel.TreeChangeListener; +import com.android.hierarchyviewerlib.models.TreeViewModel.ITreeChangeListener; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode.Point; import com.android.hierarchyviewerlib.ui.util.DrawableViewNode.Rectangle; @@ -41,72 +41,72 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -public class TreeViewOverview extends Canvas implements TreeChangeListener { +public class TreeViewOverview extends Canvas implements ITreeChangeListener { - private TreeViewModel model; + private TreeViewModel mModel; - private DrawableViewNode tree; + private DrawableViewNode mTree; - private Rectangle viewport; + private Rectangle mViewport; - private Transform transform; + private Transform mTransform; - private Transform inverse; + private Transform mInverse; - private Rectangle bounds = new Rectangle(); + private Rectangle mBounds = new Rectangle(); - private double scale; + private double mScale; - private boolean dragging = false; + private boolean mDragging = false; - private DrawableViewNode selectedNode; + private DrawableViewNode mSelectedNode; - private static Image notSelectedImage; + private static Image sNotSelectedImage; - private static Image selectedImage; + private static Image sSelectedImage; - private static Image filteredImage; + private static Image sFilteredImage; - private static Image filteredSelectedImage; + private static Image sFilteredSelectedImage; public TreeViewOverview(Composite parent) { super(parent, SWT.NONE); - model = TreeViewModel.getModel(); - model.addTreeChangeListener(this); + mModel = TreeViewModel.getModel(); + mModel.addTreeChangeListener(this); loadResources(); - addPaintListener(paintListener); - addMouseListener(mouseListener); - addMouseMoveListener(mouseMoveListener); - addListener(SWT.Resize, resizeListener); - addDisposeListener(disposeListener); + addPaintListener(mPaintListener); + addMouseListener(mMouseListener); + addMouseMoveListener(mMouseMoveListener); + addListener(SWT.Resize, mResizeListener); + addDisposeListener(mDisposeListener); - transform = new Transform(Display.getDefault()); - inverse = new Transform(Display.getDefault()); + mTransform = new Transform(Display.getDefault()); + mInverse = new Transform(Display.getDefault()); loadAllData(); } private void loadResources() { ImageLoader loader = ImageLoader.getLoader(this.getClass()); - notSelectedImage = loader.loadImage("not-selected.png", Display.getDefault()); - selectedImage = loader.loadImage("selected-small.png", Display.getDefault()); - filteredImage = loader.loadImage("filtered.png", Display.getDefault()); - filteredSelectedImage = - loader.loadImage("selected-filtered-small.png", Display.getDefault()); + sNotSelectedImage = loader.loadImage("not-selected.png", Display.getDefault()); //$NON-NLS-1$ + sSelectedImage = loader.loadImage("selected-small.png", Display.getDefault()); //$NON-NLS-1$ + sFilteredImage = loader.loadImage("filtered.png", Display.getDefault()); //$NON-NLS-1$ + sFilteredSelectedImage = + loader.loadImage("selected-filtered-small.png", Display.getDefault()); //$NON-NLS-1$ } - private DisposeListener disposeListener = new DisposeListener() { + private DisposeListener mDisposeListener = new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - model.removeTreeChangeListener(TreeViewOverview.this); - transform.dispose(); - inverse.dispose(); + mModel.removeTreeChangeListener(TreeViewOverview.this); + mTransform.dispose(); + mInverse.dispose(); } }; - private MouseListener mouseListener = new MouseListener() { + private MouseListener mMouseListener = new MouseListener() { public void mouseDoubleClick(MouseEvent e) { // pass @@ -115,16 +115,16 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { public void mouseDown(MouseEvent e) { boolean redraw = false; synchronized (TreeViewOverview.this) { - if (tree != null && viewport != null) { - dragging = true; + if (mTree != null && mViewport != null) { + mDragging = true; redraw = true; handleMouseEvent(transformPoint(e.x, e.y)); } } if (redraw) { - model.removeTreeChangeListener(TreeViewOverview.this); - model.setViewport(viewport); - model.addTreeChangeListener(TreeViewOverview.this); + mModel.removeTreeChangeListener(TreeViewOverview.this); + mModel.setViewport(mViewport); + mModel.addTreeChangeListener(TreeViewOverview.this); doRedraw(); } } @@ -132,8 +132,8 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { public void mouseUp(MouseEvent e) { boolean redraw = false; synchronized (TreeViewOverview.this) { - if (tree != null && viewport != null) { - dragging = false; + if (mTree != null && mViewport != null) { + mDragging = false; redraw = true; handleMouseEvent(transformPoint(e.x, e.y)); @@ -145,47 +145,47 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { } } if (redraw) { - model.removeTreeChangeListener(TreeViewOverview.this); - model.setViewport(viewport); - model.addTreeChangeListener(TreeViewOverview.this); + mModel.removeTreeChangeListener(TreeViewOverview.this); + mModel.setViewport(mViewport); + mModel.addTreeChangeListener(TreeViewOverview.this); doRedraw(); } } }; - private MouseMoveListener mouseMoveListener = new MouseMoveListener() { + private MouseMoveListener mMouseMoveListener = new MouseMoveListener() { public void mouseMove(MouseEvent e) { boolean moved = false; synchronized (TreeViewOverview.this) { - if (dragging) { + if (mDragging) { moved = true; handleMouseEvent(transformPoint(e.x, e.y)); } } if (moved) { - model.removeTreeChangeListener(TreeViewOverview.this); - model.setViewport(viewport); - model.addTreeChangeListener(TreeViewOverview.this); + mModel.removeTreeChangeListener(TreeViewOverview.this); + mModel.setViewport(mViewport); + mModel.addTreeChangeListener(TreeViewOverview.this); doRedraw(); } } }; private void handleMouseEvent(Point pt) { - viewport.x = pt.x - viewport.width / 2; - viewport.y = pt.y - viewport.height / 2; - if (viewport.x < bounds.x) { - viewport.x = bounds.x; + mViewport.x = pt.x - mViewport.width / 2; + mViewport.y = pt.y - mViewport.height / 2; + if (mViewport.x < mBounds.x) { + mViewport.x = mBounds.x; } - if (viewport.y < bounds.y) { - viewport.y = bounds.y; + if (mViewport.y < mBounds.y) { + mViewport.y = mBounds.y; } - if (viewport.x + viewport.width > bounds.x + bounds.width) { - viewport.x = bounds.x + bounds.width - viewport.width; + if (mViewport.x + mViewport.width > mBounds.x + mBounds.width) { + mViewport.x = mBounds.x + mBounds.width - mViewport.width; } - if (viewport.y + viewport.height > bounds.y + bounds.height) { - viewport.y = bounds.y + bounds.height - viewport.height; + if (mViewport.y + mViewport.height > mBounds.y + mBounds.height) { + mViewport.y = mBounds.y + mBounds.height - mViewport.height; } } @@ -193,11 +193,11 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { float[] pt = { (float) x, (float) y }; - inverse.transform(pt); + mInverse.transform(pt); return new Point(pt[0], pt[1]); } - private Listener resizeListener = new Listener() { + private Listener mResizeListener = new Listener() { public void handleEvent(Event arg0) { synchronized (TreeViewOverview.this) { setTransform(); @@ -206,33 +206,33 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { } }; - private PaintListener paintListener = new PaintListener() { + private PaintListener mPaintListener = new PaintListener() { public void paintControl(PaintEvent e) { synchronized (TreeViewOverview.this) { - if (tree != null) { + if (mTree != 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); - e.gc.setTransform(transform); - e.gc.setLineWidth((int) Math.ceil(0.7 / scale)); + e.gc.setTransform(mTransform); + e.gc.setLineWidth((int) Math.ceil(0.7 / mScale)); Path connectionPath = new Path(Display.getDefault()); - paintRecursive(e.gc, tree, connectionPath); + paintRecursive(e.gc, mTree, connectionPath); e.gc.drawPath(connectionPath); connectionPath.dispose(); - if (viewport != null) { + if (mViewport != 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.fillRectangle((int) mViewport.x, (int) mViewport.y, (int) Math + .ceil(mViewport.width), (int) Math.ceil(mViewport.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.setLineWidth((int) Math.ceil(2 / mScale)); + e.gc.drawRectangle((int) mViewport.x, (int) mViewport.y, (int) Math + .ceil(mViewport.width), (int) Math.ceil(mViewport.height)); } } } @@ -240,14 +240,14 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { }; private void paintRecursive(GC gc, DrawableViewNode node, Path connectionPath) { - if (selectedNode == node && node.viewNode.filtered) { - gc.drawImage(filteredSelectedImage, node.left, (int) Math.round(node.top)); - } else if (selectedNode == node) { - gc.drawImage(selectedImage, node.left, (int) Math.round(node.top)); + if (mSelectedNode == node && node.viewNode.filtered) { + gc.drawImage(sFilteredSelectedImage, node.left, (int) Math.round(node.top)); + } else if (mSelectedNode == node) { + gc.drawImage(sSelectedImage, node.left, (int) Math.round(node.top)); } else if (node.viewNode.filtered) { - gc.drawImage(filteredImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sFilteredImage, node.left, (int) Math.round(node.top)); } else { - gc.drawImage(notSelectedImage, node.left, (int) Math.round(node.top)); + gc.drawImage(sNotSelectedImage, node.left, (int) Math.round(node.top)); } int N = node.children.size(); if (N == 0) { @@ -284,9 +284,9 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - tree = model.getTree(); - selectedNode = model.getSelection(); - viewport = model.getViewport(); + mTree = mModel.getTree(); + mSelectedNode = mModel.getSelection(); + mViewport = mModel.getViewport(); setBounds(); setTransform(); } @@ -299,9 +299,9 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - tree = model.getTree(); - selectedNode = model.getSelection(); - viewport = model.getViewport(); + mTree = mModel.getTree(); + mSelectedNode = mModel.getSelection(); + mViewport = mModel.getViewport(); setBounds(); setTransform(); } @@ -311,48 +311,48 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { } private void setBounds() { - if (viewport != null && tree != null) { - bounds.x = Math.min(viewport.x, tree.bounds.x); - bounds.y = Math.min(viewport.y, tree.bounds.y); - bounds.width = - Math.max(viewport.x + viewport.width, tree.bounds.x + tree.bounds.width) - - bounds.x; - 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; + if (mViewport != null && mTree != null) { + mBounds.x = Math.min(mViewport.x, mTree.bounds.x); + mBounds.y = Math.min(mViewport.y, mTree.bounds.y); + mBounds.width = + Math.max(mViewport.x + mViewport.width, mTree.bounds.x + mTree.bounds.width) + - mBounds.x; + mBounds.height = + Math.max(mViewport.y + mViewport.height, mTree.bounds.y + mTree.bounds.height) + - mBounds.y; + } else if (mTree != null) { + mBounds.x = mTree.bounds.x; + mBounds.y = mTree.bounds.y; + mBounds.width = mTree.bounds.x + mTree.bounds.width - mBounds.x; + mBounds.height = mTree.bounds.y + mTree.bounds.height - mBounds.y; } } private void setTransform() { - if (tree != null) { + if (mTree != null) { - transform.identity(); - inverse.identity(); + mTransform.identity(); + mInverse.identity(); final Point size = new Point(); size.x = getBounds().width; size.y = getBounds().height; - if (bounds.width == 0 || bounds.height == 0 || size.x == 0 || size.y == 0) { - scale = 1; + if (mBounds.width == 0 || mBounds.height == 0 || size.x == 0 || size.y == 0) { + mScale = 1; } else { - scale = Math.min(size.x / bounds.width, size.y / bounds.height); + mScale = Math.min(size.x / mBounds.width, size.y / mBounds.height); } - transform.scale((float) scale, (float) scale); - inverse.scale((float) scale, (float) scale); - transform.translate((float) -bounds.x, (float) -bounds.y); - inverse.translate((float) -bounds.x, (float) -bounds.y); - if (size.x / bounds.width < size.y / bounds.height) { - transform.translate(0, (float) (size.y / scale - bounds.height) / 2); - inverse.translate(0, (float) (size.y / scale - bounds.height) / 2); + mTransform.scale((float) mScale, (float) mScale); + mInverse.scale((float) mScale, (float) mScale); + mTransform.translate((float) -mBounds.x, (float) -mBounds.y); + mInverse.translate((float) -mBounds.x, (float) -mBounds.y); + if (size.x / mBounds.width < size.y / mBounds.height) { + mTransform.translate(0, (float) (size.y / mScale - mBounds.height) / 2); + mInverse.translate(0, (float) (size.y / mScale - mBounds.height) / 2); } else { - transform.translate((float) (size.x / scale - bounds.width) / 2, 0); - inverse.translate((float) (size.x / scale - bounds.width) / 2, 0); + mTransform.translate((float) (size.x / mScale - mBounds.width) / 2, 0); + mInverse.translate((float) (size.x / mScale - mBounds.width) / 2, 0); } - inverse.invert(); + mInverse.invert(); } } @@ -360,7 +360,7 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { Display.getDefault().syncExec(new Runnable() { public void run() { synchronized (this) { - viewport = model.getViewport(); + mViewport = mModel.getViewport(); setBounds(); setTransform(); } @@ -375,7 +375,7 @@ public class TreeViewOverview extends Canvas implements TreeChangeListener { public void selectionChanged() { synchronized (this) { - selectedNode = model.getSelection(); + mSelectedNode = mModel.getSelection(); } doRedraw(); } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/DrawableViewNode.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/DrawableViewNode.java index 7570676..b196aaf 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/DrawableViewNode.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/DrawableViewNode.java @@ -86,7 +86,7 @@ public class DrawableViewNode { @Override public String toString() { - return "{" + x + ", " + y + ", " + width + ", " + height + "}"; + return "{" + x + ", " + y + ", " + width + ", " + height + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } } @@ -104,7 +104,7 @@ public class DrawableViewNode { @Override public String toString() { - return "(" + x + ", " + y + ")"; + return "(" + x + ", " + y + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/PsdFile.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/PsdFile.java index 275ea36..2c1154b 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/PsdFile.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/PsdFile.java @@ -160,7 +160,7 @@ public class PsdFile { static final short MODE_LAB = 9; - final byte[] mSignature = "8BPS".getBytes(); + final byte[] mSignature = "8BPS".getBytes(); //$NON-NLS-1$ final short mVersion = 1; @@ -214,7 +214,7 @@ public class PsdFile { int mLength = 0; - final byte[] mSignature = "8BIM".getBytes(); + final byte[] mSignature = "8BIM".getBytes(); //$NON-NLS-1$ final short mResourceId = RESOURCE_RESOLUTION_INFO; @@ -342,9 +342,9 @@ public class PsdFile { final Channel[] mChannelInfo = new Channel[mChannelCount]; - final byte[] mBlendSignature = "8BIM".getBytes(); + final byte[] mBlendSignature = "8BIM".getBytes(); //$NON-NLS-1$ - final byte[] mBlendMode = "norm".getBytes(); + final byte[] mBlendMode = "norm".getBytes(); //$NON-NLS-1$ final byte mOpacity = OPACITY_OPAQUE; @@ -362,9 +362,9 @@ public class PsdFile { final byte[] mName; - final byte[] mLayerExtraSignature = "8BIM".getBytes(); + final byte[] mLayerExtraSignature = "8BIM".getBytes(); //$NON-NLS-1$ - final byte[] mLayerExtraKey = "luni".getBytes(); + final byte[] mLayerExtraKey = "luni".getBytes(); //$NON-NLS-1$ int mLayerExtraLength; @@ -391,7 +391,7 @@ public class PsdFile { byte[] data = name.getBytes(); try { - mLayerExtraLength = 4 + mOriginalName.getBytes("UTF-16").length; + mLayerExtraLength = 4 + mOriginalName.getBytes("UTF-16").length; //$NON-NLS-1$ } catch (UnsupportedEncodingException e) { e.printStackTrace(); } @@ -465,7 +465,7 @@ public class PsdFile { out.write(mLayerExtraKey); out.writeInt(mLayerExtraLength); out.writeInt(mOriginalName.length() + 1); - out.write(mOriginalName.getBytes("UTF-16")); + out.write(mOriginalName.getBytes("UTF-16")); //$NON-NLS-1$ } void writeImageData(DataOutputStream out) throws IOException { diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/TreeColumnResizer.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/TreeColumnResizer.java index 6b20366..e03394a 100644 --- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/TreeColumnResizer.java +++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/util/TreeColumnResizer.java @@ -24,24 +24,24 @@ import org.eclipse.swt.widgets.TreeColumn; public class TreeColumnResizer { - private TreeColumn column1; + private TreeColumn mColumn1; - private TreeColumn column2; + private TreeColumn mColumn2; - private Composite control; + private Composite mControl; - private int column1Width; + private int mColumn1Width; - private int column2Width; + private int mColumn2Width; private final static int MIN_COLUMN1_WIDTH = 18; private final static int MIN_COLUMN2_WIDTH = 3; public TreeColumnResizer(Composite control, TreeColumn column1, TreeColumn column2) { - this.control = control; - this.column1 = column1; - this.column2 = column2; + this.mControl = control; + this.mColumn1 = column1; + this.mColumn2 = column2; control.addListener(SWT.Resize, resizeListener); column1.addListener(SWT.Resize, column1ResizeListener); column2.setResizable(false); @@ -49,64 +49,64 @@ public class TreeColumnResizer { private Listener resizeListener = new Listener() { public void handleEvent(Event e) { - if (column1Width == 0 && column2Width == 0) { - column1Width = (control.getBounds().width - 18) / 2; - column2Width = (control.getBounds().width - 18) / 2; + if (mColumn1Width == 0 && mColumn2Width == 0) { + mColumn1Width = (mControl.getBounds().width - 18) / 2; + mColumn2Width = (mControl.getBounds().width - 18) / 2; } else { - int dif = control.getBounds().width - 18 - (column1Width + column2Width); - int columnDif = Math.abs(column1Width - column2Width); + int dif = mControl.getBounds().width - 18 - (mColumn1Width + mColumn2Width); + int columnDif = Math.abs(mColumn1Width - mColumn2Width); int mainColumnChange = Math.min(Math.abs(dif), columnDif); int left = Math.max(0, Math.abs(dif) - columnDif); if (dif < 0) { - if (column1Width > column2Width) { - column1Width -= mainColumnChange; + if (mColumn1Width > mColumn2Width) { + mColumn1Width -= mainColumnChange; } else { - column2Width -= mainColumnChange; + mColumn2Width -= mainColumnChange; } - column1Width -= left / 2; - column2Width -= left - left / 2; + mColumn1Width -= left / 2; + mColumn2Width -= left - left / 2; } else { - if (column1Width > column2Width) { - column2Width += mainColumnChange; + if (mColumn1Width > mColumn2Width) { + mColumn2Width += mainColumnChange; } else { - column1Width += mainColumnChange; + mColumn1Width += mainColumnChange; } - column1Width += left / 2; - column2Width += left - left / 2; + mColumn1Width += left / 2; + mColumn2Width += left - left / 2; } } - column1.removeListener(SWT.Resize, column1ResizeListener); - column1.setWidth(column1Width); - column2.setWidth(column2Width); - column1.addListener(SWT.Resize, column1ResizeListener); + mColumn1.removeListener(SWT.Resize, column1ResizeListener); + mColumn1.setWidth(mColumn1Width); + mColumn2.setWidth(mColumn2Width); + mColumn1.addListener(SWT.Resize, column1ResizeListener); } }; private Listener column1ResizeListener = new Listener() { public void handleEvent(Event e) { - int widthDif = column1Width - column1.getWidth(); - column1Width -= widthDif; - column2Width += widthDif; + int widthDif = mColumn1Width - mColumn1.getWidth(); + mColumn1Width -= widthDif; + mColumn2Width += widthDif; boolean column1Changed = false; // Strange, but these constants make the columns look the same. - if (column1Width < MIN_COLUMN1_WIDTH) { - column2Width -= MIN_COLUMN1_WIDTH - column1Width; - column1Width += MIN_COLUMN1_WIDTH - column1Width; + if (mColumn1Width < MIN_COLUMN1_WIDTH) { + mColumn2Width -= MIN_COLUMN1_WIDTH - mColumn1Width; + mColumn1Width += MIN_COLUMN1_WIDTH - mColumn1Width; column1Changed = true; } - if (column2Width < MIN_COLUMN2_WIDTH) { - column1Width += column2Width - MIN_COLUMN2_WIDTH; - column2Width = MIN_COLUMN2_WIDTH; + if (mColumn2Width < MIN_COLUMN2_WIDTH) { + mColumn1Width += mColumn2Width - MIN_COLUMN2_WIDTH; + mColumn2Width = MIN_COLUMN2_WIDTH; column1Changed = true; } if (column1Changed) { - column1.removeListener(SWT.Resize, this); - column1.setWidth(column1Width); - column1.addListener(SWT.Resize, this); + mColumn1.removeListener(SWT.Resize, this); + mColumn1.setWidth(mColumn1Width); + mColumn1.addListener(SWT.Resize, this); } - column2.setWidth(column2Width); + mColumn2.setWidth(mColumn2Width); } }; } |